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

package/dist/{chunk-5GRXWKQR.cjs → chunk-UG5ZNM5J.cjs}

@@ -5070,6 +5070,66 @@ var CLOUD_DATA_TABLES_SQL = [
     lease_allowed INTEGER CONSTRAINT cloud_lease_guard CHECK (lease_allowed = 1)
   )`
 ];
+var CLOUD_DATA_WORK_TABLES_SQL = [
+  `CREATE TABLE IF NOT EXISTS cloud_data_work (
+    user_id TEXT NOT NULL, kind TEXT NOT NULL, id TEXT NOT NULL,
+    next_run_at INTEGER, expires_at INTEGER,
+    PRIMARY KEY (user_id, kind, id)
+  )`,
+  `CREATE TABLE IF NOT EXISTS cloud_data_maintenance (
+    name TEXT PRIMARY KEY, cursor INTEGER NOT NULL, upper_bound INTEGER NOT NULL,
+    completed INTEGER NOT NULL DEFAULT 0
+  )`
+];
+CLOUD_DATA_TABLES_SQL.push(...CLOUD_DATA_WORK_TABLES_SQL);
+var CLOUD_DATA_WORK_INDEXES = [
+  {
+    name: "idx_cloud_work_due",
+    sql: `CREATE INDEX IF NOT EXISTS idx_cloud_work_due
+      ON cloud_data_work (kind, next_run_at) WHERE next_run_at IS NOT NULL`,
+    description: "Only due cleanup operations",
+    critical: true
+  },
+  {
+    name: "idx_cloud_work_expiry",
+    sql: `CREATE INDEX IF NOT EXISTS idx_cloud_work_expiry
+      ON cloud_data_work (expires_at) WHERE expires_at IS NOT NULL`,
+    description: "Only expired management records",
+    critical: true
+  }
+];
+SQLITE_ALL_INDEXES.push(...CLOUD_DATA_WORK_INDEXES);
+var chunkPrefixSql = "char(31)||'amsg-chunks'||char(31)";
+var logicalNamespaceSql = `CASE WHEN substr(OLD.namespace,1,13)=${chunkPrefixSql}
+  THEN substr(OLD.namespace,14) ELSE OLD.namespace END`;
+var logicalKeySql = `CASE WHEN substr(OLD.namespace,1,13)=${chunkPrefixSql} AND instr(OLD.key,char(31))>0
+  THEN substr(OLD.key,1,instr(OLD.key,char(31))-1) ELSE OLD.key END`;
+var CLOUD_DATA_DELETE_TRIGGERS = [
+  ...[
+    ["scheduled_messages", "task", "uuid"],
+    ["llm_credentials", "credential", "cred_id"],
+    ["message_outbox", "outbox", "message_id"],
+    ["push_subscriptions", "subscription", "user_id"]
+  ].map(([table, type, column]) => ({
+    name: `trg_cloud_metadata_${type}_delete`,
+    sql: `CREATE TRIGGER IF NOT EXISTS trg_cloud_metadata_${type}_delete AFTER DELETE ON ${table}
+        BEGIN DELETE FROM cloud_resource_metadata WHERE user_id=OLD.user_id
+          AND resource_key=json_array('${type}'${column ? ",OLD." + column : ""}); END`
+  })),
+  { name: "trg_cloud_metadata_state_delete", sql: `CREATE TRIGGER IF NOT EXISTS trg_cloud_metadata_state_delete
+      AFTER DELETE ON client_state BEGIN
+      DELETE FROM cloud_resource_metadata WHERE user_id=OLD.user_id
+        AND resource_key=json_array('state',${logicalNamespaceSql},${logicalKeySql})
+        AND NOT EXISTS (SELECT 1 FROM client_state r WHERE r.user_id=OLD.user_id
+          AND r.namespace=(${logicalNamespaceSql}) AND r.key=(${logicalKeySql}))
+        AND NOT EXISTS (SELECT 1 FROM client_state r WHERE r.user_id=OLD.user_id
+          AND r.namespace=${chunkPrefixSql}||(${logicalNamespaceSql})
+          AND r.key >= (${logicalKeySql})||char(31) AND r.key < (${logicalKeySql})||char(32)); END` },
+  { name: "trg_cloud_work_delete", sql: `CREATE TRIGGER IF NOT EXISTS trg_cloud_work_delete
+      AFTER DELETE ON cloud_data_records BEGIN
+      DELETE FROM cloud_data_work WHERE user_id=OLD.user_id AND kind=OLD.kind AND id=OLD.id;
+      DELETE FROM cloud_data_record_chunks WHERE user_id=OLD.user_id AND kind=OLD.kind AND id=OLD.id; END` }
+];
 function parseTableName(sql) {
   const match = /CREATE\s+TABLE\s+(?:IF\s+NOT\s+EXISTS\s+)?([A-Za-z_][A-Za-z0-9_]*)/i.exec(sql);
   return match ? match[1] : "";
@@ -5105,7 +5165,8 @@ var SQLITE_REQUIRED_SCHEMA = Object.freeze({
     describeTable(MESSAGE_OUTBOX_TABLE_SQL),
     ...CLOUD_DATA_TABLES_SQL.map(describeTable)
   ])),
-  indexes: Object.freeze(SQLITE_ALL_INDEXES.filter((index) => index.critical).map((index) => index.name))
+  indexes: Object.freeze(SQLITE_ALL_INDEXES.filter((index) => index.critical).map((index) => index.name)),
+  triggers: Object.freeze(CLOUD_DATA_DELETE_TRIGGERS.map((trigger) => trigger.name))
 });
 
 // src/server/adapters/d1.js
@@ -5304,7 +5365,7 @@ var D1Adapter = class {
     }
     return { id: row.id, userId: row.user_id, kind: row.kind, data, updatedAt: row.updated_at };
   }
-  async putCloudDataRecord(userId, kind, id, data, { idempotencyKey = null, createOnly = false, leaseToken } = {}) {
+  async putCloudDataRecord(userId, kind, id, data, { idempotencyKey = null, createOnly = false, leaseToken, work } = {}) {
     const slices = [];
     if (data.length > 200 * 1024) for (let offset = 0; offset < data.length; offset += 200 * 1024) slices.push(data.slice(offset, offset + 200 * 1024));
     const rootValue = slices.length ? "amsg-record" + slices.length : data;
@@ -5331,6 +5392,12 @@ var D1Adapter = class {
         SELECT ?,?,?,?,?,? WHERE ${rootGate}`
       ).bind(userId, kind, id, index, slices[index], writeToken, userId, kind, id, writeToken));
     }
