@rei-standard/amsg-server 2.6.0-next.31 → 2.6.0-next.32

package/README.md

@@ -940,3 +940,30 @@ VERCEL_PROTECTION_BYPASS=YOUR_BYPASS_KEY
 - [SW 包 README](https://github.com/Tosd0/ReiStandard/blob/main/packages/rei-standard-amsg/sw/README.md)
 - [API 技术规范](https://github.com/Tosd0/ReiStandard/blob/main/standards/active-messaging-api.md)
 - [Service Worker 规范](https://github.com/Tosd0/ReiStandard/blob/main/standards/service-worker-specification.md)
+
+
+## 取消正在执行的生成与工具
+
+任务被 `DELETE /cancel-message` 取消或被新任务顶替后，租约心跳发现任务已经失效，会中断正在等待的模型请求，阻止新的模型轮次、工具阶段和推送。`leaseHeartbeatMs` 默认仍为 30000；需要及时停止的交互应用可配置为 1000（每个正在执行的任务每秒续租一次）。这是跨请求的数据库检测，延迟取决于心跳和数据库响应，不承诺瞬时中断。自定义适配器需要支持 `claimTask` / `renewTaskLease`；关掉心跳时也关掉了这条主动检测路径。
+
+`onBeforeFire`、`onLLMOutput`、`executeToolCalls` 的 context 以及 `onFireSettled` 回执新增：
+
+- `signal: AbortSignal`：传给工具内部的 `fetch`，与工具自己的超时信号合并。
+- `isCancelled(): boolean`：当前是否已收到取消信号。
+- `throwIfCancelled(): void`：已取消时抛出 `code: 'TASK_CANCELLED'` 的错误。每个副作用开始前检查，工具 catch 中也要先调用它，以免取消被转成普通工具失败后继续执行。
+
+```js
+async function executeToolCalls(calls, ctx) {
+  const results = [];
+  for (const call of calls) {
+    ctx.throwIfCancelled();
+    const response = await fetch(toolUrl(call), { signal: ctx.signal });
+    results.push({ tool_call_id: call.id, role: 'tool', content: await response.text() });
+  }
+  return results;
+}
+```
+
+取消收尾使用 `onFireSettled({ status: 'cancelled', willRetry: false, error, ... })`，不是生成失败。应用应在这里释放资源、结算已发生的用量，避免发出失败提示或把未送达内容记为已回复。取消时已经开始写入的 outbox 批次会在写完后检查信号并撤掉未投递部分；已经发到客户端的消息仍由客户端处理。应用需要记录停止的任务身份，拦住迟到推送、补收以及尚未显示的本地内容。已完成的外部副作用无法撤销；不支持 AbortSignal 的工具也需要自己在执行步骤之间检查取消。
+
+执行阶段的 `ctx.writeState`、`scheduleTask`、`cancelTask`、`renewTask` 和 `emitResult` 会拒绝取消后新发起的操作。`onFireSettled` 的 `info.writeState` 特意仍可用，供宿主释放锁、保存账单等收尾；它不能用于继续生成阶段的业务动作。已经开始的数据库写入不支持回滚，宿主仍需处理并发状态版本。

package/dist/{chunk-PG54W6B5.mjs → chunk-INNZZFGJ.mjs}

@@ -1707,6 +1707,17 @@ function firstPositiveNumber(values, fallback) {
 }
 async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
   const hooks = ctx.hooks;
+  const signal = ctx.signal || new AbortController().signal;
+  const isCancelled = () => signal.aborted || ctx.isTaskCancelled?.() === true;
+  const throwIfCancelled = () => {
+    if (!isCancelled()) return;
+    if (isTaskCancelledError(signal.reason)) throw signal.reason;
+    const error = new Error("Task was cancelled or superseded");
+    error.code = "TASK_CANCELLED";
+    throw error;
+  };
+  const cancellation = { signal, isCancelled, throwIfCancelled };
+  ctx = { ...ctx, ...cancellation };
   if (typeof hooks.onLLMOutput !== "function") {
     throw new DeploymentConfigError(
       "AGENTIC_CONFIG_ERROR: hooks.onBeforeFire requires hooks.onLLMOutput to classify LLM rounds",
@@ -1715,13 +1726,17 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
   }
   const nowFn = typeof ctx._agenticNow === "function" ? ctx._agenticNow : Date.now;
   const sleep = typeof ctx._agenticSleep === "function" ? ctx._agenticSleep : defaultSleep;
-  const { readState, writeState } = createStateAccessors({
+  const { readState, writeState: writeSettledState } = createStateAccessors({
     db: ctx.db,
     userId: task.user_id,
     userKey,
     maxStateValueBytes: ctx.maxStateValueBytes,
     now: nowFn
   });
+  const writeState = async (namespace, entries) => {
+    throwIfCancelled();
+    return writeSettledState(namespace, entries);
+  };
   const sessionId = task.id != null ? `sess_task_${task.id}${occurrenceSuffix(task)}` : `sess_${randomUUID()}`;
   const messageIdBase = task.id != null ? `msg_task_${task.id}${occurrenceSuffix(task)}` : `msg_${randomUUID()}`;
   const occurrenceMs = occurrenceMsOf(task);
@@ -1737,7 +1752,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     now: nowFn,
     // run-tick 在投递 ctx 上挂的取消信号（与 guardWebpushWithLease 读的是同一
     // 个租约状态），emitResult 不发推送的那条路要靠它拦下已取消任务的落行。
-    isCancelled: typeof ctx.isTaskCancelled === "function" ? ctx.isTaskCancelled : null
+    isCancelled
   });
   const maxScheduledTasksPerFire = Number.isInteger(ctx.maxScheduledTasksPerFire) && ctx.maxScheduledTasksPerFire >= 0 ? ctx.maxScheduledTasksPerFire : DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE;
   let scheduledTaskCount = 0;
@@ -1754,6 +1769,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     }
   }
   const scheduleTask = async (options) => {
+    throwIfCancelled();
     if (!options || typeof options !== "object" || Array.isArray(options)) {
       throw new TypeError("scheduleTask(options) \u9700\u8981\u4E00\u4E2A\u5BF9\u8C61\uFF0C\u81F3\u5C11\u5305\u542B { firstSendTime }");
     }
@@ -1874,6 +1890,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     }
     scheduledTaskCount++;
     const encryptedPayload = await encryptForStorage(serializedTaskData, userKey);
+    throwIfCancelled();
     let created;
     try {
       created = await ctx.db.createTask({
@@ -1908,6 +1925,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     };
   };
   const cancelTask = async (uuid) => {
+    throwIfCancelled();
     if (typeof uuid !== "string" || !uuid.trim()) {
       throw new TypeError("cancelTask(uuid) \u9700\u8981\u975E\u7A7A\u5B57\u7B26\u4E32 uuid");
     }
@@ -1922,6 +1940,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
         { code: "AGENTIC_CANCEL_UNSUPPORTED" }
       );
     }
+    throwIfCancelled();
     const cancelled = await ctx.db.deleteTaskByUuid(uuid, task.user_id);
     if (cancelled) {
       await discardUndeliveredPushesForTask({ db: ctx.db, userId: task.user_id, taskUuid: uuid });
@@ -1929,6 +1948,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     return { cancelled: !!cancelled };
   };
   const renewTask = async (uuid, nextSendAt) => {
+    throwIfCancelled();
     if (typeof uuid !== "string" || !uuid.trim()) {
       throw new TypeError("renewTask(uuid, nextSendAt) \u9700\u8981\u975E\u7A7A\u5B57\u7B26\u4E32 uuid");
     }
@@ -1959,6 +1979,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     const payload = JSON.parse(await decryptFromStorage(row.encrypted_payload, userKey));
     const nextSendAtIso = sendAt.toISOString();
     const encrypted = await encryptForStorage(JSON.stringify({ ...payload, firstSendTime: nextSendAtIso }), userKey);
+    throwIfCancelled();
     const updated = await ctx.db.updateTaskByUuid(uuid, task.user_id, encrypted, {
       next_send_at: nextSendAtIso,
       retry_count: 0,
@@ -1979,6 +2000,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
   };
   const scratch = {};
   const fireCtx = Object.freeze({
+    ...cancellation,
     task: buildHookTask(task, decryptedPayload),
     userId: task.user_id,
     readState,
@@ -2027,16 +2049,26 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
       messageIdBase,
       occurrenceMs
     });
+    throwIfCancelled();
     settledStatus = !outcome.handled ? "not-handled" : outcome.result.status === "skipped" ? "skipped" : "sent";
     return outcome;
   } catch (error) {
+    if (isCancelled() && !isTaskCancelledError(error)) {
+      try {
+        throwIfCancelled();
+      } catch (cancelled) {
+        error = cancelled;
+      }
+    }
+    if (isTaskCancelledError(error)) settledStatus = "cancelled";
     settledError = error;
     throw error;
   } finally {
     await notifyFireSettled(ctx, {
       task,
+      ...cancellation,
       status: settledStatus,
-      ...settledStatus === "failed" && ctx._deliveryState ? failureRetryDecision(ctx._deliveryState, settledError) : { willRetry: null, failureStage: null },
+      ...settledStatus === "cancelled" ? { willRetry: false, failureStage: null } : settledStatus === "failed" && ctx._deliveryState ? failureRetryDecision(ctx._deliveryState, settledError) : { willRetry: null, failureStage: null },
       skipReason: settledStatus === "skipped" ? progress.skipReason : null,
       sentCount: progress.sentCount,
       pushedCount: progress.pushedCount,
@@ -2060,7 +2092,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
       outboxed: progress.outboxed,
       scratch,
       readState,
-      writeState,
+      writeState: writeSettledState,
       emitResult
     });
   }
@@ -2087,7 +2119,9 @@ async function runFireChain({
   messageIdBase,
   occurrenceMs
 }) {
+  ctx.throwIfCancelled();
   const before = await hooks.onBeforeFire(fireCtx);
+  ctx.throwIfCancelled();
   if (before == null) return { handled: false };
   if (typeof before === "object" && before.skip === true) {
     progress.skipReason = "before-fire";
@@ -2111,6 +2145,7 @@ async function runFireChain({
     decryptedPayload
   });
   for (let iteration = 0; iteration < maxToolIterations; iteration++) {
+    ctx.throwIfCancelled();
     if (nowFn() >= deadline) {
       throw new Error(`AGENTIC_TOTAL_TIMEOUT: fire chain exceeded ${totalTimeoutMs}ms after ${iteration} LLM round(s)`);
     }
@@ -2124,13 +2159,17 @@ async function runFireChain({
         messages,
         ...normalized.tools ? { tools: normalized.tools, toolChoice: normalized.toolChoice } : {}
       },
-      { requireContent: false, timeoutMs: roundTimeoutMs }
+      { requireContent: false, timeoutMs: roundTimeoutMs, signal: ctx.signal }
     );
     const assistantMessage = extractAssistantMessage(llmResponse);
     messages = [...messages, assistantMessage];
     progress.usage = llmResponse && typeof llmResponse === "object" && llmResponse.usage || null;
     progress.usageTotal = accumulateUsage(progress.usageTotal, progress.usage);
+    ctx.throwIfCancelled();
     const sessionCtx = Object.freeze({
+      signal: ctx.signal,
+      isCancelled: ctx.isCancelled,
+      throwIfCancelled: ctx.throwIfCancelled,
       ...buildSessionContext({
         sessionId,
         messages,
@@ -2154,6 +2193,7 @@ async function runFireChain({
       resolveLlmCredential: resolveLlmCredential2
     });
     const decision = await hooks.onLLMOutput(sessionCtx);
+    ctx.throwIfCancelled();
     try {
       assertValidDecision(decision, { inlineToolCalls: true });
     } catch (error) {
@@ -2204,11 +2244,15 @@ async function runFireChain({
     }
     let toolResults;
     try {
+      ctx.throwIfCancelled();
       toolResults = await hooks.executeToolCalls(toolCalls, sessionCtx);
+      ctx.throwIfCancelled();
       if (!Array.isArray(toolResults)) {
         throw new TypeError('executeToolCalls must resolve to an array of { tool_call_id, role: "tool", content }');
       }
     } catch (error) {
+      ctx.throwIfCancelled();
+      if (isTaskCancelledError(error)) throw error;
       toolResults = toolCalls.map((toolCall) => ({
         tool_call_id: toolCall && typeof toolCall === "object" && typeof toolCall.id === "string" ? toolCall.id : "",
         role: "tool",
@@ -2298,9 +2342,11 @@ async function sendHookPushPayloads({
       stampTaskIdentity(push, task, decryptedPayload, occurrenceMs);
       finalized.push(push);
     }
+    ctx.throwIfCancelled();
     outboxed = await appendPushesToOutbox({ db: ctx.db, userId: task.user_id, userKey, pushes: finalized });
     progress.outboxed = outboxed;
     if (ctx._deliveryState) ctx._deliveryState.outboxed = outboxed;
+    ctx.throwIfCancelled();
     if (!ctx.vapid || !ctx.vapid.email || !ctx.vapid.publicKey || !ctx.vapid.privateKey) {
       throw new Error("VAPID configuration missing - push notifications cannot be sent");
     }
@@ -2314,6 +2360,7 @@ async function sendHookPushPayloads({
     const willPush = finalized.map((push) => shouldSendPush(push, pushGate));
     const lastPushIndex = willPush.lastIndexOf(true);
     for (let i = 0; i < total; i++) {
+      ctx.throwIfCancelled();
       if (willPush[i]) {
         await sendTaggedPush(ctx.webpush, pushSubscription, JSON.stringify(finalized[i]));
         pushedCount++;
@@ -2577,7 +2624,7 @@ async function processSingleMessage(task, ctx, providedMasterKey, predecrypted =
       const hasChatSource = hasChatCredRef(decryptedPayload) || !!(decryptedPayload.apiUrl && decryptedPayload.apiKey && decryptedPayload.primaryModel);
       if (hasPrompt && hasChatSource) {
         const chatCred = await resolveFireCredentials({ db: ctx.db, userId: task.user_id, userKey, decryptedPayload });
-        const aiResult = await callLlm(chatCred ? { ...decryptedPayload, ...chatCred } : decryptedPayload);
+        const aiResult = await callLlm(chatCred ? { ...decryptedPayload, ...chatCred } : decryptedPayload, { signal: ctx.signal });
         messageContent = aiResult.content;
         llmResponse = aiResult.response;
       } else if (decryptedPayload.userMessage) {
@@ -2587,7 +2634,7 @@ async function processSingleMessage(task, ctx, providedMasterKey, predecrypted =
       }
     } else if (decryptedPayload.messageType === "prompted" || decryptedPayload.messageType === "auto") {
       const chatCred = await resolveFireCredentials({ db: ctx.db, userId: task.user_id, userKey, decryptedPayload });
-      const aiResult = await callLlm(chatCred ? { ...decryptedPayload, ...chatCred } : decryptedPayload);
+      const aiResult = await callLlm(chatCred ? { ...decryptedPayload, ...chatCred } : decryptedPayload, { signal: ctx.signal });
       messageContent = aiResult.content;
       llmResponse = aiResult.response;
     } else {
@@ -3208,7 +3255,8 @@ async function deliverTasks(ctx, tasks) {
     return !!await db.claimTask(task.id, task.next_send_at, leaseUntil, serializeGroup);
   }
   function startLeaseHeartbeat(task) {
-    const lease = { lost: false, released: false, stop: () => {
+    const controller = new AbortController();
+    const lease = { lost: false, released: false, signal: controller.signal, stop: () => {
     } };
     if (!heartbeatEnabled) return lease;
     let stopped = false;
@@ -3224,6 +3272,9 @@ async function deliverTasks(ctx, tasks) {
       if (renewed === false) {
         if (stopped || lease.released) return;
         lease.lost = true;
+        const error = new Error("Task was cancelled or superseded");
+        error.code = TASK_CANCELLED_CODE;
+        controller.abort(error);
         console.warn(`[amsg-server] \u4EFB\u52A1 ${task.id} \u7684\u79DF\u7EA6\u5DF2\u5931\u6548\uFF08\u884C\u88AB\u53D6\u6D88\u6216\u9876\u66FF\uFF09\uFF0C\u5269\u4F59\u63A8\u9001\u5C06\u4E2D\u6B62`);
         return;
       }
@@ -3553,7 +3604,8 @@ async function deliverTasks(ctx, tasks) {
           db,
           masterKey,
           webpush: guardWebpushWithLease(ctx.webpush, lease),
-          isTaskCancelled: () => lease.lost
+          isTaskCancelled: () => lease.lost,
+          signal: lease.signal
         },
         masterKey,
         { userKey, payload: decryptedPayload }
@@ -5960,7 +6012,7 @@ function createClientStateNamespacesHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "2.6.0-next.31" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.6.0-next.32" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([

package/dist/{chunk-7TM3MH3Q.cjs → chunk-KZT3YC62.cjs}

@@ -1707,6 +1707,17 @@ function firstPositiveNumber(values, fallback) {
 }
 async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
   const hooks = ctx.hooks;
+  const signal = ctx.signal || new AbortController().signal;
+  const isCancelled = () => signal.aborted || _optionalChain([ctx, 'access', _5 => _5.isTaskCancelled, 'optionalCall', _6 => _6()]) === true;
+  const throwIfCancelled = () => {
+    if (!isCancelled()) return;
+    if (isTaskCancelledError(signal.reason)) throw signal.reason;
+    const error = new Error("Task was cancelled or superseded");
+    error.code = "TASK_CANCELLED";
+    throw error;
+  };
+  const cancellation = { signal, isCancelled, throwIfCancelled };
+  ctx = { ...ctx, ...cancellation };
   if (typeof hooks.onLLMOutput !== "function") {
     throw new DeploymentConfigError(
       "AGENTIC_CONFIG_ERROR: hooks.onBeforeFire requires hooks.onLLMOutput to classify LLM rounds",
@@ -1715,13 +1726,17 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
   }
   const nowFn = typeof ctx._agenticNow === "function" ? ctx._agenticNow : Date.now;
   const sleep = typeof ctx._agenticSleep === "function" ? ctx._agenticSleep : defaultSleep;
-  const { readState, writeState } = createStateAccessors({
+  const { readState, writeState: writeSettledState } = createStateAccessors({
     db: ctx.db,
     userId: task.user_id,
     userKey,
     maxStateValueBytes: ctx.maxStateValueBytes,
     now: nowFn
   });
+  const writeState = async (namespace, entries) => {
+    throwIfCancelled();
+    return writeSettledState(namespace, entries);
+  };
   const sessionId = task.id != null ? `sess_task_${task.id}${occurrenceSuffix(task)}` : `sess_${_amsgshared.randomUUID.call(void 0, )}`;
   const messageIdBase = task.id != null ? `msg_task_${task.id}${occurrenceSuffix(task)}` : `msg_${_amsgshared.randomUUID.call(void 0, )}`;
   const occurrenceMs = occurrenceMsOf(task);
@@ -1737,7 +1752,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     now: nowFn,
     // run-tick 在投递 ctx 上挂的取消信号（与 guardWebpushWithLease 读的是同一
     // 个租约状态），emitResult 不发推送的那条路要靠它拦下已取消任务的落行。
-    isCancelled: typeof ctx.isTaskCancelled === "function" ? ctx.isTaskCancelled : null
+    isCancelled
   });
   const maxScheduledTasksPerFire = Number.isInteger(ctx.maxScheduledTasksPerFire) && ctx.maxScheduledTasksPerFire >= 0 ? ctx.maxScheduledTasksPerFire : DEFAULT_MAX_SCHEDULED_TASKS_PER_FIRE;
   let scheduledTaskCount = 0;
@@ -1754,6 +1769,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     }
   }
   const scheduleTask = async (options) => {
+    throwIfCancelled();
     if (!options || typeof options !== "object" || Array.isArray(options)) {
       throw new TypeError("scheduleTask(options) \u9700\u8981\u4E00\u4E2A\u5BF9\u8C61\uFF0C\u81F3\u5C11\u5305\u542B { firstSendTime }");
     }
@@ -1874,6 +1890,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     }
     scheduledTaskCount++;
     const encryptedPayload = await encryptForStorage(serializedTaskData, userKey);
+    throwIfCancelled();
     let created;
     try {
       created = await ctx.db.createTask({
@@ -1908,6 +1925,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     };
   };
   const cancelTask = async (uuid) => {
+    throwIfCancelled();
     if (typeof uuid !== "string" || !uuid.trim()) {
       throw new TypeError("cancelTask(uuid) \u9700\u8981\u975E\u7A7A\u5B57\u7B26\u4E32 uuid");
     }
@@ -1922,6 +1940,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
         { code: "AGENTIC_CANCEL_UNSUPPORTED" }
       );
     }
+    throwIfCancelled();
     const cancelled = await ctx.db.deleteTaskByUuid(uuid, task.user_id);
     if (cancelled) {
       await discardUndeliveredPushesForTask({ db: ctx.db, userId: task.user_id, taskUuid: uuid });
@@ -1929,6 +1948,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     return { cancelled: !!cancelled };
   };
   const renewTask = async (uuid, nextSendAt) => {
+    throwIfCancelled();
     if (typeof uuid !== "string" || !uuid.trim()) {
       throw new TypeError("renewTask(uuid, nextSendAt) \u9700\u8981\u975E\u7A7A\u5B57\u7B26\u4E32 uuid");
     }
@@ -1959,6 +1979,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
     const payload = JSON.parse(await decryptFromStorage(row.encrypted_payload, userKey));
     const nextSendAtIso = sendAt.toISOString();
     const encrypted = await encryptForStorage(JSON.stringify({ ...payload, firstSendTime: nextSendAtIso }), userKey);
+    throwIfCancelled();
     const updated = await ctx.db.updateTaskByUuid(uuid, task.user_id, encrypted, {
       next_send_at: nextSendAtIso,
       retry_count: 0,
@@ -1979,6 +2000,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
   };
   const scratch = {};
   const fireCtx = Object.freeze({
+    ...cancellation,
     task: buildHookTask(task, decryptedPayload),
     userId: task.user_id,
     readState,
@@ -2027,16 +2049,26 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
       messageIdBase,
       occurrenceMs
     });
+    throwIfCancelled();
     settledStatus = !outcome.handled ? "not-handled" : outcome.result.status === "skipped" ? "skipped" : "sent";
     return outcome;
   } catch (error) {
+    if (isCancelled() && !isTaskCancelledError(error)) {
+      try {
+        throwIfCancelled();
+      } catch (cancelled) {
+        error = cancelled;
+      }
+    }
+    if (isTaskCancelledError(error)) settledStatus = "cancelled";
     settledError = error;
     throw error;
   } finally {
     await notifyFireSettled(ctx, {
       task,
+      ...cancellation,
       status: settledStatus,
-      ...settledStatus === "failed" && ctx._deliveryState ? failureRetryDecision(ctx._deliveryState, settledError) : { willRetry: null, failureStage: null },
+      ...settledStatus === "cancelled" ? { willRetry: false, failureStage: null } : settledStatus === "failed" && ctx._deliveryState ? failureRetryDecision(ctx._deliveryState, settledError) : { willRetry: null, failureStage: null },
       skipReason: settledStatus === "skipped" ? progress.skipReason : null,
       sentCount: progress.sentCount,
       pushedCount: progress.pushedCount,
@@ -2060,7 +2092,7 @@ async function runAgenticFire({ task, decryptedPayload, userKey, ctx }) {
       outboxed: progress.outboxed,
       scratch,
       readState,
-      writeState,
+      writeState: writeSettledState,
       emitResult
     });
   }
@@ -2087,7 +2119,9 @@ async function runFireChain({
   messageIdBase,
   occurrenceMs
 }) {
+  ctx.throwIfCancelled();
   const before = await hooks.onBeforeFire(fireCtx);
+  ctx.throwIfCancelled();
   if (before == null) return { handled: false };
   if (typeof before === "object" && before.skip === true) {
     progress.skipReason = "before-fire";
@@ -2111,6 +2145,7 @@ async function runFireChain({
     decryptedPayload
   });
   for (let iteration = 0; iteration < maxToolIterations; iteration++) {
+    ctx.throwIfCancelled();
     if (nowFn() >= deadline) {
       throw new Error(`AGENTIC_TOTAL_TIMEOUT: fire chain exceeded ${totalTimeoutMs}ms after ${iteration} LLM round(s)`);
     }
@@ -2124,13 +2159,17 @@ async function runFireChain({
         messages,
         ...normalized.tools ? { tools: normalized.tools, toolChoice: normalized.toolChoice } : {}
       },
-      { requireContent: false, timeoutMs: roundTimeoutMs }
+      { requireContent: false, timeoutMs: roundTimeoutMs, signal: ctx.signal }
     );
     const assistantMessage = _amsgshared.extractAssistantMessage.call(void 0, llmResponse);
     messages = [...messages, assistantMessage];
     progress.usage = llmResponse && typeof llmResponse === "object" && llmResponse.usage || null;
     progress.usageTotal = accumulateUsage(progress.usageTotal, progress.usage);
+    ctx.throwIfCancelled();
     const sessionCtx = Object.freeze({
+      signal: ctx.signal,
+      isCancelled: ctx.isCancelled,
+      throwIfCancelled: ctx.throwIfCancelled,
       ..._amsgshared.buildSessionContext.call(void 0, {
         sessionId,
         messages,
@@ -2154,6 +2193,7 @@ async function runFireChain({
       resolveLlmCredential: resolveLlmCredential2
     });
     const decision = await hooks.onLLMOutput(sessionCtx);
+    ctx.throwIfCancelled();
     try {
       _amsgshared.assertValidDecision.call(void 0, decision, { inlineToolCalls: true });
     } catch (error) {
@@ -2204,15 +2244,19 @@ async function runFireChain({
     }
     let toolResults;
     try {
+      ctx.throwIfCancelled();
       toolResults = await hooks.executeToolCalls(toolCalls, sessionCtx);
+      ctx.throwIfCancelled();
       if (!Array.isArray(toolResults)) {
         throw new TypeError('executeToolCalls must resolve to an array of { tool_call_id, role: "tool", content }');
       }
     } catch (error) {
+      ctx.throwIfCancelled();
+      if (isTaskCancelledError(error)) throw error;
       toolResults = toolCalls.map((toolCall) => ({
         tool_call_id: toolCall && typeof toolCall === "object" && typeof toolCall.id === "string" ? toolCall.id : "",
         role: "tool",
-        content: `Tool execution failed: ${_nullishCoalesce(_optionalChain([error, 'optionalAccess', _5 => _5.message]), () => ( String(error)))}`
+        content: `Tool execution failed: ${_nullishCoalesce(_optionalChain([error, 'optionalAccess', _7 => _7.message]), () => ( String(error)))}`
       }));
     }
     const nativeCalls = Array.isArray(assistantMessage.tool_calls) ? assistantMessage.tool_calls : [];
@@ -2298,9 +2342,11 @@ async function sendHookPushPayloads({
       stampTaskIdentity(push, task, decryptedPayload, occurrenceMs);
       finalized.push(push);
     }
+    ctx.throwIfCancelled();
     outboxed = await appendPushesToOutbox({ db: ctx.db, userId: task.user_id, userKey, pushes: finalized });
     progress.outboxed = outboxed;
     if (ctx._deliveryState) ctx._deliveryState.outboxed = outboxed;
+    ctx.throwIfCancelled();
     if (!ctx.vapid || !ctx.vapid.email || !ctx.vapid.publicKey || !ctx.vapid.privateKey) {
       throw new Error("VAPID configuration missing - push notifications cannot be sent");
     }
@@ -2314,6 +2360,7 @@ async function sendHookPushPayloads({
     const willPush = finalized.map((push) => shouldSendPush(push, pushGate));
     const lastPushIndex = willPush.lastIndexOf(true);
     for (let i = 0; i < total; i++) {
+      ctx.throwIfCancelled();
       if (willPush[i]) {
         await sendTaggedPush(ctx.webpush, pushSubscription, JSON.stringify(finalized[i]));
         pushedCount++;
@@ -2577,7 +2624,7 @@ async function processSingleMessage(task, ctx, providedMasterKey, predecrypted =
       const hasChatSource = hasChatCredRef(decryptedPayload) || !!(decryptedPayload.apiUrl && decryptedPayload.apiKey && decryptedPayload.primaryModel);
       if (hasPrompt && hasChatSource) {
         const chatCred = await resolveFireCredentials({ db: ctx.db, userId: task.user_id, userKey, decryptedPayload });
-        const aiResult = await callLlm(chatCred ? { ...decryptedPayload, ...chatCred } : decryptedPayload);
+        const aiResult = await callLlm(chatCred ? { ...decryptedPayload, ...chatCred } : decryptedPayload, { signal: ctx.signal });
         messageContent = aiResult.content;
         llmResponse = aiResult.response;
       } else if (decryptedPayload.userMessage) {
@@ -2587,7 +2634,7 @@ async function processSingleMessage(task, ctx, providedMasterKey, predecrypted =
       }
     } else if (decryptedPayload.messageType === "prompted" || decryptedPayload.messageType === "auto") {
       const chatCred = await resolveFireCredentials({ db: ctx.db, userId: task.user_id, userKey, decryptedPayload });
-      const aiResult = await callLlm(chatCred ? { ...decryptedPayload, ...chatCred } : decryptedPayload);
+      const aiResult = await callLlm(chatCred ? { ...decryptedPayload, ...chatCred } : decryptedPayload, { signal: ctx.signal });
       messageContent = aiResult.content;
       llmResponse = aiResult.response;
     } else {
@@ -3208,7 +3255,8 @@ async function deliverTasks(ctx, tasks) {
     return !!await db.claimTask(task.id, task.next_send_at, leaseUntil, serializeGroup);
   }
   function startLeaseHeartbeat(task) {
-    const lease = { lost: false, released: false, stop: () => {
+    const controller = new AbortController();
+    const lease = { lost: false, released: false, signal: controller.signal, stop: () => {
     } };
     if (!heartbeatEnabled) return lease;
     let stopped = false;
@@ -3224,6 +3272,9 @@ async function deliverTasks(ctx, tasks) {
       if (renewed === false) {
         if (stopped || lease.released) return;
         lease.lost = true;
+        const error = new Error("Task was cancelled or superseded");
+        error.code = TASK_CANCELLED_CODE;
+        controller.abort(error);
         console.warn(`[amsg-server] \u4EFB\u52A1 ${task.id} \u7684\u79DF\u7EA6\u5DF2\u5931\u6548\uFF08\u884C\u88AB\u53D6\u6D88\u6216\u9876\u66FF\uFF09\uFF0C\u5269\u4F59\u63A8\u9001\u5C06\u4E2D\u6B62`);
         return;
       }
@@ -3553,7 +3604,8 @@ async function deliverTasks(ctx, tasks) {
           db,
           masterKey,
           webpush: guardWebpushWithLease(ctx.webpush, lease),
-          isTaskCancelled: () => lease.lost
+          isTaskCancelled: () => lease.lost,
+          signal: lease.signal
         },
         masterKey,
         { userKey, payload: decryptedPayload }
@@ -5099,7 +5151,7 @@ var D1Adapter = class {
       result.cleanupOutcomes = probeIndexes.map((probeAt) => {
         if (probeAt === null) return null;
         const row = results[probeAt] && Array.isArray(results[probeAt].results) ? results[probeAt].results[0] : null;
-        return Number(_nullishCoalesce(_optionalChain([row, 'optionalAccess', _6 => _6.n]), () => ( 0))) === 0;
+        return Number(_nullishCoalesce(_optionalChain([row, 'optionalAccess', _8 => _8.n]), () => ( 0))) === 0;
       });
     }
     return result;
@@ -5960,7 +6012,7 @@ function createClientStateNamespacesHandler(ctx) {
 }
 
 // src/server/lib/version.js
-var SERVER_VERSION = true ? "2.6.0-next.31" : "0.0.0-dev";
+var SERVER_VERSION = true ? "2.6.0-next.32" : "0.0.0-dev";
 
 // src/server/handlers/capabilities.js
 var SERVER_FEATURES = Object.freeze([

package/dist/cloudflare.cjs

@@ -27,7 +27,7 @@
 
 
 
-var _chunk7TM3MH3Qcjs = require('./chunk-7TM3MH3Q.cjs');
+var _chunkKZT3YC62cjs = require('./chunk-KZT3YC62.cjs');
 require('./chunk-7NMQFTDJ.cjs');
 
 
@@ -58,4 +58,4 @@ require('./chunk-7NMQFTDJ.cjs');
 
 
 
-exports.DEFAULT_MAX_DELIVERY_RETRIES = _chunk7TM3MH3Qcjs.DEFAULT_MAX_DELIVERY_RETRIES; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunk7TM3MH3Qcjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.MAX_PUSH_PAYLOAD_BYTES = _chunk7TM3MH3Qcjs.MAX_PUSH_PAYLOAD_BYTES; exports.NonRetryableError = _chunk7TM3MH3Qcjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunk7TM3MH3Qcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunk7TM3MH3Qcjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunk7TM3MH3Qcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunk7TM3MH3Qcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunk7TM3MH3Qcjs.advanceOccurrence; exports.createD1Adapter = _chunk7TM3MH3Qcjs.createD1Adapter; exports.createSingleUserCloudflareWorker = _chunk7TM3MH3Qcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunk7TM3MH3Qcjs.createSingleUserServer; exports.createWebCryptoWebPush = _chunk7TM3MH3Qcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunk7TM3MH3Qcjs.decryptFromStorage; exports.decryptPayload = _chunk7TM3MH3Qcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunk7TM3MH3Qcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunk7TM3MH3Qcjs.encryptForStorage; exports.ensureSchema = _chunk7TM3MH3Qcjs.ensureSchema; exports.getSchemaVersion = _chunk7TM3MH3Qcjs.getSchemaVersion; exports.isNonRetryableError = _chunk7TM3MH3Qcjs.isNonRetryableError; exports.isValidTimeZoneId = _chunk7TM3MH3Qcjs.isValidTimeZoneId; exports.measurePushPayload = _chunk7TM3MH3Qcjs.measurePushPayload; exports.nextFutureOccurrence = _chunk7TM3MH3Qcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunk7TM3MH3Qcjs.planNextOccurrence; exports.readRequestBody = _chunk7TM3MH3Qcjs.readRequestBody; exports.runScheduledTick = _chunk7TM3MH3Qcjs.runScheduledTick; exports.runTask = _chunk7TM3MH3Qcjs.runTask; exports.summarizeErrorCause = _chunk7TM3MH3Qcjs.summarizeErrorCause;
+exports.DEFAULT_MAX_DELIVERY_RETRIES = _chunkKZT3YC62cjs.DEFAULT_MAX_DELIVERY_RETRIES; exports.DEFAULT_MAX_REQUEST_BODY_BYTES = _chunkKZT3YC62cjs.DEFAULT_MAX_REQUEST_BODY_BYTES; exports.MAX_PUSH_PAYLOAD_BYTES = _chunkKZT3YC62cjs.MAX_PUSH_PAYLOAD_BYTES; exports.NonRetryableError = _chunkKZT3YC62cjs.NonRetryableError; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkKZT3YC62cjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.SCHEMA_VERSION = _chunkKZT3YC62cjs.SCHEMA_VERSION; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkKZT3YC62cjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkKZT3YC62cjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkKZT3YC62cjs.advanceOccurrence; exports.createD1Adapter = _chunkKZT3YC62cjs.createD1Adapter; exports.createSingleUserCloudflareWorker = _chunkKZT3YC62cjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkKZT3YC62cjs.createSingleUserServer; exports.createWebCryptoWebPush = _chunkKZT3YC62cjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkKZT3YC62cjs.decryptFromStorage; exports.decryptPayload = _chunkKZT3YC62cjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkKZT3YC62cjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkKZT3YC62cjs.encryptForStorage; exports.ensureSchema = _chunkKZT3YC62cjs.ensureSchema; exports.getSchemaVersion = _chunkKZT3YC62cjs.getSchemaVersion; exports.isNonRetryableError = _chunkKZT3YC62cjs.isNonRetryableError; exports.isValidTimeZoneId = _chunkKZT3YC62cjs.isValidTimeZoneId; exports.measurePushPayload = _chunkKZT3YC62cjs.measurePushPayload; exports.nextFutureOccurrence = _chunkKZT3YC62cjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkKZT3YC62cjs.planNextOccurrence; exports.readRequestBody = _chunkKZT3YC62cjs.readRequestBody; exports.runScheduledTick = _chunkKZT3YC62cjs.runScheduledTick; exports.runTask = _chunkKZT3YC62cjs.runTask; exports.summarizeErrorCause = _chunkKZT3YC62cjs.summarizeErrorCause;

package/dist/cloudflare.mjs

@@ -27,7 +27,7 @@ import {
   runScheduledTick,
   runTask,
   summarizeErrorCause
-} from "./chunk-PG54W6B5.mjs";
+} from "./chunk-INNZZFGJ.mjs";
 import "./chunk-GN44PST5.mjs";
 export {
   DEFAULT_MAX_DELIVERY_RETRIES,

package/dist/index.cjs

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

package/dist/index.mjs

@@ -72,7 +72,7 @@ import {
   validateLlmMessagesArray,
   validateScheduleMessagePayload,
   validateSplitPattern
-} from "./chunk-PG54W6B5.mjs";
+} from "./chunk-INNZZFGJ.mjs";
 import "./chunk-GN44PST5.mjs";
 
 // src/server/adapters/factory.js

package/package.json

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