@rei-standard/amsg-server 2.6.0-next.23 → 2.6.0-next.24

package/README.md

@@ -224,6 +224,8 @@ createSingleUserCloudflareWorker((env) => ({ …, multipart }));  // CF Worker
 
 不配 = 两边都用默认值。发送节奏也按 `ttlMs` 排：片数多时自动收紧每片之间的间隔，保证整批分片在这个窗口内发完；收紧到下限还装不下就一片都不发。
 
+`maxChunkBytes` 只用来**收窄**，有上限：每片原文经 base64url 膨胀 4/3、再套上分片信封后，必须仍装得进单条 push 的明文上限（约 3993 字节），换算下来原文一片最多约 2800 字节。配超了服务端在投递时抛 `MULTIPART_CHUNK_BYTES_TOO_LARGE` 的配置错误（错误信息带当前配置下允许的最大值），不会切出一批推送服务收不了的分片。
+
 两边对不上的下场值得记一下：页面把 `maxChunks` 收窄到 32、服务端还按 128 切的话，分片到了接收端会被逐片拒收；节奏排得比窗口长的话，迟到的分片会被当过期丢掉。两种都是「页面上这条思考过程直接没有」，而服务端那边每一片都发成功、看不出任何异常。
 
 ### 思考过程没送到时的可见性
@@ -328,6 +330,7 @@ ctx / metadata / push 上）。
 - `metadata` 是整体替换，不深合并——只改一个子字段的读-改-写流程见上一节。
 - `avatarUrl` 显式传 `null` 是「不改」而不是「清空」（§6.2 的软清空策略要求非法头像被摘掉时保留旧头像，「摘掉」和「传了个 null」在这一层是同一件事）。
 - 凭据三件套传 `null` 同样只是忽略：清掉任何一个，任务到点就发不出去。
+- 凭据三件套只对**没存 `credRefs.chat`** 的任务是「凭据刷新」入口。任务已经通过 `credRefs.chat` 引用凭据的话，触发时以凭据表那行为准、内联只是表行缺失的兜底，改内联不会生效——这种组合返回 `409 TASK_USES_CRED_REFS`，换 Key 走 `PUT /llm-credentials` 覆盖对应凭据，或在请求里改用 `credRefs` 指向新凭据。
 - `credRefs` 是整体替换（语义同 `metadata`），同样做存在性检查；与内联三件套在同一个请求里混着传返回 `400`。给存量内联任务补 `credRefs` 时不动已存的三件套——那份留作 fire 时表行缺失的兜底。
 - `pushSubscription` 不收（`400 PUSH_SUBSCRIPTION_NOT_ACCEPTED`），它是用户级的一份，走 `PUT /push-subscription`。
 - `userMessage` 给了就必须是字符串（口径与排程时一致）：它到点要过正则切分，别的类型收进来只会在投递时炸。

package/dist/adapters/d1.d.ts