+    const schedule = _nullishCoalesce(work, () => ( (["inventory", "plan"].includes(kind) ? { nextRunAt: null, expiresAt: now + 36e5 } : null)));
+    if (schedule) statements.push(this._db.prepare(
+      `INSERT INTO cloud_data_work (user_id,kind,id,next_run_at,expires_at)
+      SELECT ?,?,?,?,? WHERE ${rootGate}
+      ON CONFLICT (user_id,kind,id) DO UPDATE SET next_run_at=excluded.next_run_at,expires_at=excluded.expires_at`
+    ).bind(userId, kind, id, _nullishCoalesce(schedule.nextRunAt, () => ( null)), _nullishCoalesce(schedule.expiresAt, () => ( null)), userId, kind, id, writeToken));
     if (!this.cloudDataManagement) throw new Error("Cloud management requires transactional batches");
     const results = await this._db.batch(statements);
     if (leaseToken !== void 0 && !results[0].meta.changes) throw Object.assign(new Error("Cloud operation processing lease was lost"), { code: "CLOUD_LEASE_LOST" });
@@ -5408,23 +5475,85 @@ var D1Adapter = class {
     ]);
     return results[1].meta.changes || 0;
   }
-  /** Sidecars are indexes only. Remove them only while their backing row is absent. */
-  async cleanupCloudResourceMetadata(userId = null) {
+  async listDueCloudDataOperations(now = Date.now(), limit = 25) {
+    const result = await this._db.prepare(`SELECT r.* FROM cloud_data_work w JOIN cloud_data_records r
+      ON r.user_id=w.user_id AND r.kind=w.kind AND r.id=w.id
+      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)));
+  }
+  async cleanupExpiredCloudDataRecords(now = Date.now(), limit = 100) {
+    const result = await this._db.prepare(`DELETE FROM cloud_data_records WHERE rowid IN (
+      SELECT r.rowid FROM cloud_data_work w JOIN cloud_data_records r
+      ON r.user_id=w.user_id AND r.kind=w.kind AND r.id=w.id
+      WHERE w.expires_at IS NOT NULL AND w.expires_at<=?
+        AND (r.lease_until IS NULL OR r.lease_until<=?) ORDER BY w.expires_at LIMIT ?
+    )`).bind(now, now, limit).run();
+    return result.meta.changes || 0;
+  }
+  async getCloudMaintenanceBatch(name, table, limit = 100) {
+    if (!["cloud_resource_metadata", "cloud_data_records"].includes(table)) throw new Error("Invalid maintenance source");
+    let marker = await this._db.prepare("SELECT * FROM cloud_data_maintenance WHERE name=?").bind(name).first();
+    if (!marker) {
+      await this._db.prepare(`INSERT INTO cloud_data_maintenance (name,cursor,upper_bound,completed)
+        SELECT ?,0,COALESCE(MAX(rowid),0),0 FROM ${table} WHERE 1 ON CONFLICT (name) DO NOTHING`).bind(name).run();
+      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}
+      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) {
+    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();
+  }
+  async readCloudMaintenanceRecord(row) {
+    return this._cloudRecordForList(row);
+  }
+  async repairCloudResourceMetadata(limit = 100) {
+    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', _45 => _45.rows, 'access', _46 => _46.at, 'call', _47 => _47(-1), 'optionalAccess', _48 => _48.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);
+  }
+  /** One explicit repair, or a bounded upgrade batch; never called as a recurring sweep. */
+  async cleanupCloudResourceMetadata(userId = null, range = null) {
     const targets = {
-      task: `SELECT 1 FROM scheduled_messages r WHERE r.user_id=m.user_id AND r.uuid=json_extract(m.resource_key,'$[1]')`,
-      state: `SELECT 1 FROM client_state r WHERE r.user_id=m.user_id AND
-        ((r.namespace=json_extract(m.resource_key,'$[1]') AND r.key=json_extract(m.resource_key,'$[2]')) OR
-        (r.namespace=char(31)||'amsg-chunks'||char(31)||json_extract(m.resource_key,'$[1]')
+      task: [`SELECT 1 FROM scheduled_messages r WHERE r.user_id=m.user_id AND r.uuid=json_extract(m.resource_key,'$[1]')`],
+      state: [
+        `SELECT 1 FROM client_state r WHERE r.user_id=m.user_id
+          AND r.namespace=json_extract(m.resource_key,'$[1]') AND r.key=json_extract(m.resource_key,'$[2]')`,
+        `SELECT 1 FROM client_state r WHERE r.user_id=m.user_id
+          AND r.namespace=char(31)||'amsg-chunks'||char(31)||json_extract(m.resource_key,'$[1]')
           AND r.key >= json_extract(m.resource_key,'$[2]')||char(31)
-          AND r.key < json_extract(m.resource_key,'$[2]')||char(32)))`,
-      credential: `SELECT 1 FROM llm_credentials r WHERE r.user_id=m.user_id AND r.cred_id=json_extract(m.resource_key,'$[1]')`,
-      outbox: `SELECT 1 FROM message_outbox r WHERE r.user_id=m.user_id AND r.message_id=json_extract(m.resource_key,'$[1]')`,
-      subscription: `SELECT 1 FROM push_subscriptions r WHERE r.user_id=m.user_id`
+          AND r.key < json_extract(m.resource_key,'$[2]')||char(32)`
+      ],
+      credential: [`SELECT 1 FROM llm_credentials r WHERE r.user_id=m.user_id AND r.cred_id=json_extract(m.resource_key,'$[1]')`],
+      outbox: [`SELECT 1 FROM message_outbox r WHERE r.user_id=m.user_id AND r.message_id=json_extract(m.resource_key,'$[1]')`],
+      subscription: [`SELECT 1 FROM push_subscriptions r WHERE r.user_id=m.user_id`]
     };
-    const statements = Object.entries(targets).map(([type, exists]) => this._db.prepare(
-      `DELETE FROM cloud_resource_metadata AS m WHERE (? IS NULL OR user_id=?) AND json_valid(resource_key)
-        AND json_extract(resource_key,'$[0]')=? AND NOT EXISTS (${exists})`
-    ).bind(userId, userId, type));
+    const statements = Object.entries(targets).map(([type, exists]) => {
+      const conditions = ["json_valid(resource_key)", "json_extract(resource_key,'$[0]')=?"];
+      const args = [type];
+      if (userId !== null) {
+        conditions.unshift("user_id=?");
+        args.unshift(userId);
+      }
+      if (range) {
+        conditions.unshift("m.rowid>? AND m.rowid<=?");
+        args.unshift(range.after, range.through);
+      }
+      return this._db.prepare(`DELETE FROM cloud_resource_metadata AS m WHERE ${conditions.join(" AND ")}
+        AND ${exists.map((sql) => `NOT EXISTS (${sql})`).join(" AND ")}`).bind(...args);
+    });
     const results = await this._cloudBatch(statements, userId);
     return results.reduce((sum, result) => sum + (result.meta.changes || 0), 0);
   }
@@ -5465,7 +5594,7 @@ 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', _45 => _45.valid]);
+    return !!_optionalChain([row, 'optionalAccess', _49 => _49.valid]);
   }
   /** Delete only the exact physical snapshot; no untrusted SQL identifiers. */
   async deleteCloudResourceRows(userId, locators, { operationId, leaseToken } = {}) {
@@ -5564,6 +5693,7 @@ var D1Adapter = class {
         indexResults.push({ name: index.name, status: "failed", description: index.description, critical: !!index.critical, error: error.message });
       }
     }
+    for (const trigger of CLOUD_DATA_DELETE_TRIGGERS) await this._db.prepare(trigger.sql).run();
     const criticalFailures = indexResults.filter((i) => i.critical && i.status === "failed");
     if (criticalFailures.length > 0) {
       const names = criticalFailures.map((i) => i.name).join(", ");
@@ -5587,7 +5717,7 @@ var D1Adapter = class {
    * 构变了而老部署没跑过 initSchema 时，cron 会每分钟静默挂在缺的那一列上，
    * 界面上一切正常——这个方法就是让宿主查得出来。
    *
-   * @returns {Promise<{ tables: Record<string, string[]>, indexes: string[] }>}
+   * @returns {Promise<{ tables: Record<string, string[]>, indexes: string[], triggers: string[] }>}
    */
   async describeSchema() {
     const tableRes = await this._db.prepare(
@@ -5604,7 +5734,8 @@ var D1Adapter = class {
     const indexRes = await this._db.prepare(
       `SELECT name FROM sqlite_master WHERE type = 'index' AND name IS NOT NULL`
     ).all();
-    return { tables, indexes: (indexRes.results || []).map((row) => row.name) };
+    const triggerRes = await this._db.prepare("SELECT name FROM sqlite_master WHERE type = 'trigger'").all();
+    return { tables, indexes: (indexRes.results || []).map((row) => row.name), triggers: (triggerRes.results || []).map((row) => row.name) };
   }
   async dropSchema() {
     await this._db.prepare("DROP TABLE IF EXISTS scheduled_messages").run();
@@ -5612,7 +5743,7 @@ var D1Adapter = class {
     await this._db.prepare("DROP TABLE IF EXISTS push_subscriptions").run();
     await this._db.prepare("DROP TABLE IF EXISTS llm_credentials").run();
     await this._db.prepare("DROP TABLE IF EXISTS message_outbox").run();
-    for (const table of ["cloud_data_record_chunks", "cloud_data_records", "cloud_data_owners", "cloud_resource_metadata", "cloud_guard_assertions"]) {
+    for (const table of ["cloud_data_work", "cloud_data_maintenance", "cloud_data_record_chunks", "cloud_data_records", "cloud_data_owners", "cloud_resource_metadata", "cloud_guard_assertions"]) {
       await this._db.prepare(`DROP TABLE IF EXISTS ${table}`).run();
     }
   }
@@ -5716,7 +5847,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', _46 => _46.user_id]), [cloudGuard]);
+    await this._cloudBatch([statement], _optionalChain([ownerUser, 'optionalAccess', _50 => _50.user_id]), [cloudGuard]);
     return this._db.prepare("SELECT * FROM scheduled_messages WHERE id = ?").bind(taskId).first();
   }
   /**
@@ -5841,7 +5972,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', _47 => _47.user_id]), [cloudGuard]);
+    const [res] = await this._cloudBatch([statement], _optionalChain([ownerUser, 'optionalAccess', _51 => _51.user_id]), [cloudGuard]);
     return (res.meta.changes || 0) > 0;
   }
   /**
@@ -5860,7 +5991,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', _48 => _48.user_id]), [cloudGuard]);
+    const [res] = await this._cloudBatch([statement], _optionalChain([ownerUser, 'optionalAccess', _52 => _52.user_id]), [cloudGuard]);
     return (res.meta.changes || 0) > 0;
   }
   async listTasks(userId, opts = {}) {
@@ -5890,7 +6021,8 @@ var D1Adapter = class {
     const cutoff = new Date(Date.now() - safeDays * 24 * 60 * 60 * 1e3).toISOString();
     const res = await this._db.prepare(
       `DELETE FROM scheduled_messages
-       WHERE status IN ('sent', 'failed') AND updated_at < ?`
+       WHERE rowid IN (SELECT rowid FROM scheduled_messages
+         WHERE status IN ('sent', 'failed') AND updated_at < ? LIMIT 100)`
     ).bind(cutoff).run();
     return res.meta.changes || 0;
   }
@@ -6020,7 +6152,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', _49 => _49.n]), () => ( 0))) === 0;
+        return Number(_nullishCoalesce(_optionalChain([row, 'optionalAccess', _53 => _53.n]), () => ( 0))) === 0;
       });
     }
     return result;
@@ -6056,7 +6188,7 @@ var D1Adapter = class {
    */
   async cleanupClientState(targets = []) {
     if (!Array.isArray(targets) || targets.length === 0) return 0;
-    const SQL = "DELETE FROM client_state WHERE namespace = ? AND updated_at < ?";
+    const SQL = "DELETE FROM client_state WHERE rowid IN (SELECT rowid FROM client_state WHERE namespace = ? AND updated_at < ? LIMIT 100)";
     const statements = targets.map(
       (target) => this._db.prepare(SQL).bind(target.namespace, target.updatedBefore)
     );
@@ -6552,13 +6684,13 @@ var D1Adapter = class {
     let deleted = 0;
     if (Number.isFinite(ackedBeforeMs)) {
       const res = await this._db.prepare(
-        "DELETE FROM message_outbox WHERE acked_at IS NOT NULL AND acked_at < ?"
+        "DELETE FROM message_outbox WHERE rowid IN (SELECT rowid FROM message_outbox WHERE acked_at IS NOT NULL AND acked_at < ? LIMIT 100)"
       ).bind(ackedBeforeMs).run();
       deleted += res.meta.changes || 0;
     }
     if (Number.isFinite(allBeforeMs)) {
       const res = await this._db.prepare(
-        "DELETE FROM message_outbox WHERE created_at < ?"
+        "DELETE FROM message_outbox WHERE rowid IN (SELECT rowid FROM message_outbox WHERE created_at < ? LIMIT 100)"
       ).bind(allBeforeMs).run();
       deleted += res.meta.changes || 0;
     }
@@ -6879,7 +7011,7 @@ function createClientStateNamespacesHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "2.6.0-next.34" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.6.0-next.35" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([
@@ -7114,8 +7246,8 @@ async function buildCloudDataInventory({
         });
       }
     }
-    const owner = safeOwner(_optionalChain([stored, 'optionalAccess', _50 => _50.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _51 => _51.__cloudOwnerGuard, 'optionalAccess', _52 => _52.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _53 => _53.metadata, 'optionalAccess', _54 => _54.cloudOwner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _55 => _55.metadata, 'optionalAccess', _56 => _56.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _57 => _57.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _58 => _58.__cloudOwnerGuard, 'optionalAccess', _59 => _59.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _60 => _60.metadata, 'optionalAccess', _61 => _61.cloudOwner])) || safeOwner(_optionalChain([task, 'optionalAccess', _62 => _62.metadata, 'optionalAccess', _63 => _63.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _64 => _64.owner])) || safeOwner(_optionalChain([resolved, 'optionalAccess', _65 => _65.owner]));
-    const kind = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([stored, 'optionalAccess', _66 => _66.kind]), () => ( _optionalChain([payload, 'optionalAccess', _67 => _67.metadata, 'optionalAccess', _68 => _68.kind]))), () => ( _optionalChain([payload, 'optionalAccess', _69 => _69.kind]))), () => ( _optionalChain([resolved, 'optionalAccess', _70 => _70.kind]))), () => ( null));
+    const owner = safeOwner(_optionalChain([stored, 'optionalAccess', _54 => _54.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _55 => _55.__cloudOwnerGuard, 'optionalAccess', _56 => _56.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _57 => _57.metadata, 'optionalAccess', _58 => _58.cloudOwner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _59 => _59.metadata, 'optionalAccess', _60 => _60.owner])) || safeOwner(_optionalChain([payload, 'optionalAccess', _61 => _61.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _62 => _62.__cloudOwnerGuard, 'optionalAccess', _63 => _63.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _64 => _64.metadata, 'optionalAccess', _65 => _65.cloudOwner])) || safeOwner(_optionalChain([task, 'optionalAccess', _66 => _66.metadata, 'optionalAccess', _67 => _67.owner])) || safeOwner(_optionalChain([task, 'optionalAccess', _68 => _68.owner])) || safeOwner(_optionalChain([resolved, 'optionalAccess', _69 => _69.owner]));
+    const kind = _nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_nullishCoalesce(_optionalChain([stored, 'optionalAccess', _70 => _70.kind]), () => ( _optionalChain([payload, 'optionalAccess', _71 => _71.metadata, 'optionalAccess', _72 => _72.kind]))), () => ( _optionalChain([payload, 'optionalAccess', _73 => _73.kind]))), () => ( _optionalChain([resolved, 'optionalAccess', _74 => _74.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(
@@ -7258,7 +7390,7 @@ async function buildCloudDataInventory({
   const ownerLabels = /* @__PURE__ */ new Map();
   for (const { resource } of entries) {
     const owner = resource.owner;
-    if (!_optionalChain([owner, 'optionalAccess', _71 => _71.label, 'optionalAccess', _72 => _72.trim, 'call', _73 => _73()])) continue;
+    if (!_optionalChain([owner, 'optionalAccess', _75 => _75.label, 'optionalAccess', _76 => _76.trim, 'call', _77 => _77()])) continue;
     const identity = JSON.stringify([owner.type, owner.id]);
     const current = ownerLabels.get(identity);
     if (!current || (_nullishCoalesce(resource.updatedAt, () => ( 0))) > current.updatedAt) {
@@ -7270,7 +7402,7 @@ async function buildCloudDataInventory({
   }
   for (const { resource } of entries) {
     const owner = resource.owner;
-    if (!owner || _optionalChain([owner, 'access', _74 => _74.label, 'optionalAccess', _75 => _75.trim, 'call', _76 => _76()])) continue;
+    if (!owner || _optionalChain([owner, 'access', _78 => _78.label, 'optionalAccess', _79 => _79.trim, 'call', _80 => _80()])) continue;
     const known = ownerLabels.get(JSON.stringify([owner.type, owner.id]));
     if (known) resource.owner = { ...owner, label: known.label };
   }
@@ -7298,9 +7430,18 @@ async function cloudInventory(ctx, db, userId, userKey) {
     db,
     userId,
     userKey,
-    resolveOwner: _optionalChain([ctx, 'access', _77 => _77.cloudData, 'optionalAccess', _78 => _78.resolveOwner])
+    resolveOwner: _optionalChain([ctx, 'access', _81 => _81.cloudData, 'optionalAccess', _82 => _82.resolveOwner])
   });
 }
+function operationWork(operation) {
+  if (["pending", "running"].includes(operation.status)) {
+    return { nextRunAt: Number(operation.nextAttemptAt) || 0, expiresAt: null };
+  }
+  if (["completed", "failed"].includes(operation.status)) {
+    return { nextRunAt: null, expiresAt: Number(operation.updatedAt) + 30 * 864e5 };
+  }
+  return { nextRunAt: null, expiresAt: null };
+}
 async function save(db, userId, key, kind, value, options) {
   return db.putCloudDataRecord(
     userId,
@@ -7313,7 +7454,7 @@ async function save(db, userId, key, kind, value, options) {
       }),
       key
     ),
-    options
+    { ...options, ...kind === "operation" ? { work: operationWork(value) } : {} }
   );
 }
 async function readCloudRecord(db, userId, key, kind, id) {
@@ -7346,7 +7487,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', _79 => _79.length]))
+  if (mode === "purge" && !owner && !_optionalChain([resourceIds, 'optionalAccess', _83 => _83.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");
@@ -7675,33 +7816,65 @@ async function advanceCleanup(ctx, db, userId, key, operation) {
   }
   return operation;
 }
+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;
+  for (const row of batch.rows) {
+    let work;
+    if (["inventory", "plan"].includes(row.kind)) {
+      work = { nextRunAt: null, expiresAt: row.updated_at + 36e5 };
+    } else if (row.kind === "operation") {
+      try {
+        const record = await db.readCloudMaintenanceRecord(row);
+        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;
+      }
+    } else continue;
+    await db.indexCloudDataRecordWork(row.user_id, row.kind, row.id, work, row.write_token);
+  }
+  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', _80 => _80.cloudDataManagement])) return;
-  const rows = await db.listCloudDataRecordsAcrossUsers("operation");
-  await db.cleanupCloudDataRecords("inventory", Date.now() - 36e5);
-  await db.cleanupCloudDataRecords("plan", Date.now() - 36e5);
-  await db.cleanupCloudResourceMetadata();
-  let processed = 0;
+  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");
   for (const row of rows) {
     try {
       const key = await deriveUserEncryptionKey(row.userId, ctx.masterKey);
       const operation = JSON.parse(await decryptFromStorage(row.data, key));
-      if (["completed", "failed"].includes(operation.status) && operation.updatedAt < Date.now() - 30 * 864e5) {
-        await db.deleteCloudDataRecord(row.userId, "operation", operation.id);
-        continue;
-      }
       if (["pending", "running"].includes(operation.status)) {
         await advanceCleanup(ctx, db, row.userId, key, operation);
-        if (++processed >= 100) break;
       }
-    } catch (e11) {
+    } catch (e12) {
       console.warn("[amsg] A cloud cleanup operation could not be resumed");
     }
   }
 }
 
 // src/server/handlers/cloud-data.js
+function inventorySummary(inventory) {
+  const resources = inventory.entries.map((entry) => entry.resource);
+  return {
+    total: resources.length,
+    counts: CLOUD_RESOURCE_TYPES.map((type) => ({
+      type,
+      count: resources.filter((resource) => resource.type === type).length,
+      byteSize: resources.filter((resource) => resource.type === type).reduce((sum, resource) => sum + (resource.byteSize || 0), 0)
+    })),
+    complete: inventory.complete,
+    gaps: inventory.gaps
+  };
+}
 function createCloudDataHandler(ctx) {
   async function run(url, headers, body, method) {
     const tenant = await ctx.tenantManager.resolveTenant(headers);
@@ -7734,7 +7907,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 (e12) {
+        } catch (e13) {
           throw cloudError("DECRYPTION_FAILED", "\u8BF7\u6C42\u89E3\u5BC6\u5931\u8D25");
         }
         if (!input || typeof input !== "object" || Array.isArray(input))
@@ -7748,17 +7921,7 @@ function createCloudDataHandler(ctx) {
         const filter = { ownerType, ownerId, type };
         if (path.endsWith("/summary")) {
           const inventory = await cloudInventory(ctx, db, userId, key);
-          const resources = inventory.entries.map((e) => e.resource);
-          data = {
-            total: resources.length,
-            counts: CLOUD_RESOURCE_TYPES.map((type2) => ({
-              type: type2,
-              count: resources.filter((r) => r.type === type2).length,
-              byteSize: resources.filter((r) => r.type === type2).reduce((sum, r) => sum + (r.byteSize || 0), 0)
-            })),
-            complete: inventory.complete,
-            gaps: inventory.gaps
-          };
+          data = inventorySummary(inventory);
         } else {
           const limit = Number(params.get("limit") || 50);
           if (!Number.isInteger(limit) || limit < 1 || limit > 200)
@@ -7790,9 +7953,10 @@ function createCloudDataHandler(ctx) {
             snapshot = {
               id: crypto.randomUUID(),
               filter,
+              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', _81 => _81.owner, 'optionalAccess', _82 => _82.type]) === ownerType && r.owner.id === ownerId)
+                (r) => (!type || r.type === type) && (!ownerId || _optionalChain([r, 'access', _89 => _89.owner, 'optionalAccess', _90 => _90.type]) === ownerType && r.owner.id === ownerId)
               ),
               complete: inventory.complete,
               gaps: inventory.gaps
@@ -7806,6 +7970,7 @@ function createCloudDataHandler(ctx) {
           }
           data = {
             resources: snapshot.resources.slice(offset, offset + limit),
+            ...snapshot.summary ? { summary: snapshot.summary } : {},
             nextCursor: offset + limit < snapshot.resources.length ? `${snapshot.id}:${offset + limit}` : null,
             complete: snapshot.complete,
             gaps: snapshot.gaps
@@ -7826,7 +7991,7 @@ function createCloudDataHandler(ctx) {
                 JSON.parse(await decryptFromStorage(row.data, key))
               )
             );
-          } catch (e13) {
+          } catch (e14) {
             gaps.push({
               source: "operation",
               code: "UNREADABLE_OPERATION",
@@ -7874,7 +8039,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', _83 => _83.owner, 'optionalAccess', _84 => _84.type]) === owner.type && _optionalChain([op, 'access', _85 => _85.owner, 'optionalAccess', _86 => _86.id]) === owner.id && ["pending", "running"].includes(op.status))
+            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))
               throw cloudError(
                 "CLOUD_CLEANUP_IN_PROGRESS",
                 "\u6E05\u7406\u5B8C\u6210\u540E\u624D\u80FD\u91CD\u65B0\u542F\u7528",
@@ -8092,7 +8257,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', _87 => _87.cloudData, 'optionalAccess', _88 => _88.resolveOwner]) }),
+    db: createCloudGuardedAdapter(config.db, { masterKey: config.masterKey, resolveOwner: _optionalChain([config, 'access', _95 => _95.cloudData, 'optionalAccess', _96 => _96.resolveOwner]) }),
     masterKey: config.masterKey,
     serverToken: config.serverToken
   });
@@ -8150,7 +8315,7 @@ function createSingleUserServer(config) {
 }
 
 // src/server/lib/schema-version.js
-var SCHEMA_VERSION = "2.6.0-cloud-data.1";
+var SCHEMA_VERSION = "2.6.0-cloud-data.2";
 function requireIntrospection(db) {
   if (!db || typeof db.describeSchema !== "function") {
     throw new Error(
@@ -8178,6 +8343,10 @@ 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}`);
+  }
   const ok = missing.length === 0;
   return { current: ok ? SCHEMA_VERSION : null, required: SCHEMA_VERSION, ok, missing };
 }

package/dist/cloudflare.cjs

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

package/dist/cloudflare.mjs

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