@rei-standard/amsg-server 2.6.0-next.26 → 2.6.0-next.28

package/dist/adapters/d1.d.ts

@@ -216,8 +216,11 @@ export class D1Adapter {
      * @param {number} [now] - 服务端当前时刻（epoch 毫秒），判定「这行来自未来」用的
      *   就是它。调用方（lib/client-state-store.js）传下来，测试可以钉住一个假时钟；
      *   自定义调用方不传时退回本机时钟。
-     * @returns {Promise<{ upserted: number, skipped: number, outcomes: boolean[] }>}
+     * @returns {Promise<{ upserted: number, skipped: number, outcomes: boolean[], cleanupOutcomes?: Array<boolean|null> }>}
      *   `outcomes[i]` 对应 entries[i] 是否真的写入（changes > 0）。
+     *   `cleanupOutcomes[i]` 对应 cleanups[i]（传了 cleanups 才有）：精确 key 形态
+     *   回 `true` = 这个 key 的行已经不在（删掉了，或本来就没有）、`false` = 行还在
+     *   （库里那行更新，删除被条件写拦下）；前缀形态不探测，回 `null`。
      */
     upsertClientState(userId: string, entries: Array<{
         namespace: string;
@@ -233,6 +236,7 @@ export class D1Adapter {
         upserted: number;
         skipped: number;
         outcomes: boolean[];
+        cleanupOutcomes?: Array<boolean | null>;
     }>;
     /**
      * All entries of one namespace (values still encrypted).

package/dist/adapters/interface.d.ts

@@ -147,6 +147,9 @@ export type DbAdapter = {
      * 写入与删除都对这种行放行，否则那一行会一直卡到真实时间追上去为止。忽略这个参数的自定义
      * adapter 功能不变，只是没有这道解锁。
      * `outcomes` 逐条报告 entries[i] 是否真的写入（缺席时调用方按物理行计数兜底）。
+     * `cleanupOutcomes`（可选）逐条报告 cleanups[i] 的结局：精确 key 形态回 `true`（这个 key 的行已不在——
+     * 删掉了或本来就没有）/ `false`（行还在，库里那行更新、删除被条件写拦下）；前缀形态回 `null`。
+     * 调用方靠它把被拦下的删除计入 skippedEntries；缺席时删除一律按「已删」计。
      */
     upsertClientState?: (userId: string, entries: Array<{
         namespace: string;
@@ -162,6 +165,7 @@ export type DbAdapter = {
         upserted: number;
         skipped: number;
         outcomes?: boolean[];
+        cleanupOutcomes?: Array<boolean | null>;
     }>;
     /**
      * (optional; single-user/D1 only) All entries of one namespace; values still encrypted.

package/dist/adapters/schema.sqlite.d.ts

@@ -31,10 +31,28 @@ export const SQLITE_INDEXES: {
     critical: boolean;
 }[];
 export const CLIENT_STATE_TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS client_state (\n    user_id TEXT NOT NULL,\n    namespace TEXT NOT NULL,\n    key TEXT NOT NULL,\n    value TEXT NOT NULL,\n    updated_at INTEGER NOT NULL,\n    PRIMARY KEY (user_id, namespace, key)\n  )\n";
+export const CLIENT_STATE_INDEXES: {
+    name: string;
+    sql: string;
+    description: string;
+    critical: boolean;
+}[];
 export const PUSH_SUBSCRIPTION_TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS push_subscriptions (\n    user_id TEXT PRIMARY KEY,\n    subscription TEXT NOT NULL,\n    updated_at INTEGER NOT NULL\n  )\n";
 export const LLM_CREDENTIALS_TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS llm_credentials (\n    user_id TEXT NOT NULL,\n    cred_id TEXT NOT NULL,\n    encrypted_value TEXT NOT NULL,\n    created_at TEXT NOT NULL,\n    updated_at TEXT NOT NULL,\n    PRIMARY KEY (user_id, cred_id)\n  )\n";
 export const MESSAGE_OUTBOX_TABLE_SQL: "\n  CREATE TABLE IF NOT EXISTS message_outbox (\n    id INTEGER PRIMARY KEY AUTOINCREMENT,\n    user_id TEXT NOT NULL,\n    message_id TEXT NOT NULL,\n    task_uuid TEXT,\n    session_id TEXT,\n    message_index INTEGER,\n    total_messages INTEGER,\n    payload TEXT NOT NULL,\n    created_at INTEGER NOT NULL,\n    delivered_at INTEGER,\n    acked_at INTEGER,\n    UNIQUE (user_id, message_id)\n  )\n";
-export const MESSAGE_OUTBOX_INDEX_SQL: "\n  CREATE INDEX IF NOT EXISTS idx_outbox_unacked\n    ON message_outbox (user_id, id)\n    WHERE acked_at IS NULL\n";
+export const MESSAGE_OUTBOX_INDEXES: {
+    name: string;
+    sql: string;
+    description: string;
+    critical: boolean;
+}[];
+/** 三张表的索引合在一起，initSchema 按这份顺序逐条建。 */
+export const SQLITE_ALL_INDEXES: {
+    name: string;
+    sql: string;
+    description: string;
+    critical: boolean;
+}[];
 /**
  * 这一版代码跑起来需要的表 / 列 / 索引。
  *

package/dist/{chunk-GXYVOEF3.cjs → chunk-PBOY4LG7.cjs}

@@ -1065,7 +1065,7 @@ async function writeClientStateEntries({ db, userId, userKey, entries, now }) {
   const cleanups = [];
   const rootRowIndexes = [];
   const rootRowEntries = [];
-  let deleted = 0;
+  const deletions = [];
   for (const entry of entries) {
     const rawGuardAt = Number.isInteger(entry.version) && entry.version > 0 ? entry.version : entry.updatedAt;
     const guardAt = Math.min(rawGuardAt, at);
@@ -1075,12 +1075,12 @@ async function writeClientStateEntries({ db, userId, userKey, entries, now }) {
       updatedAt: guardAt
     });
     if (entry.value === null) {
+      deletions.push({ cleanupIndex: cleanups.length, entry });
       cleanups.push({
         namespace: entry.namespace,
         key: entry.key,
         updatedAt: guardAt
       });
-      deleted++;
       continue;
     }
     rootRowIndexes.push(physicalRows.length);
@@ -1117,6 +1117,7 @@ async function writeClientStateEntries({ db, userId, userKey, entries, now }) {
   const result = await db.upsertClientState(userId, physicalRows, cleanups, at);
   let upserted = 0;
   let skipped = 0;
+  let deleted = 0;
   const skippedEntries = [];
   if (Array.isArray(result.outcomes) && result.outcomes.length === physicalRows.length) {
     for (let i = 0; i < rootRowIndexes.length; i++) {
@@ -1132,6 +1133,15 @@ async function writeClientStateEntries({ db, userId, userKey, entries, now }) {
     upserted = result.upserted;
     skipped = result.skipped;
   }
+  const cleanupOutcomes = Array.isArray(result.cleanupOutcomes) && result.cleanupOutcomes.length === cleanups.length ? result.cleanupOutcomes : null;
+  for (const { cleanupIndex, entry } of deletions) {
+    if (cleanupOutcomes && cleanupOutcomes[cleanupIndex] === false) {
+      skipped++;
+      skippedEntries.push({ namespace: entry.namespace, key: entry.key });
+    } else {
+      deleted++;
+    }
+  }
   return { upserted, skipped, deleted, skippedEntries };
 }
 
@@ -4128,6 +4138,19 @@ var CLIENT_STATE_TABLE_SQL = `
     PRIMARY KEY (user_id, namespace, key)
   )
 `;
+var CLIENT_STATE_INDEXES = [
+  {
+    name: "idx_client_state_cleanup",
+    // 服务 cleanupClientState 的
+    //   DELETE FROM client_state WHERE namespace = ? AND updated_at < ?
+    // 主键 (user_id, namespace, key) 最左列是 user_id，按 namespace 起头的条件
+    // 吃不到它。
+    sql: `CREATE INDEX IF NOT EXISTS idx_client_state_cleanup
+          ON client_state (namespace, updated_at)`,
+    description: "TTL cleanup index (cleanupClientState by namespace + updated_at)",
+    critical: false
+  }
+];
 var PUSH_SUBSCRIPTION_TABLE_SQL = `
   CREATE TABLE IF NOT EXISTS push_subscriptions (
     user_id TEXT PRIMARY KEY,
@@ -4161,11 +4184,57 @@ var MESSAGE_OUTBOX_TABLE_SQL = `
     UNIQUE (user_id, message_id)
   )
 `;
-var MESSAGE_OUTBOX_INDEX_SQL = `
-  CREATE INDEX IF NOT EXISTS idx_outbox_unacked
-    ON message_outbox (user_id, id)
-    WHERE acked_at IS NULL
-`;
+var MESSAGE_OUTBOX_INDEXES = [
+  {
+    name: "idx_outbox_unacked",
+    // 服务 listUnackedOutbox 的
+    //   SELECT … WHERE user_id = ? AND acked_at IS NULL AND id > ? ORDER BY id
+    sql: `CREATE INDEX IF NOT EXISTS idx_outbox_unacked
+          ON message_outbox (user_id, id)
+          WHERE acked_at IS NULL`,
+    description: "Unacked outbox paging index (GET /outbox)",
+    critical: false
+  },
+  {
+    name: "idx_outbox_created",
+    // 服务 cleanupOutbox 的
+    //   DELETE FROM message_outbox WHERE created_at < ?
+    sql: `CREATE INDEX IF NOT EXISTS idx_outbox_created
+          ON message_outbox (created_at)`,
+    description: "Outbox retention cleanup index (cleanupOutbox by created_at)",
+    critical: false
+  },
+  {
+    name: "idx_outbox_acked",
+    // 服务 cleanupOutbox 的
+    //   DELETE FROM message_outbox WHERE acked_at IS NOT NULL AND acked_at < ?
+    // 部分索引只收已 ack 的行：未 ack 的那部分本来就不是这条语句的目标，
+    // idx_outbox_unacked 的 WHERE 条件与它正好互补。
+    sql: `CREATE INDEX IF NOT EXISTS idx_outbox_acked
+          ON message_outbox (acked_at)
+          WHERE acked_at IS NOT NULL`,
+    description: "Acked outbox cleanup index (cleanupOutbox by acked_at)",
+    critical: false
+  },
+  {
+    name: "idx_outbox_task_undelivered",
+    // 服务 discardUndeliveredOutboxForTask 的
+    //   DELETE FROM message_outbox
+    //   WHERE user_id = ? AND task_uuid = ? AND delivered_at IS NULL AND acked_at IS NULL
+    // 没有它这条只能靶着 user_id 走 (user_id, message_id) 或 idx_outbox_unacked，
+    // 单用户部署下 user_id 对每一行都成立，等于把整个未 ack 积压扫一遍。
+    sql: `CREATE INDEX IF NOT EXISTS idx_outbox_task_undelivered
+          ON message_outbox (user_id, task_uuid)
+          WHERE delivered_at IS NULL AND acked_at IS NULL`,
+    description: "Undelivered-by-task discard index (cancel / supersede)",
+    critical: false
+  }
+];
+var SQLITE_ALL_INDEXES = [
+  ...SQLITE_INDEXES,
+  ...CLIENT_STATE_INDEXES,
+  ...MESSAGE_OUTBOX_INDEXES
+];
 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] : "";
@@ -4200,7 +4269,7 @@ var SQLITE_REQUIRED_SCHEMA = Object.freeze({
     describeTable(LLM_CREDENTIALS_TABLE_SQL),
     describeTable(MESSAGE_OUTBOX_TABLE_SQL)
   ])),
-  indexes: Object.freeze(SQLITE_INDEXES.filter((index) => index.critical).map((index) => index.name))
+  indexes: Object.freeze(SQLITE_ALL_INDEXES.filter((index) => index.critical).map((index) => index.name))
 });
 
 // src/server/adapters/d1.js
@@ -4305,7 +4374,6 @@ var D1Adapter = class {
     await this._db.prepare(PUSH_SUBSCRIPTION_TABLE_SQL).run();
     await this._db.prepare(LLM_CREDENTIALS_TABLE_SQL).run();
     await this._db.prepare(MESSAGE_OUTBOX_TABLE_SQL).run();
-    await this._db.prepare(MESSAGE_OUTBOX_INDEX_SQL).run();
     for (const migration of SQLITE_MIGRATIONS) {
       try {
         await this._db.prepare(migration.sql).run();
@@ -4314,7 +4382,7 @@ var D1Adapter = class {
       }
     }
     const indexResults = [];
-    for (const index of SQLITE_INDEXES) {
+    for (const index of SQLITE_ALL_INDEXES) {
       try {
         await this._db.prepare(index.sql).run();
         indexResults.push({ name: index.name, status: "success", description: index.description, critical: !!index.critical });
@@ -4683,8 +4751,11 @@ var D1Adapter = class {
    * @param {number} [now] - 服务端当前时刻（epoch 毫秒），判定「这行来自未来」用的
    *   就是它。调用方（lib/client-state-store.js）传下来，测试可以钉住一个假时钟；
    *   自定义调用方不传时退回本机时钟。
-   * @returns {Promise<{ upserted: number, skipped: number, outcomes: boolean[] }>}
+   * @returns {Promise<{ upserted: number, skipped: number, outcomes: boolean[], cleanupOutcomes?: Array<boolean|null> }>}
    *   `outcomes[i]` 对应 entries[i] 是否真的写入（changes > 0）。
+   *   `cleanupOutcomes[i]` 对应 cleanups[i]（传了 cleanups 才有）：精确 key 形态
+   *   回 `true` = 这个 key 的行已经不在（删掉了，或本来就没有）、`false` = 行还在
+   *   （库里那行更新，删除被条件写拦下）；前缀形态不探测，回 `null`。
    */
   async upsertClientState(userId, entries, cleanups = [], now = Date.now()) {
     const UPSERT_SQL = `INSERT INTO client_state (user_id, namespace, key, value, updated_at)
@@ -4700,29 +4771,53 @@ var D1Adapter = class {
     const CLEANUP_KEY_SQL = `DELETE FROM client_state
        WHERE user_id = ? AND namespace = ? AND key = ?
          AND (updated_at <= ? OR updated_at > ?)`;
-    const buildStatements = () => [
-      ...cleanups.map((c) => typeof c.key === "string" ? this._db.prepare(CLEANUP_KEY_SQL).bind(userId, c.namespace, c.key, c.updatedAt, now) : this._db.prepare(CLEANUP_PREFIX_SQL).bind(userId, c.namespace, c.keyPrefix, prefixRangeEnd(c.keyPrefix), c.updatedAt, now)),
-      ...entries.map(
-        (entry) => this._db.prepare(UPSERT_SQL).bind(userId, entry.namespace, entry.key, entry.value, entry.updatedAt, now)
-      )
-    ];
+    const PROBE_KEY_SQL = `SELECT COUNT(*) AS n FROM client_state
+       WHERE user_id = ? AND namespace = ? AND key = ?`;
+    const statements = [];
+    const probeIndexes = [];
+    for (const c of cleanups) {
+      if (typeof c.key === "string") {
+        statements.push(this._db.prepare(CLEANUP_KEY_SQL).bind(userId, c.namespace, c.key, c.updatedAt, now));
+        probeIndexes.push(statements.length);
+        statements.push(this._db.prepare(PROBE_KEY_SQL).bind(userId, c.namespace, c.key));
+      } else {
+        statements.push(
+          this._db.prepare(CLEANUP_PREFIX_SQL).bind(userId, c.namespace, c.keyPrefix, prefixRangeEnd(c.keyPrefix), c.updatedAt, now)
+        );
+        probeIndexes.push(null);
+      }
+    }
+    const upsertStart = statements.length;
+    for (const entry of entries) {
+      statements.push(
+        this._db.prepare(UPSERT_SQL).bind(userId, entry.namespace, entry.key, entry.value, entry.updatedAt, now)
+      );
+    }
     let results;
     if (typeof this._db.batch === "function") {
-      results = await this._db.batch(buildStatements());
+      results = await this._db.batch(statements);
     } else {
       results = [];
-      for (const stmt of buildStatements()) {
+      for (const stmt of statements) {
         results.push(await stmt.run());
       }
     }
-    const outcomes = results.slice(cleanups.length).map((res) => res.meta.changes > 0);
+    const outcomes = results.slice(upsertStart).map((res) => res.meta.changes > 0);
     let upserted = 0;
     let skipped = 0;
     for (const wrote of outcomes) {
       if (wrote) upserted++;
       else skipped++;
     }
-    return { upserted, skipped, outcomes };
+    const result = { upserted, skipped, outcomes };
+    if (cleanups.length > 0) {
+      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', _3 => _3.n]), () => ( 0))) === 0;
+      });
+    }
+    return result;
   }
   /**
    * All entries of one namespace (values still encrypted).
@@ -5211,12 +5306,14 @@ function validateEntry(entry, index, maxValueBytes) {
   if (INTERNAL_STATE_CHAR_RE.test(entry.key)) {
     return rejectEntry(entry, index, "INVALID_STATE_KEY", `entries[${index}].key \u4E0D\u80FD\u5305\u542B\u63A7\u5236\u5B57\u7B26\uFF08\\u0000-\\u001f \u4E3A\u5E93\u5185\u90E8\u4FDD\u7559\uFF09`);
   }
-  if (typeof entry.value !== "string") {
-    return rejectEntry(entry, index, "INVALID_STATE_VALUE", `entries[${index}].value \u5FC5\u987B\u662F\u5B57\u7B26\u4E32\uFF08\u5BBF\u4E3B\u81EA\u884C\u5E8F\u5217\u5316\uFF09`);
+  if (entry.value !== null && typeof entry.value !== "string") {
+    return rejectEntry(entry, index, "INVALID_STATE_VALUE", `entries[${index}].value \u5FC5\u987B\u662F\u5B57\u7B26\u4E32\uFF08\u5BBF\u4E3B\u81EA\u884C\u5E8F\u5217\u5316\uFF09\uFF0C\u6216 null \u8868\u793A\u5220\u9664`);
   }
-  const bytes = stateValueBytes(entry.value);
-  if (bytes > maxValueBytes) {
-    return rejectEntry(entry, index, "STATE_VALUE_TOO_LARGE", `entries[${index}].value \u8D85\u8FC7\u5355\u6761\u603B\u4E0A\u9650`, { bytes, maxBytes: maxValueBytes });
+  if (typeof entry.value === "string") {
+    const bytes = stateValueBytes(entry.value);
+    if (bytes > maxValueBytes) {
+      return rejectEntry(entry, index, "STATE_VALUE_TOO_LARGE", `entries[${index}].value \u8D85\u8FC7\u5355\u6761\u603B\u4E0A\u9650`, { bytes, maxBytes: maxValueBytes });
+    }
   }
   if (!Number.isInteger(entry.updatedAt) || entry.updatedAt <= 0) {
     return rejectEntry(entry, index, "INVALID_STATE_UPDATED_AT", `entries[${index}].updatedAt \u5FC5\u987B\u662F\u6B63\u6574\u6570\uFF08epoch \u6BEB\u79D2\uFF09`);
@@ -5277,8 +5374,9 @@ function createClientStateHandler(ctx) {
     if (typeof db.upsertClientState !== "function") {
       return err3(501, "CLIENT_STATE_NOT_SUPPORTED", "\u5F53\u524D\u6570\u636E\u5E93\u9002\u914D\u5668\u4E0D\u652F\u6301 client_state");
     }
-    const { upserted, skipped, skippedEntries } = await writeClientStateEntries({ db, userId, userKey, entries: accepted });
+    const { upserted, skipped, deleted, skippedEntries } = await writeClientStateEntries({ db, userId, userKey, entries: accepted });
     const data = { upserted, skipped };
+    if (deleted > 0) data.deleted = deleted;
     if (skippedEntries.length > 0) data.skippedEntries = skippedEntries;
     if (rejected.length > 0) data.rejected = rejected;
     return { status: 200, body: { success: true, data } };
@@ -5325,7 +5423,7 @@ function createClientStateHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "2.6.0-next.26" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.6.0-next.28" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([
@@ -5411,7 +5509,10 @@ var SERVER_FEATURES = Object.freeze([
   // client_state 按命名空间过期清理（config 的 clientStateTtl，cron 每跳顺手做）。
   "client-state-ttl",
   // hook ctx 带 emitResult(payload)：往客户端补一条自定义结果（落收件箱 + 推送）。
-  "emit-result"
+  "emit-result",
+  // PUT /client-state 的 entry 认 value: null（删掉这个 key，连切片行一起；同一套
+  // last-write-wins，被拦下的进 skippedEntries；删掉的条数在 data.deleted）。
+  "client-state-delete"
 ]);
 function createCapabilitiesHandler(ctx) {
   async function GET(url, headers) {

package/dist/{chunk-4YH3TS4W.mjs → chunk-YBBXKK7U.mjs}

@@ -1065,7 +1065,7 @@ async function writeClientStateEntries({ db, userId, userKey, entries, now }) {
   const cleanups = [];
   const rootRowIndexes = [];
   const rootRowEntries = [];
-  let deleted = 0;
+  const deletions = [];
   for (const entry of entries) {
     const rawGuardAt = Number.isInteger(entry.version) && entry.version > 0 ? entry.version : entry.updatedAt;
     const guardAt = Math.min(rawGuardAt, at);
@@ -1075,12 +1075,12 @@ async function writeClientStateEntries({ db, userId, userKey, entries, now }) {
       updatedAt: guardAt
     });
     if (entry.value === null) {
+      deletions.push({ cleanupIndex: cleanups.length, entry });
       cleanups.push({
         namespace: entry.namespace,
         key: entry.key,
         updatedAt: guardAt
       });
-      deleted++;
       continue;
     }
     rootRowIndexes.push(physicalRows.length);
@@ -1117,6 +1117,7 @@ async function writeClientStateEntries({ db, userId, userKey, entries, now }) {
   const result = await db.upsertClientState(userId, physicalRows, cleanups, at);
   let upserted = 0;
   let skipped = 0;
+  let deleted = 0;
   const skippedEntries = [];
   if (Array.isArray(result.outcomes) && result.outcomes.length === physicalRows.length) {
     for (let i = 0; i < rootRowIndexes.length; i++) {
@@ -1132,6 +1133,15 @@ async function writeClientStateEntries({ db, userId, userKey, entries, now }) {
     upserted = result.upserted;
     skipped = result.skipped;
   }
+  const cleanupOutcomes = Array.isArray(result.cleanupOutcomes) && result.cleanupOutcomes.length === cleanups.length ? result.cleanupOutcomes : null;
+  for (const { cleanupIndex, entry } of deletions) {
+    if (cleanupOutcomes && cleanupOutcomes[cleanupIndex] === false) {
+      skipped++;
+      skippedEntries.push({ namespace: entry.namespace, key: entry.key });
+    } else {
+      deleted++;
+    }
+  }
   return { upserted, skipped, deleted, skippedEntries };
 }
 
@@ -4128,6 +4138,19 @@ var CLIENT_STATE_TABLE_SQL = `
     PRIMARY KEY (user_id, namespace, key)
   )
 `;
+var CLIENT_STATE_INDEXES = [
+  {
+    name: "idx_client_state_cleanup",
+    // 服务 cleanupClientState 的
+    //   DELETE FROM client_state WHERE namespace = ? AND updated_at < ?
+    // 主键 (user_id, namespace, key) 最左列是 user_id，按 namespace 起头的条件
+    // 吃不到它。
+    sql: `CREATE INDEX IF NOT EXISTS idx_client_state_cleanup
+          ON client_state (namespace, updated_at)`,
+    description: "TTL cleanup index (cleanupClientState by namespace + updated_at)",
+    critical: false
+  }
+];
 var PUSH_SUBSCRIPTION_TABLE_SQL = `
   CREATE TABLE IF NOT EXISTS push_subscriptions (
     user_id TEXT PRIMARY KEY,
@@ -4161,11 +4184,57 @@ var MESSAGE_OUTBOX_TABLE_SQL = `
     UNIQUE (user_id, message_id)
   )
 `;
-var MESSAGE_OUTBOX_INDEX_SQL = `
-  CREATE INDEX IF NOT EXISTS idx_outbox_unacked
-    ON message_outbox (user_id, id)
-    WHERE acked_at IS NULL
-`;
+var MESSAGE_OUTBOX_INDEXES = [
+  {
+    name: "idx_outbox_unacked",
+    // 服务 listUnackedOutbox 的
+    //   SELECT … WHERE user_id = ? AND acked_at IS NULL AND id > ? ORDER BY id
+    sql: `CREATE INDEX IF NOT EXISTS idx_outbox_unacked
+          ON message_outbox (user_id, id)
+          WHERE acked_at IS NULL`,
+    description: "Unacked outbox paging index (GET /outbox)",
+    critical: false
+  },
+  {
+    name: "idx_outbox_created",
+    // 服务 cleanupOutbox 的
+    //   DELETE FROM message_outbox WHERE created_at < ?
+    sql: `CREATE INDEX IF NOT EXISTS idx_outbox_created
+          ON message_outbox (created_at)`,
+    description: "Outbox retention cleanup index (cleanupOutbox by created_at)",
+    critical: false
+  },
+  {
+    name: "idx_outbox_acked",
+    // 服务 cleanupOutbox 的
+    //   DELETE FROM message_outbox WHERE acked_at IS NOT NULL AND acked_at < ?
+    // 部分索引只收已 ack 的行：未 ack 的那部分本来就不是这条语句的目标，
+    // idx_outbox_unacked 的 WHERE 条件与它正好互补。
+    sql: `CREATE INDEX IF NOT EXISTS idx_outbox_acked
+          ON message_outbox (acked_at)
+          WHERE acked_at IS NOT NULL`,
+    description: "Acked outbox cleanup index (cleanupOutbox by acked_at)",
+    critical: false
+  },
+  {
+    name: "idx_outbox_task_undelivered",
+    // 服务 discardUndeliveredOutboxForTask 的
+    //   DELETE FROM message_outbox
+    //   WHERE user_id = ? AND task_uuid = ? AND delivered_at IS NULL AND acked_at IS NULL
+    // 没有它这条只能靶着 user_id 走 (user_id, message_id) 或 idx_outbox_unacked，
+    // 单用户部署下 user_id 对每一行都成立，等于把整个未 ack 积压扫一遍。
+    sql: `CREATE INDEX IF NOT EXISTS idx_outbox_task_undelivered
+          ON message_outbox (user_id, task_uuid)
+          WHERE delivered_at IS NULL AND acked_at IS NULL`,
+    description: "Undelivered-by-task discard index (cancel / supersede)",
+    critical: false
+  }
+];
+var SQLITE_ALL_INDEXES = [
+  ...SQLITE_INDEXES,
+  ...CLIENT_STATE_INDEXES,
+  ...MESSAGE_OUTBOX_INDEXES
+];
 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] : "";
@@ -4200,7 +4269,7 @@ var SQLITE_REQUIRED_SCHEMA = Object.freeze({
     describeTable(LLM_CREDENTIALS_TABLE_SQL),
     describeTable(MESSAGE_OUTBOX_TABLE_SQL)
   ])),
-  indexes: Object.freeze(SQLITE_INDEXES.filter((index) => index.critical).map((index) => index.name))
+  indexes: Object.freeze(SQLITE_ALL_INDEXES.filter((index) => index.critical).map((index) => index.name))
 });
 
 // src/server/adapters/d1.js
@@ -4305,7 +4374,6 @@ var D1Adapter = class {
     await this._db.prepare(PUSH_SUBSCRIPTION_TABLE_SQL).run();
     await this._db.prepare(LLM_CREDENTIALS_TABLE_SQL).run();
     await this._db.prepare(MESSAGE_OUTBOX_TABLE_SQL).run();
-    await this._db.prepare(MESSAGE_OUTBOX_INDEX_SQL).run();
     for (const migration of SQLITE_MIGRATIONS) {
       try {
         await this._db.prepare(migration.sql).run();
@@ -4314,7 +4382,7 @@ var D1Adapter = class {
       }
     }
     const indexResults = [];
-    for (const index of SQLITE_INDEXES) {
+    for (const index of SQLITE_ALL_INDEXES) {
       try {
         await this._db.prepare(index.sql).run();
         indexResults.push({ name: index.name, status: "success", description: index.description, critical: !!index.critical });
@@ -4683,8 +4751,11 @@ var D1Adapter = class {
    * @param {number} [now] - 服务端当前时刻（epoch 毫秒），判定「这行来自未来」用的
    *   就是它。调用方（lib/client-state-store.js）传下来，测试可以钉住一个假时钟；
    *   自定义调用方不传时退回本机时钟。
-   * @returns {Promise<{ upserted: number, skipped: number, outcomes: boolean[] }>}
+   * @returns {Promise<{ upserted: number, skipped: number, outcomes: boolean[], cleanupOutcomes?: Array<boolean|null> }>}
    *   `outcomes[i]` 对应 entries[i] 是否真的写入（changes > 0）。
+   *   `cleanupOutcomes[i]` 对应 cleanups[i]（传了 cleanups 才有）：精确 key 形态
+   *   回 `true` = 这个 key 的行已经不在（删掉了，或本来就没有）、`false` = 行还在
+   *   （库里那行更新，删除被条件写拦下）；前缀形态不探测，回 `null`。
    */
   async upsertClientState(userId, entries, cleanups = [], now = Date.now()) {
     const UPSERT_SQL = `INSERT INTO client_state (user_id, namespace, key, value, updated_at)
@@ -4700,29 +4771,53 @@ var D1Adapter = class {
     const CLEANUP_KEY_SQL = `DELETE FROM client_state
        WHERE user_id = ? AND namespace = ? AND key = ?
          AND (updated_at <= ? OR updated_at > ?)`;
-    const buildStatements = () => [
-      ...cleanups.map((c) => typeof c.key === "string" ? this._db.prepare(CLEANUP_KEY_SQL).bind(userId, c.namespace, c.key, c.updatedAt, now) : this._db.prepare(CLEANUP_PREFIX_SQL).bind(userId, c.namespace, c.keyPrefix, prefixRangeEnd(c.keyPrefix), c.updatedAt, now)),
-      ...entries.map(
-        (entry) => this._db.prepare(UPSERT_SQL).bind(userId, entry.namespace, entry.key, entry.value, entry.updatedAt, now)
-      )
-    ];
+    const PROBE_KEY_SQL = `SELECT COUNT(*) AS n FROM client_state
+       WHERE user_id = ? AND namespace = ? AND key = ?`;
+    const statements = [];
+    const probeIndexes = [];
+    for (const c of cleanups) {
+      if (typeof c.key === "string") {
+        statements.push(this._db.prepare(CLEANUP_KEY_SQL).bind(userId, c.namespace, c.key, c.updatedAt, now));
+        probeIndexes.push(statements.length);
+        statements.push(this._db.prepare(PROBE_KEY_SQL).bind(userId, c.namespace, c.key));
+      } else {
+        statements.push(
+          this._db.prepare(CLEANUP_PREFIX_SQL).bind(userId, c.namespace, c.keyPrefix, prefixRangeEnd(c.keyPrefix), c.updatedAt, now)
+        );
+        probeIndexes.push(null);
+      }
+    }
+    const upsertStart = statements.length;
+    for (const entry of entries) {
+      statements.push(
+        this._db.prepare(UPSERT_SQL).bind(userId, entry.namespace, entry.key, entry.value, entry.updatedAt, now)
+      );
+    }
     let results;
     if (typeof this._db.batch === "function") {
-      results = await this._db.batch(buildStatements());
+      results = await this._db.batch(statements);
     } else {
       results = [];
-      for (const stmt of buildStatements()) {
+      for (const stmt of statements) {
         results.push(await stmt.run());
       }
     }
-    const outcomes = results.slice(cleanups.length).map((res) => res.meta.changes > 0);
+    const outcomes = results.slice(upsertStart).map((res) => res.meta.changes > 0);
     let upserted = 0;
     let skipped = 0;
     for (const wrote of outcomes) {
       if (wrote) upserted++;
       else skipped++;
     }
-    return { upserted, skipped, outcomes };
+    const result = { upserted, skipped, outcomes };
+    if (cleanups.length > 0) {
+      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(row?.n ?? 0) === 0;
+      });
+    }
+    return result;
   }
   /**
    * All entries of one namespace (values still encrypted).
@@ -5211,12 +5306,14 @@ function validateEntry(entry, index, maxValueBytes) {
   if (INTERNAL_STATE_CHAR_RE.test(entry.key)) {
     return rejectEntry(entry, index, "INVALID_STATE_KEY", `entries[${index}].key \u4E0D\u80FD\u5305\u542B\u63A7\u5236\u5B57\u7B26\uFF08\\u0000-\\u001f \u4E3A\u5E93\u5185\u90E8\u4FDD\u7559\uFF09`);
   }
-  if (typeof entry.value !== "string") {
-    return rejectEntry(entry, index, "INVALID_STATE_VALUE", `entries[${index}].value \u5FC5\u987B\u662F\u5B57\u7B26\u4E32\uFF08\u5BBF\u4E3B\u81EA\u884C\u5E8F\u5217\u5316\uFF09`);
+  if (entry.value !== null && typeof entry.value !== "string") {
+    return rejectEntry(entry, index, "INVALID_STATE_VALUE", `entries[${index}].value \u5FC5\u987B\u662F\u5B57\u7B26\u4E32\uFF08\u5BBF\u4E3B\u81EA\u884C\u5E8F\u5217\u5316\uFF09\uFF0C\u6216 null \u8868\u793A\u5220\u9664`);
   }
-  const bytes = stateValueBytes(entry.value);
-  if (bytes > maxValueBytes) {
-    return rejectEntry(entry, index, "STATE_VALUE_TOO_LARGE", `entries[${index}].value \u8D85\u8FC7\u5355\u6761\u603B\u4E0A\u9650`, { bytes, maxBytes: maxValueBytes });
+  if (typeof entry.value === "string") {
+    const bytes = stateValueBytes(entry.value);
+    if (bytes > maxValueBytes) {
+      return rejectEntry(entry, index, "STATE_VALUE_TOO_LARGE", `entries[${index}].value \u8D85\u8FC7\u5355\u6761\u603B\u4E0A\u9650`, { bytes, maxBytes: maxValueBytes });
+    }
   }
   if (!Number.isInteger(entry.updatedAt) || entry.updatedAt <= 0) {
     return rejectEntry(entry, index, "INVALID_STATE_UPDATED_AT", `entries[${index}].updatedAt \u5FC5\u987B\u662F\u6B63\u6574\u6570\uFF08epoch \u6BEB\u79D2\uFF09`);
@@ -5277,8 +5374,9 @@ function createClientStateHandler(ctx) {
     if (typeof db.upsertClientState !== "function") {
       return err3(501, "CLIENT_STATE_NOT_SUPPORTED", "\u5F53\u524D\u6570\u636E\u5E93\u9002\u914D\u5668\u4E0D\u652F\u6301 client_state");
     }
-    const { upserted, skipped, skippedEntries } = await writeClientStateEntries({ db, userId, userKey, entries: accepted });
+    const { upserted, skipped, deleted, skippedEntries } = await writeClientStateEntries({ db, userId, userKey, entries: accepted });
     const data = { upserted, skipped };
+    if (deleted > 0) data.deleted = deleted;
     if (skippedEntries.length > 0) data.skippedEntries = skippedEntries;
     if (rejected.length > 0) data.rejected = rejected;
     return { status: 200, body: { success: true, data } };
@@ -5325,7 +5423,7 @@ function createClientStateHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "2.6.0-next.26" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.6.0-next.28" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([
@@ -5411,7 +5509,10 @@ var SERVER_FEATURES = Object.freeze([
   // client_state 按命名空间过期清理（config 的 clientStateTtl，cron 每跳顺手做）。
   "client-state-ttl",
   // hook ctx 带 emitResult(payload)：往客户端补一条自定义结果（落收件箱 + 推送）。
-  "emit-result"
+  "emit-result",
+  // PUT /client-state 的 entry 认 value: null（删掉这个 key，连切片行一起；同一套
+  // last-write-wins，被拦下的进 skippedEntries；删掉的条数在 data.deleted）。
+  "client-state-delete"
 ]);
 function createCapabilitiesHandler(ctx) {
   async function GET(url, headers) {

package/dist/cloudflare.cjs

@@ -26,7 +26,7 @@
 
 
 
-var _chunkGXYVOEF3cjs = require('./chunk-GXYVOEF3.cjs');
+var _chunkPBOY4LG7cjs = require('./chunk-PBOY4LG7.cjs');
 require('./chunk-7NMQFTDJ.cjs');
 
 
@@ -56,4 +56,4 @@ require('./chunk-7NMQFTDJ.cjs');
 
 
 
-exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkGXYVOEF3cjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkGXYVOEF3cjs.MAX_PUSH_PAYLOAD_BYTES; exports.NonRetryableError = _chunkGXYVOEF3cjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkGXYVOEF3cjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkGXYVOEF3cjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkGXYVOEF3cjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkGXYVOEF3cjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkGXYVOEF3cjs.advanceOccurrence; exports.createD1Adapter = _chunkGXYVOEF3cjs.createD1Adapter; exports.createSingleUserCloudflareWorker = _chunkGXYVOEF3cjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkGXYVOEF3cjs.createSingleUserServer; exports.createWebCryptoWebPush = _chunkGXYVOEF3cjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkGXYVOEF3cjs.decryptFromStorage; exports.decryptPayload = _chunkGXYVOEF3cjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkGXYVOEF3cjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkGXYVOEF3cjs.encryptForStorage; exports.ensureSchema = _chunkGXYVOEF3cjs.ensureSchema; exports.getSchemaVersion = _chunkGXYVOEF3cjs.getSchemaVersion; exports.isNonRetryableError = _chunkGXYVOEF3cjs.isNonRetryableError; exports.isValidTimeZoneId = _chunkGXYVOEF3cjs.isValidTimeZoneId; exports.measurePushPayload = _chunkGXYVOEF3cjs.measurePushPayload; exports.nextFutureOccurrence = _chunkGXYVOEF3cjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkGXYVOEF3cjs.planNextOccurrence; exports.readRequestBody = _chunkGXYVOEF3cjs.readRequestBody; exports.runScheduledTick = _chunkGXYVOEF3cjs.runScheduledTick; exports.runTask = _chunkGXYVOEF3cjs.runTask; exports.summarizeErrorCause = _chunkGXYVOEF3cjs.summarizeErrorCause;
+exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkPBOY4LG7cjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkPBOY4LG7cjs.MAX_PUSH_PAYLOAD_BYTES; exports.NonRetryableError = _chunkPBOY4LG7cjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkPBOY4LG7cjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkPBOY4LG7cjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkPBOY4LG7cjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkPBOY4LG7cjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkPBOY4LG7cjs.advanceOccurrence; exports.createD1Adapter = _chunkPBOY4LG7cjs.createD1Adapter; exports.createSingleUserCloudflareWorker = _chunkPBOY4LG7cjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkPBOY4LG7cjs.createSingleUserServer; exports.createWebCryptoWebPush = _chunkPBOY4LG7cjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkPBOY4LG7cjs.decryptFromStorage; exports.decryptPayload = _chunkPBOY4LG7cjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkPBOY4LG7cjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkPBOY4LG7cjs.encryptForStorage; exports.ensureSchema = _chunkPBOY4LG7cjs.ensureSchema; exports.getSchemaVersion = _chunkPBOY4LG7cjs.getSchemaVersion; exports.isNonRetryableError = _chunkPBOY4LG7cjs.isNonRetryableError; exports.isValidTimeZoneId = _chunkPBOY4LG7cjs.isValidTimeZoneId; exports.measurePushPayload = _chunkPBOY4LG7cjs.measurePushPayload; exports.nextFutureOccurrence = _chunkPBOY4LG7cjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkPBOY4LG7cjs.planNextOccurrence; exports.readRequestBody = _chunkPBOY4LG7cjs.readRequestBody; exports.runScheduledTick = _chunkPBOY4LG7cjs.runScheduledTick; exports.runTask = _chunkPBOY4LG7cjs.runTask; exports.summarizeErrorCause = _chunkPBOY4LG7cjs.summarizeErrorCause;

package/dist/cloudflare.mjs

@@ -26,7 +26,7 @@ import {
   runScheduledTick,
   runTask,
   summarizeErrorCause
-} from "./chunk-4YH3TS4W.mjs";
+} from "./chunk-YBBXKK7U.mjs";
 import "./chunk-GN44PST5.mjs";
 export {
   DEFAULT_MAX_REQUEST_BODY_BYTES,

package/dist/index.cjs

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

package/dist/index.mjs

@@ -71,7 +71,7 @@ import {
   validateLlmMessagesArray,
   validateScheduleMessagePayload,
   validateSplitPattern
-} from "./chunk-4YH3TS4W.mjs";
+} from "./chunk-YBBXKK7U.mjs";
 import "./chunk-GN44PST5.mjs";
 
 // src/server/adapters/factory.js

package/dist/lib/client-state-store.d.ts

@@ -53,9 +53,12 @@ export function planClientStateCleanup(ttl: Record<string, number> | null | unde
  * @param {() => number} [args.now] - 取服务端当前时刻（测试可注入假时钟）。适配器
  *   拿它认出库里「来自未来」的脏行。
  * @returns {Promise<{ upserted: number, skipped: number, deleted: number, skippedEntries: Array<{ namespace: string, key: string }> }>}
- *   `upserted` / `skipped` 按逻辑条目计（切片行不计）；`deleted` 是请求删除的
- *   key 数，不代表这些 key 原本一定存在。`skippedEntries` 逐条列出被
- *   last-write-wins 拦下的 key（适配器不回 outcomes 时为空数组——分不清是哪条）。
+ *   `upserted` / `skipped` / `deleted` 按逻辑条目计（切片行不计），三者之和等于
+ *   条目数。`deleted` 是删除之后 key 已不在库里的条数——删掉了、或本来就没有，
+ *   两种都算；被 last-write-wins 拦下的删除（库里那行更新）计入 `skipped`。
+ *   `skippedEntries` 逐条列出被拦下的 key，写入与删除都在里面（适配器不回
+ *   outcomes / cleanupOutcomes 时分不清是哪条：写入按物理行计数兜底，删除一律
+ *   按「已删」计）。
  */
 export function writeClientStateEntries({ db, userId, userKey, entries, now }: {
     db: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rei-standard/amsg-server",
-  "version": "2.6.0-next.26",
+  "version": "2.6.0-next.28",
   "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",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@netlify/blobs": "^8.1.0",
-    "@rei-standard/amsg-shared": "^0.4.0-next.9",
+    "@rei-standard/amsg-shared": "^0.4.0-next.10",
     "web-push": "^3.6.7"
   },
   "peerDependencies": {