@@ -372,6 +372,19 @@ export class D1Adapter {
      * @returns {Promise<number>} 删掉的行数
      */
     discardOutboxMessages(userId: string, messageIds: string[]): Promise<number>;
+    /**
+     * 把某条任务名下还没发出去的行一次删掉（取消 / 顶替时的 outbox 清理）。
+     *
+     * 判据与 discardOutboxMessages 相同：只删 delivered_at 与 acked_at 均为
+     * NULL 的行——已经推给设备 / 已 ack 的照旧留着。按 task_uuid 直删是为了不
+     * 受未 ack 积压量的影响：靠翻页扫描挑行的话，积压一大这条任务的行就落在
+     * 扫描上限之外（见 lib/outbox-store.js 的 discardUndeliveredPushesForTask）。
+     *
+     * @param {string} userId
+     * @param {string} taskUuid
+     * @returns {Promise<number>} 删掉的行数
+     */
+    discardUndeliveredOutboxForTask(userId: string, taskUuid: string): Promise<number>;
     /**
      * 未 ack 的行（id 升序，游标翻页）。payload 仍是密文，解密在 handler。
      *

package/dist/adapters/interface.d.ts

@@ -280,11 +280,20 @@ export type DbAdapter = {
      * 把它们补收回去。不实现 → 取消只挡住 Web Push 这一路。
      */
     discardOutboxMessages?: (userId: string, messageIds: string[]) => Promise<number>;
+    /**
+     * （可选；单用户/D1）按 task_uuid 一次删掉该任务名下还没发出去的行
+     * （delivered_at 与 acked_at 均为 NULL）。取消 / 顶替的 outbox 清理优先走
+     * 它：一个来回，且不受未 ack 积压量的影响。不实现 → 退回
+     * listUnackedOutbox + discardOutboxMessages 的翻页扫描，扫描有行数上限
+     * （见 lib/outbox-store.js），积压超过上限时会漏撤并打日志。
+     */
+    discardUndeliveredOutboxForTask?: (userId: string, taskUuid: string) => Promise<number>;
     /**
      * （可选；单用户/D1）未 ack 的行，id 升序游标翻页（GET /outbox）。行上要带
-     * `task_uuid` 和 `delivered_at`：`DELETE /message` 和 supersedesUuid 顶替这两
-     * 条路靠翻这份名单找出该任务名下还没发出去的行（没有按 task_uuid 查的读法），
-     * 缺任一字段就挑不出来，那两条路上的 outbox 清理会静默跳过。
+     * `task_uuid` 和 `delivered_at`：适配器没实现 discardUndeliveredOutboxForTask
+     * 时，`DELETE /message` 和 supersedesUuid 顶替这两条路靠翻这份名单找出该任务
+     * 名下还没发出去的行，缺任一字段就挑不出来，那两条路上的 outbox 清理会静默
+     * 跳过。
      */
     listUnackedOutbox?: (userId: string, sinceId: number, limit: number) => Promise<Array<any>>;
     /**

package/dist/{chunk-3JEWYDM4.mjs → chunk-N7CZ3KXB.mjs}

@@ -1265,15 +1265,27 @@ async function discardUndeliveredPushes({ db, userId, pushes, sentIds }) {
 var OUTBOX_SCAN_PAGE_SIZE = 100;
 var OUTBOX_SCAN_MAX_ROWS = 5e3;
 async function discardUndeliveredPushesForTask({ db, userId, taskUuid }) {
-  if (!db || typeof db.listUnackedOutbox !== "function" || typeof db.discardOutboxMessages !== "function") return;
-  if (!taskUuid) return;
+  if (!db || !taskUuid) return;
+  if (typeof db.discardUndeliveredOutboxForTask === "function") {
+    try {
+      await db.discardUndeliveredOutboxForTask(userId, taskUuid);
+    } catch (error) {
+      console.warn("[amsg-server] outbox \u6309\u4EFB\u52A1\u64A4\u56DE\u672A\u6295\u9012\u7684\u884C\u5931\u8D25\uFF08\u5DF2\u5FFD\u7565\uFF09:", error && error.message);
+    }
+    return;
+  }
+  if (typeof db.listUnackedOutbox !== "function" || typeof db.discardOutboxMessages !== "function") return;
   const messageIds = [];
+  let exhausted = false;
   try {
     let cursor = 0;
     let scanned = 0;
     while (scanned < OUTBOX_SCAN_MAX_ROWS) {
       const rows = await db.listUnackedOutbox(userId, cursor, OUTBOX_SCAN_PAGE_SIZE);
-      if (!rows || rows.length === 0) break;
+      if (!rows || rows.length === 0) {
+        exhausted = true;
+        break;
+      }
       scanned += rows.length;
       let nextCursor = cursor;
       for (const row of rows) {
@@ -1284,12 +1296,20 @@ async function discardUndeliveredPushesForTask({ db, userId, taskUuid }) {
       }
       if (nextCursor <= cursor) break;
       cursor = nextCursor;
-      if (rows.length < OUTBOX_SCAN_PAGE_SIZE) break;
+      if (rows.length < OUTBOX_SCAN_PAGE_SIZE) {
+        exhausted = true;
+        break;
+      }
     }
   } catch (error) {
     console.warn("[amsg-server] outbox \u67E5\u672A\u6295\u9012\u7684\u884C\u5931\u8D25\uFF08\u5DF2\u5FFD\u7565\uFF09:", error && error.message);
     return;
   }
+  if (!exhausted) {
+    console.warn(
+      `[amsg-server] outbox \u626B\u63CF\u5230 ${OUTBOX_SCAN_MAX_ROWS} \u884C\u4E0A\u9650\u4ECD\u672A\u626B\u5B8C\uFF0C\u4EFB\u52A1 ${taskUuid} \u53EF\u80FD\u8FD8\u6709\u672A\u6295\u9012\u7684\u884C\u6CA1\u64A4\u6389\uFF08\u88AB\u53D6\u6D88\u4EFB\u52A1\u7684\u884C\u901A\u5E38\u662F\u6700\u65B0\u7684\uFF0C\u6B63\u597D\u5728\u4E0A\u9650\u4E4B\u5916\uFF09\u3002\u7ED9\u9002\u914D\u5668\u5B9E\u73B0 discardUndeliveredOutboxForTask \u53EF\u7ED5\u5F00\u8FD9\u4E2A\u4E0A\u9650\u3002`
+    );
+  }
   await discardPushesFromOutbox({ db, userId, messageIds });
 }
 
@@ -1352,10 +1372,17 @@ function createResultEmitter({
   sessionId,
   occurrenceMs,
   webpush,
-  now
+  now,
+  isCancelled
 }) {
   const nowFn = typeof now === "function" ? now : Date.now;
   let emitted = 0;
+  const assertNotCancelled = () => {
+    if (typeof isCancelled !== "function" || !isCancelled()) return;
+    const error = new Error("\u4EFB\u52A1\u5728\u6295\u9012\u671F\u95F4\u88AB\u53D6\u6D88\u6216\u9876\u66FF\uFF0C\u7ED3\u679C\u5DF2\u4E2D\u6B62");
+    error.code = TASK_CANCELLED_CODE;
+    throw error;
+  };
   const emitResult = async (payload) => {
     if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
       throw new TypeError("emitResult(payload) \u9700\u8981\u4E00\u4E2A\u666E\u901A\u5BF9\u8C61");
@@ -1367,9 +1394,10 @@ function createResultEmitter({
       );
     }
     const seq = emitted++;
+    const messageType = decryptedPayload.messageType || "auto";
     const push = buildResultPush({
-      messageType: decryptedPayload.messageType || "auto",
-      source: "scheduled",
+      messageType,
+      source: messageType === "instant" ? "instant" : "scheduled",
       messageId: `${messageIdBase}_result_${seq}`,
       sessionId,
       ...payload,
@@ -1383,9 +1411,11 @@ function createResultEmitter({
       recurrenceType: decryptedPayload.recurrenceType || "none",
       occurrenceMs
     });
+    assertNotCancelled();
     await db.appendOutboxMessages(task.user_id, await toOutboxRows([push], userKey, nowFn()));
     let pushed;
     try {
+      assertNotCancelled();
       pushed = shouldSendPush(push, { outboxed: true }) ? await sendResultPush({ db, task, userKey, decryptedPayload, webpush, push }) : false;
     } catch (error) {
       await discardUndeliveredPushes({ db, userId: task.user_id, pushes: [push], sentIds: [] });
@@ -1585,7 +1615,10 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     sessionId,
     occurrenceMs,
     webpush: ctx.webpush,
-    now: nowFn
+    now: nowFn,
+    // run-tick 在投递 ctx 上挂的取消信号（与 guardWebpushWithLease 读的是同一
+    // 个租约状态），emitResult 不发推送的那条路要靠它拦下已取消任务的落行。
+    isCancelled: typeof ctx.isTaskCancelled === "function" ? ctx.isTaskCancelled : null
   });
   const maxScheduledTasksPerFire = Number.isInteger(ctx.maxScheduledTasksPerFire) && ctx.maxScheduledTasksPerFire >= 0 ? ctx.maxScheduledTasksPerFire : DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE;
   let scheduledTaskCount = 0;
@@ -1771,6 +1804,9 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
       );
     }
     const cancelled = await ctx.db.deleteTaskByUuid(uuid, task.user_id);
+    if (cancelled) {
+      await discardUndeliveredPushesForTask({ db: ctx.db, userId: task.user_id, taskUuid: uuid });
+    }
     return { cancelled: !!cancelled };
   };
   const renewTask = async (uuid, nextSendAt) => {
@@ -2240,12 +2276,36 @@ function sleepFor(ctx, ms) {
 }
 function resolveMultipartOptions(ctx) {
   const configured = ctx && ctx.multipart && typeof ctx.multipart === "object" ? ctx.multipart : {};
-  return {
+  const resolved = {
     maxChunkBytes: positiveIntegerOr(configured.maxChunkBytes, DEFAULT_MULTIPART_CHUNK_BYTES),
     maxChunks: positiveIntegerOr(configured.maxChunks, DEFAULT_MULTIPART_MAX_CHUNKS),
     maxTotalBytes: positiveIntegerOr(configured.maxTotalBytes, DEFAULT_MULTIPART_MAX_TOTAL_BYTES),
     ttlMs: positiveIntegerOr(configured.ttlMs, DEFAULT_MULTIPART_TTL_MS)
   };
+  assertChunkBytesFitPushLimit(resolved);
+  return resolved;
+}
+function assertChunkBytesFitPushLimit({ maxChunkBytes, maxChunks, ttlMs }) {
+  const PROBE_CHUNK_BYTES = 3;
+  const [probe] = buildMultipartPushPayloads(
+    { messageKind: "reasoning" },
+    { serializedPayload: "x".repeat(PROBE_CHUNK_BYTES), maxChunkBytes: PROBE_CHUNK_BYTES, ttlMs }
+  );
+  const digitHeadroom = 2 * (String(maxChunks).length - 1);
+  const envelopeOverhead = measurePushPayload(JSON.stringify(probe)).bytes - base64UrlLength(PROBE_CHUNK_BYTES) + digitHeadroom;
+  const worstEnvelopeBytes = envelopeOverhead + base64UrlLength(maxChunkBytes);
+  if (worstEnvelopeBytes <= MAX_PUSH_PAYLOAD_BYTES) return;
+  let maxAllowed = Math.floor((MAX_PUSH_PAYLOAD_BYTES - envelopeOverhead) * 3 / 4);
+  while (maxAllowed > 0 && envelopeOverhead + base64UrlLength(maxAllowed) > MAX_PUSH_PAYLOAD_BYTES) {
+    maxAllowed--;
+  }
+  throw new DeploymentConfigError(
+    `MULTIPART_CHUNK_BYTES_TOO_LARGE: multipart.maxChunkBytes = ${maxChunkBytes} \u5207\u51FA\u7684\u5206\u7247\u4FE1\u5C01\u6700\u574F ${worstEnvelopeBytes} \u5B57\u8282\uFF0C\u8D85\u8FC7\u5355\u6761 push \u660E\u6587\u4E0A\u9650 ${MAX_PUSH_PAYLOAD_BYTES} \u5B57\u8282\uFF0C\u6BCF\u4E00\u7247\u90FD\u4F1A\u88AB\u63A8\u9001\u670D\u52A1\u62D2\u6536\u3002\u8FD9\u4E2A\u65CB\u94AE\u53EA\u7528\u4E8E\u6536\u7A84\uFF0C\u5F53\u524D\u914D\u7F6E\u4E0B\u6700\u5927 ${maxAllowed}`,
+    { code: "MULTIPART_CHUNK_BYTES_TOO_LARGE" }
+  );
+}
+function base64UrlLength(n) {
+  return Math.ceil(n * 4 / 3);
 }
 function positiveIntegerOr(value, fallback) {
   return Number.isInteger(value) && /** @type {number} */
@@ -3003,13 +3063,14 @@ async function deliverTasks(ctx, tasks) {
     groupsTakenThisTick.add(scopedKey);
     return { taken: false, rawKey };
   }
-  function recordCancelled(task, status) {
+  async function recordCancelled(task, status) {
     results.cancelledTasks.push({
       taskId: task.id,
       reason: "\u4EFB\u52A1\u5728\u6295\u9012\u671F\u95F4\u88AB\u53D6\u6D88\u6216\u9876\u66FF",
       status
     });
     console.warn(`[amsg-server] \u4EFB\u52A1 ${task.id} \u5728\u6295\u9012\u671F\u95F4\u88AB\u53D6\u6D88\u6216\u9876\u66FF\uFF08${status}\uFF09`);
+    await discardUndeliveredPushesForTask({ db, userId: task.user_id, taskUuid: task.uuid });
   }
   async function payloadStillFresh(task) {
     if (typeof db.getTaskByUuid !== "function" || !task.uuid) return true;
@@ -3191,7 +3252,8 @@ async function deliverTasks(ctx, tasks) {
           messageIdBase: task.id != null ? `msg_task_${task.id}${occurrenceSuffix(task)}` : `msg_stale_${task.uuid || ""}`,
           sessionId: task.id != null ? `sess_task_${task.id}${occurrenceSuffix(task)}` : `sess_stale_${task.uuid || ""}`,
           occurrenceMs,
-          webpush: ctx.webpush
+          webpush: ctx.webpush,
+          isCancelled: () => lease.lost
         });
         const recurring = isRecurringType(recurrenceType);
         const plan = recurring ? planNextOccurrence(occurrenceMs, recurrenceType, Date.now(), tzId) : null;
@@ -3240,13 +3302,19 @@ async function deliverTasks(ctx, tasks) {
     try {
       sendResult = await processSingleMessage(
         task,
-        { ...ctx, db, masterKey, webpush: guardWebpushWithLease(ctx.webpush, lease) },
+        {
+          ...ctx,
+          db,
+          masterKey,
+          webpush: guardWebpushWithLease(ctx.webpush, lease),
+          isTaskCancelled: () => lease.lost
+        },
         masterKey,
         { userKey, payload: decryptedPayload }
       );
     } catch (error) {
       if (lease.lost) {
-        recordCancelled(task, "cancelled_mid_delivery");
+        await recordCancelled(task, "cancelled_mid_delivery");
         return;
       }
       await handleDeliveryFailure(
@@ -3261,7 +3329,7 @@ async function deliverTasks(ctx, tasks) {
     }
     if (!sendResult.success) {
       if (lease.lost) {
-        recordCancelled(task, "cancelled_mid_delivery");
+        await recordCancelled(task, "cancelled_mid_delivery");
         return;
       }
       await handleDeliveryFailure(
@@ -3284,7 +3352,7 @@ async function deliverTasks(ctx, tasks) {
       if (recurrenceType === "none") {
         markLeaseReleased(task.id);
         if (rowVanished(await db.deleteTaskById(task.id))) {
-          recordCancelled(task, "cancelled_after_delivery");
+          await recordCancelled(task, "cancelled_after_delivery");
           return;
         }
         results.deletedOnceOffTasks++;
@@ -3298,7 +3366,7 @@ async function deliverTasks(ctx, tasks) {
           ...clearedPayload ? { encrypted_payload: clearedPayload } : {}
         });
         if (rowVanished(updated)) {
-          recordCancelled(task, "cancelled_after_delivery");
+          await recordCancelled(task, "cancelled_after_delivery");
           return;
         }
         results.updatedRecurringTasks++;
@@ -3484,6 +3552,13 @@ function createUpdateMessageHandler(ctx) {
       return { status: 409, body: { success: false, error: { code: "TASK_ALREADY_COMPLETED", message: "\u4EFB\u52A1\u5DF2\u5B8C\u6210\u6216\u5DF2\u5931\u8D25\uFF0C\u65E0\u6CD5\u66F4\u65B0" } } };
     }
     const existingData = JSON.parse(await decryptFromStorage(existingTask.encrypted_payload, userKey));
+    if ((updates.apiUrl || updates.apiKey || updates.primaryModel) && hasChatCredRef(existingData)) {
+      return { status: 409, body: { success: false, error: {
+        code: "TASK_USES_CRED_REFS",
+        message: "\u4EFB\u52A1\u5DF2\u901A\u8FC7 credRefs.chat \u5F15\u7528\u51ED\u636E\uFF0C\u89E6\u53D1\u65F6\u4EE5\u51ED\u636E\u8868\u4E3A\u51C6\uFF0C\u5185\u8054 apiUrl / apiKey / primaryModel \u7684\u66F4\u65B0\u4E0D\u4F1A\u751F\u6548\u3002\u6362 Key \u8BF7\u7528 PUT /llm-credentials \u8986\u76D6\u5BF9\u5E94\u51ED\u636E\uFF0C\u6216\u5728\u672C\u6B21\u8BF7\u6C42\u91CC\u6539\u7528 credRefs \u6307\u5411\u65B0\u51ED\u636E",
+        details: { invalidFields: ["apiUrl", "apiKey", "primaryModel"].filter((name) => updates[name]) }
+      } } };
+    }
     const promptUpdates = {};
     if (updates.completePrompt) {
       promptUpdates.completePrompt = updates.completePrompt;
@@ -4896,6 +4971,25 @@ var D1Adapter = class {
       messageIds
     );
   }
+  /**
+   * 把某条任务名下还没发出去的行一次删掉（取消 / 顶替时的 outbox 清理）。
+   *
+   * 判据与 discardOutboxMessages 相同：只删 delivered_at 与 acked_at 均为
+   * NULL 的行——已经推给设备 / 已 ack 的照旧留着。按 task_uuid 直删是为了不
+   * 受未 ack 积压量的影响：靠翻页扫描挑行的话，积压一大这条任务的行就落在
+   * 扫描上限之外（见 lib/outbox-store.js 的 discardUndeliveredPushesForTask）。
+   *
+   * @param {string} userId
+   * @param {string} taskUuid
+   * @returns {Promise<number>} 删掉的行数
+   */
+  async discardUndeliveredOutboxForTask(userId, taskUuid) {
+    const res = await this._db.prepare(
+      `DELETE FROM message_outbox
+       WHERE user_id = ? AND task_uuid = ? AND delivered_at IS NULL AND acked_at IS NULL`
+    ).bind(userId, taskUuid).run();
+    return res.meta.changes || 0;
+  }
   /**
    * 未 ack 的行（id 升序，游标翻页）。payload 仍是密文，解密在 handler。
    *
@@ -5213,7 +5307,7 @@ function createClientStateHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "2.6.0-next.23" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.6.0-next.24" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([

package/dist/{chunk-BNZLICCI.cjs → chunk-XLCBVU37.cjs}

@@ -1265,15 +1265,27 @@ async function discardUndeliveredPushes({ db, userId, pushes, sentIds }) {
 var OUTBOX_SCAN_PAGE_SIZE = 100;
 var OUTBOX_SCAN_MAX_ROWS = 5e3;
 async function discardUndeliveredPushesForTask({ db, userId, taskUuid }) {
-  if (!db || typeof db.listUnackedOutbox !== "function" || typeof db.discardOutboxMessages !== "function") return;
-  if (!taskUuid) return;
+  if (!db || !taskUuid) return;
+  if (typeof db.discardUndeliveredOutboxForTask === "function") {
+    try {
+      await db.discardUndeliveredOutboxForTask(userId, taskUuid);
+    } catch (error) {
+      console.warn("[amsg-server] outbox \u6309\u4EFB\u52A1\u64A4\u56DE\u672A\u6295\u9012\u7684\u884C\u5931\u8D25\uFF08\u5DF2\u5FFD\u7565\uFF09:", error && error.message);
+    }
+    return;
+  }
+  if (typeof db.listUnackedOutbox !== "function" || typeof db.discardOutboxMessages !== "function") return;
   const messageIds = [];
+  let exhausted = false;
   try {
     let cursor = 0;
     let scanned = 0;
     while (scanned < OUTBOX_SCAN_MAX_ROWS) {
       const rows = await db.listUnackedOutbox(userId, cursor, OUTBOX_SCAN_PAGE_SIZE);
-      if (!rows || rows.length === 0) break;
+      if (!rows || rows.length === 0) {
+        exhausted = true;
+        break;
+      }
       scanned += rows.length;
       let nextCursor = cursor;
       for (const row of rows) {
@@ -1284,12 +1296,20 @@ async function discardUndeliveredPushesForTask({ db, userId, taskUuid }) {
       }
       if (nextCursor <= cursor) break;
       cursor = nextCursor;
-      if (rows.length < OUTBOX_SCAN_PAGE_SIZE) break;
+      if (rows.length < OUTBOX_SCAN_PAGE_SIZE) {
+        exhausted = true;
+        break;
+      }
     }
   } catch (error) {
     console.warn("[amsg-server] outbox \u67E5\u672A\u6295\u9012\u7684\u884C\u5931\u8D25\uFF08\u5DF2\u5FFD\u7565\uFF09:", error && error.message);
     return;
   }
+  if (!exhausted) {
+    console.warn(
+      `[amsg-server] outbox \u626B\u63CF\u5230 ${OUTBOX_SCAN_MAX_ROWS} \u884C\u4E0A\u9650\u4ECD\u672A\u626B\u5B8C\uFF0C\u4EFB\u52A1 ${taskUuid} \u53EF\u80FD\u8FD8\u6709\u672A\u6295\u9012\u7684\u884C\u6CA1\u64A4\u6389\uFF08\u88AB\u53D6\u6D88\u4EFB\u52A1\u7684\u884C\u901A\u5E38\u662F\u6700\u65B0\u7684\uFF0C\u6B63\u597D\u5728\u4E0A\u9650\u4E4B\u5916\uFF09\u3002\u7ED9\u9002\u914D\u5668\u5B9E\u73B0 discardUndeliveredOutboxForTask \u53EF\u7ED5\u5F00\u8FD9\u4E2A\u4E0A\u9650\u3002`
+    );
+  }
   await discardPushesFromOutbox({ db, userId, messageIds });
 }
 
@@ -1352,10 +1372,17 @@ function createResultEmitter({
   sessionId,
   occurrenceMs,
   webpush,
-  now
+  now,
+  isCancelled
 }) {
   const nowFn = typeof now === "function" ? now : Date.now;
   let emitted = 0;
+  const assertNotCancelled = () => {
+    if (typeof isCancelled !== "function" || !isCancelled()) return;
+    const error = new Error("\u4EFB\u52A1\u5728\u6295\u9012\u671F\u95F4\u88AB\u53D6\u6D88\u6216\u9876\u66FF\uFF0C\u7ED3\u679C\u5DF2\u4E2D\u6B62");
+    error.code = TASK_CANCELLED_CODE;
+    throw error;
+  };
   const emitResult = async (payload) => {
     if (!payload || typeof payload !== "object" || Array.isArray(payload)) {
       throw new TypeError("emitResult(payload) \u9700\u8981\u4E00\u4E2A\u666E\u901A\u5BF9\u8C61");
@@ -1367,9 +1394,10 @@ function createResultEmitter({
       );
     }
     const seq = emitted++;
+    const messageType = decryptedPayload.messageType || "auto";
     const push = _amsgshared.buildResultPush.call(void 0, {
-      messageType: decryptedPayload.messageType || "auto",
-      source: "scheduled",
+      messageType,
+      source: messageType === "instant" ? "instant" : "scheduled",
       messageId: `${messageIdBase}_result_${seq}`,
       sessionId,
       ...payload,
@@ -1383,9 +1411,11 @@ function createResultEmitter({
       recurrenceType: decryptedPayload.recurrenceType || "none",
       occurrenceMs
     });
+    assertNotCancelled();
     await db.appendOutboxMessages(task.user_id, await toOutboxRows([push], userKey, nowFn()));
     let pushed;
     try {
+      assertNotCancelled();
       pushed = shouldSendPush(push, { outboxed: true }) ? await sendResultPush({ db, task, userKey, decryptedPayload, webpush, push }) : false;
     } catch (error) {
       await discardUndeliveredPushes({ db, userId: task.user_id, pushes: [push], sentIds: [] });
@@ -1585,7 +1615,10 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     sessionId,
     occurrenceMs,
     webpush: ctx.webpush,
-    now: nowFn
+    now: nowFn,
+    // run-tick 在投递 ctx 上挂的取消信号（与 guardWebpushWithLease 读的是同一
+    // 个租约状态），emitResult 不发推送的那条路要靠它拦下已取消任务的落行。
+    isCancelled: typeof ctx.isTaskCancelled === "function" ? ctx.isTaskCancelled : null
   });
   const maxScheduledTasksPerFire = Number.isInteger(ctx.maxScheduledTasksPerFire) && ctx.maxScheduledTasksPerFire >= 0 ? ctx.maxScheduledTasksPerFire : DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE;
   let scheduledTaskCount = 0;
@@ -1771,6 +1804,9 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
       );
     }
     const cancelled = await ctx.db.deleteTaskByUuid(uuid, task.user_id);
+    if (cancelled) {
+      await discardUndeliveredPushesForTask({ db: ctx.db, userId: task.user_id, taskUuid: uuid });
+    }
     return { cancelled: !!cancelled };
   };
   const renewTask = async (uuid, nextSendAt) => {
@@ -2240,12 +2276,36 @@ function sleepFor(ctx, ms) {
 }
 function resolveMultipartOptions(ctx) {
   const configured = ctx && ctx.multipart && typeof ctx.multipart === "object" ? ctx.multipart : {};
-  return {
+  const resolved = {
     maxChunkBytes: positiveIntegerOr(configured.maxChunkBytes, _amsgshared.DEFAULT_MULTIPART_CHUNK_BYTES),
     maxChunks: positiveIntegerOr(configured.maxChunks, _amsgshared.DEFAULT_MULTIPART_MAX_CHUNKS),
     maxTotalBytes: positiveIntegerOr(configured.maxTotalBytes, _amsgshared.DEFAULT_MULTIPART_MAX_TOTAL_BYTES),
     ttlMs: positiveIntegerOr(configured.ttlMs, _amsgshared.DEFAULT_MULTIPART_TTL_MS)
   };
+  assertChunkBytesFitPushLimit(resolved);
+  return resolved;
+}
+function assertChunkBytesFitPushLimit({ maxChunkBytes, maxChunks, ttlMs }) {
+  const PROBE_CHUNK_BYTES = 3;
+  const [probe] = _amsgshared.buildMultipartPushPayloads.call(void 0, 
+    { messageKind: "reasoning" },
+    { serializedPayload: "x".repeat(PROBE_CHUNK_BYTES), maxChunkBytes: PROBE_CHUNK_BYTES, ttlMs }
+  );
+  const digitHeadroom = 2 * (String(maxChunks).length - 1);
+  const envelopeOverhead = measurePushPayload(JSON.stringify(probe)).bytes - base64UrlLength(PROBE_CHUNK_BYTES) + digitHeadroom;
+  const worstEnvelopeBytes = envelopeOverhead + base64UrlLength(maxChunkBytes);
+  if (worstEnvelopeBytes <= MAX_PUSH_PAYLOAD_BYTES) return;
+  let maxAllowed = Math.floor((MAX_PUSH_PAYLOAD_BYTES - envelopeOverhead) * 3 / 4);
+  while (maxAllowed > 0 && envelopeOverhead + base64UrlLength(maxAllowed) > MAX_PUSH_PAYLOAD_BYTES) {
+    maxAllowed--;
+  }
+  throw new DeploymentConfigError(
+    `MULTIPART_CHUNK_BYTES_TOO_LARGE: multipart.maxChunkBytes = ${maxChunkBytes} \u5207\u51FA\u7684\u5206\u7247\u4FE1\u5C01\u6700\u574F ${worstEnvelopeBytes} \u5B57\u8282\uFF0C\u8D85\u8FC7\u5355\u6761 push \u660E\u6587\u4E0A\u9650 ${MAX_PUSH_PAYLOAD_BYTES} \u5B57\u8282\uFF0C\u6BCF\u4E00\u7247\u90FD\u4F1A\u88AB\u63A8\u9001\u670D\u52A1\u62D2\u6536\u3002\u8FD9\u4E2A\u65CB\u94AE\u53EA\u7528\u4E8E\u6536\u7A84\uFF0C\u5F53\u524D\u914D\u7F6E\u4E0B\u6700\u5927 ${maxAllowed}`,
+    { code: "MULTIPART_CHUNK_BYTES_TOO_LARGE" }
+  );
+}
+function base64UrlLength(n) {
+  return Math.ceil(n * 4 / 3);
 }
 function positiveIntegerOr(value, fallback) {
   return Number.isInteger(value) && /** @type {number} */
@@ -3003,13 +3063,14 @@ async function deliverTasks(ctx, tasks) {
     groupsTakenThisTick.add(scopedKey);
     return { taken: false, rawKey };
   }
-  function recordCancelled(task, status) {
+  async function recordCancelled(task, status) {
     results.cancelledTasks.push({
       taskId: task.id,
       reason: "\u4EFB\u52A1\u5728\u6295\u9012\u671F\u95F4\u88AB\u53D6\u6D88\u6216\u9876\u66FF",
       status
     });
     console.warn(`[amsg-server] \u4EFB\u52A1 ${task.id} \u5728\u6295\u9012\u671F\u95F4\u88AB\u53D6\u6D88\u6216\u9876\u66FF\uFF08${status}\uFF09`);
+    await discardUndeliveredPushesForTask({ db, userId: task.user_id, taskUuid: task.uuid });
   }
   async function payloadStillFresh(task) {
     if (typeof db.getTaskByUuid !== "function" || !task.uuid) return true;
@@ -3191,7 +3252,8 @@ async function deliverTasks(ctx, tasks) {
           messageIdBase: task.id != null ? `msg_task_${task.id}${occurrenceSuffix(task)}` : `msg_stale_${task.uuid || ""}`,
           sessionId: task.id != null ? `sess_task_${task.id}${occurrenceSuffix(task)}` : `sess_stale_${task.uuid || ""}`,
           occurrenceMs,
-          webpush: ctx.webpush
+          webpush: ctx.webpush,
+          isCancelled: () => lease.lost
         });
         const recurring = isRecurringType(recurrenceType);
         const plan = recurring ? planNextOccurrence(occurrenceMs, recurrenceType, Date.now(), tzId) : null;
@@ -3240,13 +3302,19 @@ async function deliverTasks(ctx, tasks) {
     try {
       sendResult = await processSingleMessage(
         task,
-        { ...ctx, db, masterKey, webpush: guardWebpushWithLease(ctx.webpush, lease) },
+        {
+          ...ctx,
+          db,
+          masterKey,
+          webpush: guardWebpushWithLease(ctx.webpush, lease),
+          isTaskCancelled: () => lease.lost
+        },
         masterKey,
         { userKey, payload: decryptedPayload }
       );
     } catch (error) {
       if (lease.lost) {
-        recordCancelled(task, "cancelled_mid_delivery");
+        await recordCancelled(task, "cancelled_mid_delivery");
         return;
       }
       await handleDeliveryFailure(
@@ -3261,7 +3329,7 @@ async function deliverTasks(ctx, tasks) {
     }
     if (!sendResult.success) {
       if (lease.lost) {
-        recordCancelled(task, "cancelled_mid_delivery");
+        await recordCancelled(task, "cancelled_mid_delivery");
         return;
       }
       await handleDeliveryFailure(
@@ -3284,7 +3352,7 @@ async function deliverTasks(ctx, tasks) {
       if (recurrenceType === "none") {
         markLeaseReleased(task.id);
         if (rowVanished(await db.deleteTaskById(task.id))) {
-          recordCancelled(task, "cancelled_after_delivery");
+          await recordCancelled(task, "cancelled_after_delivery");
           return;
         }
         results.deletedOnceOffTasks++;
@@ -3298,7 +3366,7 @@ async function deliverTasks(ctx, tasks) {
           ...clearedPayload ? { encrypted_payload: clearedPayload } : {}
         });
         if (rowVanished(updated)) {
-          recordCancelled(task, "cancelled_after_delivery");
+          await recordCancelled(task, "cancelled_after_delivery");
           return;
         }
         results.updatedRecurringTasks++;
@@ -3484,6 +3552,13 @@ function createUpdateMessageHandler(ctx) {
       return { status: 409, body: { success: false, error: { code: "TASK_ALREADY_COMPLETED", message: "\u4EFB\u52A1\u5DF2\u5B8C\u6210\u6216\u5DF2\u5931\u8D25\uFF0C\u65E0\u6CD5\u66F4\u65B0" } } };
     }
     const existingData = JSON.parse(await decryptFromStorage(existingTask.encrypted_payload, userKey));
+    if ((updates.apiUrl || updates.apiKey || updates.primaryModel) && hasChatCredRef(existingData)) {
+      return { status: 409, body: { success: false, error: {
+        code: "TASK_USES_CRED_REFS",
+        message: "\u4EFB\u52A1\u5DF2\u901A\u8FC7 credRefs.chat \u5F15\u7528\u51ED\u636E\uFF0C\u89E6\u53D1\u65F6\u4EE5\u51ED\u636E\u8868\u4E3A\u51C6\uFF0C\u5185\u8054 apiUrl / apiKey / primaryModel \u7684\u66F4\u65B0\u4E0D\u4F1A\u751F\u6548\u3002\u6362 Key \u8BF7\u7528 PUT /llm-credentials \u8986\u76D6\u5BF9\u5E94\u51ED\u636E\uFF0C\u6216\u5728\u672C\u6B21\u8BF7\u6C42\u91CC\u6539\u7528 credRefs \u6307\u5411\u65B0\u51ED\u636E",
+        details: { invalidFields: ["apiUrl", "apiKey", "primaryModel"].filter((name) => updates[name]) }
+      } } };
+    }
     const promptUpdates = {};
     if (updates.completePrompt) {
       promptUpdates.completePrompt = updates.completePrompt;
@@ -4896,6 +4971,25 @@ var D1Adapter = class {
       messageIds
     );
   }
+  /**
+   * 把某条任务名下还没发出去的行一次删掉（取消 / 顶替时的 outbox 清理）。
+   *
+   * 判据与 discardOutboxMessages 相同：只删 delivered_at 与 acked_at 均为
+   * NULL 的行——已经推给设备 / 已 ack 的照旧留着。按 task_uuid 直删是为了不
+   * 受未 ack 积压量的影响：靠翻页扫描挑行的话，积压一大这条任务的行就落在
+   * 扫描上限之外（见 lib/outbox-store.js 的 discardUndeliveredPushesForTask）。
+   *
+   * @param {string} userId
+   * @param {string} taskUuid
+   * @returns {Promise<number>} 删掉的行数
+   */
+  async discardUndeliveredOutboxForTask(userId, taskUuid) {
+    const res = await this._db.prepare(
+      `DELETE FROM message_outbox
+       WHERE user_id = ? AND task_uuid = ? AND delivered_at IS NULL AND acked_at IS NULL`
+    ).bind(userId, taskUuid).run();
+    return res.meta.changes || 0;
+  }
   /**
    * 未 ack 的行（id 升序，游标翻页）。payload 仍是密文，解密在 handler。
    *
@@ -5213,7 +5307,7 @@ function createClientStateHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "2.6.0-next.23" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.6.0-next.24" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([

package/dist/cloudflare.cjs

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

package/dist/cloudflare.mjs

@@ -26,7 +26,7 @@ import {
   runScheduledTick,
   runTask,
   summarizeErrorCause
-} from "./chunk-3JEWYDM4.mjs";
+} from "./chunk-N7CZ3KXB.mjs";
 import "./chunk-GN44PST5.mjs";
 export {
   DEFAULT_MAX_REQUEST_BODY_BYTES,

package/dist/index.cjs

@@ -71,7 +71,7 @@
 
 
 
-var _chunkBNZLICCIcjs = require('./chunk-BNZLICCI.cjs');
+var _chunkXLCBVU37cjs = require('./chunk-XLCBVU37.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 = _chunkBNZLICCIcjs.getHeader.call(void 0, headers, "x-init-secret");
+    const initSecret = _chunkXLCBVU37cjs.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 = _chunkBNZLICCIcjs.parseJsonBody.call(void 0, body);
+    const parsed = _chunkXLCBVU37cjs.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 && !_chunkBNZLICCIcjs.isValidUUIDv4.call(void 0, tenantId)) {
+    if (tenantId && !_chunkXLCBVU37cjs.isValidUUIDv4.call(void 0, tenantId)) {
       return {
         status: 400,
         body: {
@@ -252,7 +252,7 @@ function createSendNotificationsHandler(ctx) {
         }
       };
     }
-    const data = await _chunkBNZLICCIcjs.runScheduledTick.call(void 0, { ...ctx, db, masterKey });
+    const data = await _chunkXLCBVU37cjs.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.${_chunkBNZLICCIcjs.bytesToBase64Url.call(void 0, iv)}.${_chunkBNZLICCIcjs.bytesToBase64Url.call(void 0, authTag)}.${_chunkBNZLICCIcjs.bytesToBase64Url.call(void 0, ciphertext)}`;
+  return `v1.${_chunkXLCBVU37cjs.bytesToBase64Url.call(void 0, iv)}.${_chunkXLCBVU37cjs.bytesToBase64Url.call(void 0, authTag)}.${_chunkXLCBVU37cjs.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 = _chunkBNZLICCIcjs.base64UrlToBytes.call(void 0, parts[1]);
-  const authTag = _chunkBNZLICCIcjs.base64UrlToBytes.call(void 0, parts[2]);
-  const ciphertext = _chunkBNZLICCIcjs.base64UrlToBytes.call(void 0, parts[3]);
+  const iv = _chunkXLCBVU37cjs.base64UrlToBytes.call(void 0, parts[1]);
+  const authTag = _chunkXLCBVU37cjs.base64UrlToBytes.call(void 0, parts[2]);
+  const ciphertext = _chunkXLCBVU37cjs.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 _chunkBNZLICCIcjs.bytesToBase64Url.call(void 0, _crypto.createHmac.call(void 0, "sha256", secret).update(input).digest());
+  return _chunkXLCBVU37cjs.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 = _chunkBNZLICCIcjs.bytesToBase64Url.call(void 0, _chunkBNZLICCIcjs.utf8.call(void 0, JSON.stringify(header)));
-  const encodedPayload = _chunkBNZLICCIcjs.bytesToBase64Url.call(void 0, _chunkBNZLICCIcjs.utf8.call(void 0, JSON.stringify(payload)));
+  const encodedHeader = _chunkXLCBVU37cjs.bytesToBase64Url.call(void 0, _chunkXLCBVU37cjs.utf8.call(void 0, JSON.stringify(header)));
+  const encodedPayload = _chunkXLCBVU37cjs.bytesToBase64Url.call(void 0, _chunkXLCBVU37cjs.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 = _chunkBNZLICCIcjs.base64UrlToBytes.call(void 0, receivedSignature);
-    expectedBytes = _chunkBNZLICCIcjs.base64UrlToBytes.call(void 0, expectedSignature);
+    receivedBytes = _chunkXLCBVU37cjs.base64UrlToBytes.call(void 0, receivedSignature);
+    expectedBytes = _chunkXLCBVU37cjs.base64UrlToBytes.call(void 0, expectedSignature);
   } catch (e) {
     throw new Error("INVALID_TENANT_AUTH");
   }
-  if (!_chunkBNZLICCIcjs.timingSafeEqualBytes.call(void 0, receivedBytes, expectedBytes)) {
+  if (!_chunkXLCBVU37cjs.timingSafeEqualBytes.call(void 0, receivedBytes, expectedBytes)) {
     throw new Error("INVALID_TENANT_AUTH");
   }
   let payload;
   try {
-    payload = JSON.parse(_chunkBNZLICCIcjs.utf8Decode.call(void 0, _chunkBNZLICCIcjs.base64UrlToBytes.call(void 0, encodedPayload)));
+    payload = JSON.parse(_chunkXLCBVU37cjs.utf8Decode.call(void 0, _chunkXLCBVU37cjs.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: _chunkBNZLICCIcjs.createGetUserKeyHandler.call(void 0, ctx),
-      scheduleMessage: _chunkBNZLICCIcjs.createScheduleMessageHandler.call(void 0, ctx),
+      getUserKey: _chunkXLCBVU37cjs.createGetUserKeyHandler.call(void 0, ctx),
+      scheduleMessage: _chunkXLCBVU37cjs.createScheduleMessageHandler.call(void 0, ctx),
       sendNotifications: createSendNotificationsHandler(ctx),
-      updateMessage: _chunkBNZLICCIcjs.createUpdateMessageHandler.call(void 0, ctx),
-      cancelMessage: _chunkBNZLICCIcjs.createCancelMessageHandler.call(void 0, ctx),
-      messages: _chunkBNZLICCIcjs.createMessagesHandler.call(void 0, ctx),
-      getMessage: _chunkBNZLICCIcjs.createGetMessageHandler.call(void 0, ctx),
-      pushSubscription: _chunkBNZLICCIcjs.createPushSubscriptionHandler.call(void 0, ctx),
-      llmCredentials: _chunkBNZLICCIcjs.createLlmCredentialsHandler.call(void 0, ctx)
+      updateMessage: _chunkXLCBVU37cjs.createUpdateMessageHandler.call(void 0, ctx),
+      cancelMessage: _chunkXLCBVU37cjs.createCancelMessageHandler.call(void 0, ctx),
+      messages: _chunkXLCBVU37cjs.createMessagesHandler.call(void 0, ctx),
+      getMessage: _chunkXLCBVU37cjs.createGetMessageHandler.call(void 0, ctx),
+      pushSubscription: _chunkXLCBVU37cjs.createPushSubscriptionHandler.call(void 0, ctx),
+      llmCredentials: _chunkXLCBVU37cjs.createLlmCredentialsHandler.call(void 0, ctx)
     }
   };
 }
@@ -695,4 +695,4 @@ async function createReiServer(config) {
 
 
 
-exports.CORS_ALLOW_HEADERS = _chunkBNZLICCIcjs.CORS_ALLOW_HEADERS; exports.CORS_ALLOW_METHODS = _chunkBNZLICCIcjs.CORS_ALLOW_METHODS; exports.CRED_ID_MAX_LENGTH = _chunkBNZLICCIcjs.CRED_ID_MAX_LENGTH; exports.CRED_PUT_BATCH_MAX = _chunkBNZLICCIcjs.CRED_PUT_BATCH_MAX; exports.CRED_REFS_MAX_ENTRIES = _chunkBNZLICCIcjs.CRED_REFS_MAX_ENTRIES; exports.CRED_ROWS_PER_USER_MAX = _chunkBNZLICCIcjs.CRED_ROWS_PER_USER_MAX; exports.DEFAULT_CLAIM_LEASE_MS = _chunkBNZLICCIcjs.DEFAULT_CLAIM_LEASE_MS; exports.DEFAULT_HEARTBEAT_LEASE_TTL_MS = _chunkBNZLICCIcjs.DEFAULT_HEARTBEAT_LEASE_TTL_MS; exports.DEFAULT_LEASE_HEARTBEAT_MS = _chunkBNZLICCIcjs.DEFAULT_LEASE_HEARTBEAT_MS; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkBNZLICCIcjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE = _chunkBNZLICCIcjs.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE; exports.DEFAULT_MAX_TOOL_ITERATIONS = _chunkBNZLICCIcjs.DEFAULT_MAX_TOOL_ITERATIONS; exports.DEFAULT_TOTAL_TIMEOUT_MS = _chunkBNZLICCIcjs.DEFAULT_TOTAL_TIMEOUT_MS; exports.DeploymentConfigError = _chunkBNZLICCIcjs.DeploymentConfigError; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkBNZLICCIcjs.MAX_PUSH_PAYLOAD_BYTES; exports.MAX_TASK_PAYLOAD_BYTES = _chunkBNZLICCIcjs.MAX_TASK_PAYLOAD_BYTES; exports.MIN_SCHEDULE_LEAD_MS = _chunkBNZLICCIcjs.MIN_SCHEDULE_LEAD_MS; exports.NonRetryableError = _chunkBNZLICCIcjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkBNZLICCIcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkBNZLICCIcjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkBNZLICCIcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkBNZLICCIcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkBNZLICCIcjs.advanceOccurrence; exports.createAdapter = createAdapter; exports.createD1Adapter = _chunkBNZLICCIcjs.createD1Adapter; exports.createReiServer = createReiServer; exports.createSingleUserCloudflareWorker = _chunkBNZLICCIcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkBNZLICCIcjs.createSingleUserServer; exports.createTenantToken = createTenantToken; exports.createWebCryptoWebPush = _chunkBNZLICCIcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkBNZLICCIcjs.decryptFromStorage; exports.decryptPayload = _chunkBNZLICCIcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkBNZLICCIcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkBNZLICCIcjs.encryptForStorage; exports.ensureSchema = _chunkBNZLICCIcjs.ensureSchema; exports.getSchemaVersion = _chunkBNZLICCIcjs.getSchemaVersion; exports.hasChatCredRef = _chunkBNZLICCIcjs.hasChatCredRef; exports.isNonRetryableError = _chunkBNZLICCIcjs.isNonRetryableError; exports.isValidCredId = _chunkBNZLICCIcjs.isValidCredId; exports.isValidISO8601 = _chunkBNZLICCIcjs.isValidISO8601; exports.isValidTimeZoneId = _chunkBNZLICCIcjs.isValidTimeZoneId; exports.isValidUUID = _chunkBNZLICCIcjs.isValidUUID; exports.isValidUUIDv4 = _chunkBNZLICCIcjs.isValidUUIDv4; exports.isValidUrl = _chunkBNZLICCIcjs.isValidUrl; exports.measurePushPayload = _chunkBNZLICCIcjs.measurePushPayload; exports.nextFutureOccurrence = _chunkBNZLICCIcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkBNZLICCIcjs.planNextOccurrence; exports.readRequestBody = _chunkBNZLICCIcjs.readRequestBody; exports.resolveLlmCredential = _chunkBNZLICCIcjs.resolveLlmCredential; exports.runScheduledTick = _chunkBNZLICCIcjs.runScheduledTick; exports.runTask = _chunkBNZLICCIcjs.runTask; exports.sanitizeErrorSummary = _chunkBNZLICCIcjs.sanitizeErrorSummary; exports.summarizeErrorCause = _chunkBNZLICCIcjs.summarizeErrorCause; exports.supportsLlmCredentialsStore = _chunkBNZLICCIcjs.supportsLlmCredentialsStore; exports.validateAvatarUrl = _chunkBNZLICCIcjs.validateAvatarUrl; exports.validateCredRefs = _chunkBNZLICCIcjs.validateCredRefs; exports.validateCredValue = _chunkBNZLICCIcjs.validateCredValue; exports.validateLlmMessagesArray = _chunkBNZLICCIcjs.validateLlmMessagesArray; exports.validateScheduleMessagePayload = _chunkBNZLICCIcjs.validateScheduleMessagePayload; exports.validateSplitPattern = _chunkBNZLICCIcjs.validateSplitPattern; exports.verifyTenantToken = verifyTenantToken;
+exports.CORS_ALLOW_HEADERS = _chunkXLCBVU37cjs.CORS_ALLOW_HEADERS; exports.CORS_ALLOW_METHODS = _chunkXLCBVU37cjs.CORS_ALLOW_METHODS; exports.CRED_ID_MAX_LENGTH = _chunkXLCBVU37cjs.CRED_ID_MAX_LENGTH; exports.CRED_PUT_BATCH_MAX = _chunkXLCBVU37cjs.CRED_PUT_BATCH_MAX; exports.CRED_REFS_MAX_ENTRIES = _chunkXLCBVU37cjs.CRED_REFS_MAX_ENTRIES; exports.CRED_ROWS_PER_USER_MAX = _chunkXLCBVU37cjs.CRED_ROWS_PER_USER_MAX; exports.DEFAULT_CLAIM_LEASE_MS = _chunkXLCBVU37cjs.DEFAULT_CLAIM_LEASE_MS; exports.DEFAULT_HEARTBEAT_LEASE_TTL_MS = _chunkXLCBVU37cjs.DEFAULT_HEARTBEAT_LEASE_TTL_MS; exports.DEFAULT_LEASE_HEARTBEAT_MS = _chunkXLCBVU37cjs.DEFAULT_LEASE_HEARTBEAT_MS; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkXLCBVU37cjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE = _chunkXLCBVU37cjs.DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE; exports.DEFAULT_MAX_TOOL_ITERATIONS = _chunkXLCBVU37cjs.DEFAULT_MAX_TOOL_ITERATIONS; exports.DEFAULT_TOTAL_TIMEOUT_MS = _chunkXLCBVU37cjs.DEFAULT_TOTAL_TIMEOUT_MS; exports.DeploymentConfigError = _chunkXLCBVU37cjs.DeploymentConfigError; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkXLCBVU37cjs.MAX_PUSH_PAYLOAD_BYTES; exports.MAX_TASK_PAYLOAD_BYTES = _chunkXLCBVU37cjs.MAX_TASK_PAYLOAD_BYTES; exports.MIN_SCHEDULE_LEAD_MS = _chunkXLCBVU37cjs.MIN_SCHEDULE_LEAD_MS; exports.NonRetryableError = _chunkXLCBVU37cjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkXLCBVU37cjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkXLCBVU37cjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkXLCBVU37cjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkXLCBVU37cjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkXLCBVU37cjs.advanceOccurrence; exports.createAdapter = createAdapter; exports.createD1Adapter = _chunkXLCBVU37cjs.createD1Adapter; exports.createReiServer = createReiServer; exports.createSingleUserCloudflareWorker = _chunkXLCBVU37cjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkXLCBVU37cjs.createSingleUserServer; exports.createTenantToken = createTenantToken; exports.createWebCryptoWebPush = _chunkXLCBVU37cjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkXLCBVU37cjs.decryptFromStorage; exports.decryptPayload = _chunkXLCBVU37cjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkXLCBVU37cjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkXLCBVU37cjs.encryptForStorage; exports.ensureSchema = _chunkXLCBVU37cjs.ensureSchema; exports.getSchemaVersion = _chunkXLCBVU37cjs.getSchemaVersion; exports.hasChatCredRef = _chunkXLCBVU37cjs.hasChatCredRef; exports.isNonRetryableError = _chunkXLCBVU37cjs.isNonRetryableError; exports.isValidCredId = _chunkXLCBVU37cjs.isValidCredId; exports.isValidISO8601 = _chunkXLCBVU37cjs.isValidISO8601; exports.isValidTimeZoneId = _chunkXLCBVU37cjs.isValidTimeZoneId; exports.isValidUUID = _chunkXLCBVU37cjs.isValidUUID; exports.isValidUUIDv4 = _chunkXLCBVU37cjs.isValidUUIDv4; exports.isValidUrl = _chunkXLCBVU37cjs.isValidUrl; exports.measurePushPayload = _chunkXLCBVU37cjs.measurePushPayload; exports.nextFutureOccurrence = _chunkXLCBVU37cjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkXLCBVU37cjs.planNextOccurrence; exports.readRequestBody = _chunkXLCBVU37cjs.readRequestBody; exports.resolveLlmCredential = _chunkXLCBVU37cjs.resolveLlmCredential; exports.runScheduledTick = _chunkXLCBVU37cjs.runScheduledTick; exports.runTask = _chunkXLCBVU37cjs.runTask; exports.sanitizeErrorSummary = _chunkXLCBVU37cjs.sanitizeErrorSummary; exports.summarizeErrorCause = _chunkXLCBVU37cjs.summarizeErrorCause; exports.supportsLlmCredentialsStore = _chunkXLCBVU37cjs.supportsLlmCredentialsStore; exports.validateAvatarUrl = _chunkXLCBVU37cjs.validateAvatarUrl; exports.validateCredRefs = _chunkXLCBVU37cjs.validateCredRefs; exports.validateCredValue = _chunkXLCBVU37cjs.validateCredValue; exports.validateLlmMessagesArray = _chunkXLCBVU37cjs.validateLlmMessagesArray; exports.validateScheduleMessagePayload = _chunkXLCBVU37cjs.validateScheduleMessagePayload; exports.validateSplitPattern = _chunkXLCBVU37cjs.validateSplitPattern; exports.verifyTenantToken = verifyTenantToken;

package/dist/index.mjs

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

package/dist/lib/outbox-store.d.ts

@@ -70,16 +70,21 @@ export function discardUndeliveredPushes({ db, userId, pushes, sentIds }: {
 /**
  * 把某条任务名下「还没发出去的」行从 outbox 撤掉。
  *
- * 用在取消 / 顶替只碰了任务行的那两条路上（`DELETE /message` 与
- * `supersedesUuid`）：任务此前投递到一半失败过的话，没发出去的那几段还躺在
- * outbox 里等重试，任务行删掉它们也不会跟着走。不撤的话客户端下一次
- * `GET /outbox` 照样把它们补收回去——用户看到的就是「取消接口回了成功，消息还
- * 是来了」。
+ * 用在取消 / 顶替之后的每条收尾路上（`DELETE /message`、`supersedesUuid`、
+ * fire 内的 cancelTask、投递侧发现行已被取消）：任务此前投递到一半失败过的话，
+ * 没发出去的那几段还躺在 outbox 里等重试，任务行删掉它们也不会跟着走。不撤的
+ * 话客户端下一次 `GET /outbox` 照样把它们补收回去——用户看到的就是「取消接口回
+ * 了成功，消息还是来了」。
  *
  * 判据与 discardUndeliveredPushes 一致：只撤 delivered_at 为 null 的行。已经推
  * 给设备的那几条撤不回来，行留着让客户端照常 ack——取消的意思是「别再发后面
  * 的」，不是「把已经收到的从收件箱里抹掉」。
  *
+ * 优先走适配器的按任务删除（discardUndeliveredOutboxForTask）：一个来回，且不
+ * 受未 ack 积压量的影响。没有这个方法的适配器（宿主自带的旧实现）退回翻页扫
+ * 描——被取消任务的行通常是最新的，积压超过扫描上限时正好扫不到它们，所以扫到
+ * 上限还没扫完必须吵出来，不能装作清干净了。
+ *
  * 同样是 best-effort：适配器缺读/删任一侧就静默跳过，出错只记日志。取消 / 顶
  * 替本身已经生效了，不该因为账本没清干净被翻成失败。
  *

package/dist/lib/result-emitter.d.ts

@@ -25,9 +25,14 @@
  * @param {number|null} args.occurrenceMs
  * @param {{ sendNotification: Function }|null} args.webpush
  * @param {() => number} [args.now] - 取当前时刻（测试可注入假时钟）
+ * @param {(() => boolean)|null} [args.isCancelled] - 「这条任务是否已在投递期间
+ *   被取消 / 顶替」（run-tick 的租约心跳信号）。推送那条路的取消检查在
+ *   webpush 那层（guardWebpushWithLease），但 `notification.show: false` 的结
+ *   果不发推送，只有这个显式读法能拦得住它——不给的话那条路上没有任何取消检
+ *   查点。
  * @returns {ResultEmitter}
  */
-export function createResultEmitter({ db, task, userKey, decryptedPayload, messageIdBase, sessionId, occurrenceMs, webpush, now, }: {
+export function createResultEmitter({ db, task, userKey, decryptedPayload, messageIdBase, sessionId, occurrenceMs, webpush, now, isCancelled, }: {
     db: import("../adapters/interface.js").DbAdapter;
     task: any;
     userKey: string;
@@ -39,6 +44,7 @@ export function createResultEmitter({ db, task, userKey, decryptedPayload, messa
         sendNotification: Function;
     } | null;
     now?: () => number;
+    isCancelled?: (() => boolean) | null;
 }): ResultEmitter;
 export type ResultEmitter = {
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rei-standard/amsg-server",
-  "version": "2.6.0-next.23",
+  "version": "2.6.0-next.24",
   "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.8",
+    "@rei-standard/amsg-shared": "^0.4.0-next.9",
     "web-push": "^3.6.7"
   },
   "peerDependencies": {