@rei-standard/amsg-server 2.6.0-next.11 → 2.6.0-next.13

package/dist/cloudflare.cjs

@@ -17,7 +17,7 @@
 
 
 
-var _chunkQGJSWMQPcjs = require('./chunk-QGJSWMQP.cjs');
+var _chunk5IOYCCFDcjs = require('./chunk-5IOYCCFD.cjs');
 
 
 
@@ -37,4 +37,4 @@ var _chunkQGJSWMQPcjs = require('./chunk-QGJSWMQP.cjs');
 
 
 
-exports.MAX_PUSH_PAYLOAD_BYTES = _chunkQGJSWMQPcjs.MAX_PUSH_PAYLOAD_BYTES; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkQGJSWMQPcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkQGJSWMQPcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkQGJSWMQPcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkQGJSWMQPcjs.advanceOccurrence; exports.createD1Adapter = _chunkQGJSWMQPcjs.createD1Adapter; exports.createSingleUserCloudflareWorker = _chunkQGJSWMQPcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkQGJSWMQPcjs.createSingleUserServer; exports.createWebCryptoWebPush = _chunkQGJSWMQPcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkQGJSWMQPcjs.decryptFromStorage; exports.decryptPayload = _chunkQGJSWMQPcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkQGJSWMQPcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkQGJSWMQPcjs.encryptForStorage; exports.isValidTimeZoneId = _chunkQGJSWMQPcjs.isValidTimeZoneId; exports.measurePushPayload = _chunkQGJSWMQPcjs.measurePushPayload; exports.nextFutureOccurrence = _chunkQGJSWMQPcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkQGJSWMQPcjs.planNextOccurrence; exports.runScheduledTick = _chunkQGJSWMQPcjs.runScheduledTick;
+exports.MAX_PUSH_PAYLOAD_BYTES = _chunk5IOYCCFDcjs.MAX_PUSH_PAYLOAD_BYTES; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunk5IOYCCFDcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunk5IOYCCFDcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunk5IOYCCFDcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunk5IOYCCFDcjs.advanceOccurrence; exports.createD1Adapter = _chunk5IOYCCFDcjs.createD1Adapter; exports.createSingleUserCloudflareWorker = _chunk5IOYCCFDcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunk5IOYCCFDcjs.createSingleUserServer; exports.createWebCryptoWebPush = _chunk5IOYCCFDcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunk5IOYCCFDcjs.decryptFromStorage; exports.decryptPayload = _chunk5IOYCCFDcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunk5IOYCCFDcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunk5IOYCCFDcjs.encryptForStorage; exports.isValidTimeZoneId = _chunk5IOYCCFDcjs.isValidTimeZoneId; exports.measurePushPayload = _chunk5IOYCCFDcjs.measurePushPayload; exports.nextFutureOccurrence = _chunk5IOYCCFDcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunk5IOYCCFDcjs.planNextOccurrence; exports.runScheduledTick = _chunk5IOYCCFDcjs.runScheduledTick;

package/dist/cloudflare.mjs

@@ -17,7 +17,7 @@ import {
   nextFutureOccurrence,
   planNextOccurrence,
   runScheduledTick
-} from "./chunk-HZDUURIR.mjs";
+} from "./chunk-TV7N3RTH.mjs";
 export {
   MAX_PUSH_PAYLOAD_BYTES,
   PUSH_ENVELOPE_RESERVED_BYTES,

package/dist/handlers/get-message.d.ts

@@ -0,0 +1,3 @@
+export function createGetMessageHandler(ctx: any): {
+    GET: (url: any, headers: any) => Promise<any>;
+};

package/dist/index.cjs

@@ -38,7 +38,8 @@
 
 
 
-var _chunkQGJSWMQPcjs = require('./chunk-QGJSWMQP.cjs');
+
+var _chunk5IOYCCFDcjs = require('./chunk-5IOYCCFD.cjs');
 
 // src/server/adapters/factory.js
 async function createAdapter(config) {
@@ -54,11 +55,11 @@ async function createAdapter(config) {
   }
   switch (config.driver) {
     case "neon": {
-      const { NeonAdapter } = await Promise.resolve().then(() => _interopRequireWildcard(require("./neon-2CS4TLNS.cjs")));
+      const { NeonAdapter } = await Promise.resolve().then(() => _interopRequireWildcard(require("./neon-3ASBLLCM.cjs")));
       return new NeonAdapter(config.connectionString);
     }
     case "pg": {
-      const { PgAdapter } = await Promise.resolve().then(() => _interopRequireWildcard(require("./pg-PM5RYRWH.cjs")));
+      const { PgAdapter } = await Promise.resolve().then(() => _interopRequireWildcard(require("./pg-IEZTAR43.cjs")));
       return new PgAdapter(config.connectionString);
     }
     default:
@@ -71,7 +72,7 @@ async function createAdapter(config) {
 // src/server/handlers/init-tenant.js
 function createInitTenantHandler(ctx) {
   async function POST(headers, body) {
-    const initSecret = _chunkQGJSWMQPcjs.getHeader.call(void 0, headers, "x-init-secret");
+    const initSecret = _chunk5IOYCCFDcjs.getHeader.call(void 0, headers, "x-init-secret");
     if (ctx.tenant.initSecret && initSecret !== ctx.tenant.initSecret) {
       return {
         status: 401,
@@ -84,7 +85,7 @@ function createInitTenantHandler(ctx) {
         }
       };
     }
-    const parsed = _chunkQGJSWMQPcjs.parseJsonBody.call(void 0, body);
+    const parsed = _chunk5IOYCCFDcjs.parseJsonBody.call(void 0, body);
     if (!parsed.ok) {
       return {
         status: 400,
@@ -98,7 +99,7 @@ function createInitTenantHandler(ctx) {
     const tenantId = payload.tenantId || void 0;
     const driver = payload.driver;
     const databaseUrl = payload.databaseUrl || payload.connectionString;
-    if (tenantId && !_chunkQGJSWMQPcjs.isValidUUIDv4.call(void 0, tenantId)) {
+    if (tenantId && !_chunk5IOYCCFDcjs.isValidUUIDv4.call(void 0, tenantId)) {
       return {
         status: 400,
         body: {
@@ -218,7 +219,7 @@ function createSendNotificationsHandler(ctx) {
         }
       };
     }
-    const data = await _chunkQGJSWMQPcjs.runScheduledTick.call(void 0, { ...ctx, db, masterKey });
+    const data = await _chunk5IOYCCFDcjs.runScheduledTick.call(void 0, { ...ctx, db, masterKey });
     return { status: 200, body: { success: true, data } };
   }
   return { POST };
@@ -325,7 +326,7 @@ function createTenantBlobStore(options) {
 // src/server/tenant/token.js
 
 function sign(input, secret) {
-  return _chunkQGJSWMQPcjs.bytesToBase64Url.call(void 0, _crypto.createHmac.call(void 0, "sha256", secret).update(input).digest());
+  return _chunk5IOYCCFDcjs.bytesToBase64Url.call(void 0, _crypto.createHmac.call(void 0, "sha256", secret).update(input).digest());
 }
 function nowEpochSeconds() {
   return Math.floor(Date.now() / 1e3);
@@ -341,8 +342,8 @@ function createTenantToken(params, secret) {
     v: 1
   };
   const header = { alg: "HS256", typ: "JWT" };
-  const encodedHeader = _chunkQGJSWMQPcjs.bytesToBase64Url.call(void 0, _chunkQGJSWMQPcjs.utf8.call(void 0, JSON.stringify(header)));
-  const encodedPayload = _chunkQGJSWMQPcjs.bytesToBase64Url.call(void 0, _chunkQGJSWMQPcjs.utf8.call(void 0, JSON.stringify(payload)));
+  const encodedHeader = _chunk5IOYCCFDcjs.bytesToBase64Url.call(void 0, _chunk5IOYCCFDcjs.utf8.call(void 0, JSON.stringify(header)));
+  const encodedPayload = _chunk5IOYCCFDcjs.bytesToBase64Url.call(void 0, _chunk5IOYCCFDcjs.utf8.call(void 0, JSON.stringify(payload)));
   const signingInput = `${encodedHeader}.${encodedPayload}`;
   const signature = sign(signingInput, secret);
   return `${signingInput}.${signature}`;
@@ -361,17 +362,17 @@ function verifyTenantToken(token, secret, options = {}) {
   let receivedBytes;
   let expectedBytes;
   try {
-    receivedBytes = _chunkQGJSWMQPcjs.base64UrlToBytes.call(void 0, receivedSignature);
-    expectedBytes = _chunkQGJSWMQPcjs.base64UrlToBytes.call(void 0, expectedSignature);
+    receivedBytes = _chunk5IOYCCFDcjs.base64UrlToBytes.call(void 0, receivedSignature);
+    expectedBytes = _chunk5IOYCCFDcjs.base64UrlToBytes.call(void 0, expectedSignature);
   } catch (e) {
     throw new Error("INVALID_TENANT_AUTH");
   }
-  if (!_chunkQGJSWMQPcjs.timingSafeEqualBytes.call(void 0, receivedBytes, expectedBytes)) {
+  if (!_chunk5IOYCCFDcjs.timingSafeEqualBytes.call(void 0, receivedBytes, expectedBytes)) {
     throw new Error("INVALID_TENANT_AUTH");
   }
   let payload;
   try {
-    payload = JSON.parse(_chunkQGJSWMQPcjs.utf8Decode.call(void 0, _chunkQGJSWMQPcjs.base64UrlToBytes.call(void 0, encodedPayload)));
+    payload = JSON.parse(_chunk5IOYCCFDcjs.utf8Decode.call(void 0, _chunk5IOYCCFDcjs.base64UrlToBytes.call(void 0, encodedPayload)));
   } catch (e2) {
     throw new Error("INVALID_TENANT_AUTH");
   }
@@ -582,13 +583,14 @@ async function createReiServer(config) {
   return {
     handlers: {
       initTenant: createInitTenantHandler(ctx),
-      getUserKey: _chunkQGJSWMQPcjs.createGetUserKeyHandler.call(void 0, ctx),
-      scheduleMessage: _chunkQGJSWMQPcjs.createScheduleMessageHandler.call(void 0, ctx),
+      getUserKey: _chunk5IOYCCFDcjs.createGetUserKeyHandler.call(void 0, ctx),
+      scheduleMessage: _chunk5IOYCCFDcjs.createScheduleMessageHandler.call(void 0, ctx),
       sendNotifications: createSendNotificationsHandler(ctx),
-      updateMessage: _chunkQGJSWMQPcjs.createUpdateMessageHandler.call(void 0, ctx),
-      cancelMessage: _chunkQGJSWMQPcjs.createCancelMessageHandler.call(void 0, ctx),
-      messages: _chunkQGJSWMQPcjs.createMessagesHandler.call(void 0, ctx),
-      pushSubscription: _chunkQGJSWMQPcjs.createPushSubscriptionHandler.call(void 0, ctx)
+      updateMessage: _chunk5IOYCCFDcjs.createUpdateMessageHandler.call(void 0, ctx),
+      cancelMessage: _chunk5IOYCCFDcjs.createCancelMessageHandler.call(void 0, ctx),
+      messages: _chunk5IOYCCFDcjs.createMessagesHandler.call(void 0, ctx),
+      getMessage: _chunk5IOYCCFDcjs.createGetMessageHandler.call(void 0, ctx),
+      pushSubscription: _chunk5IOYCCFDcjs.createPushSubscriptionHandler.call(void 0, ctx)
     }
   };
 }
@@ -623,4 +625,4 @@ async function createReiServer(config) {
 
 
 
-exports.MAX_PUSH_PAYLOAD_BYTES = _chunkQGJSWMQPcjs.MAX_PUSH_PAYLOAD_BYTES; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunkQGJSWMQPcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunkQGJSWMQPcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunkQGJSWMQPcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunkQGJSWMQPcjs.advanceOccurrence; exports.createAdapter = createAdapter; exports.createD1Adapter = _chunkQGJSWMQPcjs.createD1Adapter; exports.createReiServer = createReiServer; exports.createSingleUserCloudflareWorker = _chunkQGJSWMQPcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunkQGJSWMQPcjs.createSingleUserServer; exports.createTenantToken = createTenantToken; exports.createWebCryptoWebPush = _chunkQGJSWMQPcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunkQGJSWMQPcjs.decryptFromStorage; exports.decryptPayload = _chunkQGJSWMQPcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunkQGJSWMQPcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunkQGJSWMQPcjs.encryptForStorage; exports.isValidISO8601 = _chunkQGJSWMQPcjs.isValidISO8601; exports.isValidTimeZoneId = _chunkQGJSWMQPcjs.isValidTimeZoneId; exports.isValidUUID = _chunkQGJSWMQPcjs.isValidUUID; exports.isValidUUIDv4 = _chunkQGJSWMQPcjs.isValidUUIDv4; exports.isValidUrl = _chunkQGJSWMQPcjs.isValidUrl; exports.measurePushPayload = _chunkQGJSWMQPcjs.measurePushPayload; exports.nextFutureOccurrence = _chunkQGJSWMQPcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunkQGJSWMQPcjs.planNextOccurrence; exports.runScheduledTick = _chunkQGJSWMQPcjs.runScheduledTick; exports.validateAvatarUrl = _chunkQGJSWMQPcjs.validateAvatarUrl; exports.validateLlmMessagesArray = _chunkQGJSWMQPcjs.validateLlmMessagesArray; exports.validateScheduleMessagePayload = _chunkQGJSWMQPcjs.validateScheduleMessagePayload; exports.validateSplitPattern = _chunkQGJSWMQPcjs.validateSplitPattern; exports.verifyTenantToken = verifyTenantToken;
+exports.MAX_PUSH_PAYLOAD_BYTES = _chunk5IOYCCFDcjs.MAX_PUSH_PAYLOAD_BYTES; exports.PUSH_ENVELOPE_RESERVED_BYTES = _chunk5IOYCCFDcjs.PUSH_ENVELOPE_RESERVED_BYTES; exports.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES = _chunk5IOYCCFDcjs.WEB_PUSH_ENCRYPTION_OVERHEAD_BYTES; exports.WEB_PUSH_MAX_BODY_BYTES = _chunk5IOYCCFDcjs.WEB_PUSH_MAX_BODY_BYTES; exports.advanceOccurrence = _chunk5IOYCCFDcjs.advanceOccurrence; exports.createAdapter = createAdapter; exports.createD1Adapter = _chunk5IOYCCFDcjs.createD1Adapter; exports.createReiServer = createReiServer; exports.createSingleUserCloudflareWorker = _chunk5IOYCCFDcjs.createSingleUserCloudflareWorker; exports.createSingleUserServer = _chunk5IOYCCFDcjs.createSingleUserServer; exports.createTenantToken = createTenantToken; exports.createWebCryptoWebPush = _chunk5IOYCCFDcjs.createWebCryptoWebPush; exports.decryptFromStorage = _chunk5IOYCCFDcjs.decryptFromStorage; exports.decryptPayload = _chunk5IOYCCFDcjs.decryptPayload; exports.deriveUserEncryptionKey = _chunk5IOYCCFDcjs.deriveUserEncryptionKey; exports.encryptForStorage = _chunk5IOYCCFDcjs.encryptForStorage; exports.isValidISO8601 = _chunk5IOYCCFDcjs.isValidISO8601; exports.isValidTimeZoneId = _chunk5IOYCCFDcjs.isValidTimeZoneId; exports.isValidUUID = _chunk5IOYCCFDcjs.isValidUUID; exports.isValidUUIDv4 = _chunk5IOYCCFDcjs.isValidUUIDv4; exports.isValidUrl = _chunk5IOYCCFDcjs.isValidUrl; exports.measurePushPayload = _chunk5IOYCCFDcjs.measurePushPayload; exports.nextFutureOccurrence = _chunk5IOYCCFDcjs.nextFutureOccurrence; exports.planNextOccurrence = _chunk5IOYCCFDcjs.planNextOccurrence; exports.runScheduledTick = _chunk5IOYCCFDcjs.runScheduledTick; exports.validateAvatarUrl = _chunk5IOYCCFDcjs.validateAvatarUrl; exports.validateLlmMessagesArray = _chunk5IOYCCFDcjs.validateLlmMessagesArray; exports.validateScheduleMessagePayload = _chunk5IOYCCFDcjs.validateScheduleMessagePayload; exports.validateSplitPattern = _chunk5IOYCCFDcjs.validateSplitPattern; exports.verifyTenantToken = verifyTenantToken;

package/dist/index.d.cts

@@ -28,6 +28,7 @@
  * @property {{ PUT: function }} updateMessage
  * @property {{ DELETE: function }} cancelMessage
  * @property {{ GET: function }} messages
+ * @property {{ GET: function }} getMessage
  * @property {{ PUT: function, GET: function, DELETE: function }} pushSubscription
  */
 /**
@@ -121,6 +122,9 @@ export type ReiHandlers = {
     messages: {
         GET: Function;
     };
+    getMessage: {
+        GET: Function;
+    };
     pushSubscription: {
         PUT: Function;
         GET: Function;

package/dist/index.d.ts

@@ -28,6 +28,7 @@
  * @property {{ PUT: function }} updateMessage
  * @property {{ DELETE: function }} cancelMessage
  * @property {{ GET: function }} messages
+ * @property {{ GET: function }} getMessage
  * @property {{ PUT: function, GET: function, DELETE: function }} pushSubscription
  */
 /**
@@ -121,6 +122,9 @@ export type ReiHandlers = {
     messages: {
         GET: Function;
     };
+    getMessage: {
+        GET: Function;
+    };
     pushSubscription: {
         PUT: Function;
         GET: Function;

package/dist/index.mjs

@@ -8,6 +8,7 @@ import {
   bytesToBase64Url,
   createCancelMessageHandler,
   createD1Adapter,
+  createGetMessageHandler,
   createGetUserKeyHandler,
   createMessagesHandler,
   createPushSubscriptionHandler,
@@ -38,7 +39,7 @@ import {
   validateLlmMessagesArray,
   validateScheduleMessagePayload,
   validateSplitPattern
-} from "./chunk-HZDUURIR.mjs";
+} from "./chunk-TV7N3RTH.mjs";
 
 // src/server/adapters/factory.js
 async function createAdapter(config) {
@@ -54,11 +55,11 @@ async function createAdapter(config) {
   }
   switch (config.driver) {
     case "neon": {
-      const { NeonAdapter } = await import("./neon-YUKD2B77.mjs");
+      const { NeonAdapter } = await import("./neon-CUIGAB2T.mjs");
       return new NeonAdapter(config.connectionString);
     }
     case "pg": {
-      const { PgAdapter } = await import("./pg-JNQ6VMXC.mjs");
+      const { PgAdapter } = await import("./pg-KMJPL6QV.mjs");
       return new PgAdapter(config.connectionString);
     }
     default:
@@ -588,6 +589,7 @@ async function createReiServer(config) {
       updateMessage: createUpdateMessageHandler(ctx),
       cancelMessage: createCancelMessageHandler(ctx),
       messages: createMessagesHandler(ctx),
+      getMessage: createGetMessageHandler(ctx),
       pushSubscription: createPushSubscriptionHandler(ctx)
     }
   };

package/dist/lib/agentic-fire.d.ts

@@ -32,6 +32,23 @@ export function occurrenceMsOf(task: {
  * @returns {boolean}
  */
 export function taskNeedsLlm(decryptedPayload: any): boolean;
+/**
+ * Frozen, credential-free view of the task for hook authors.
+ *
+ * nextSendAt 是这条任务原本的触发时刻。run-tick 领取任务时写的是 lease_until，
+ * next_send_at 那一列不动，所以这里给出去的和库里的是同一个值——宿主拿它当
+ * 时间锚点（窗口判断、缓存键）时对得上。
+ *
+ * 导出给 run-tick 用：`serializeBy` 要从任务内容里取分组 key，拿到的就该是
+ * 这一份（凭据剔掉、和 onBeforeFire 的 ctx.task 同一个形状），宿主不用为了
+ * 分组再学第二套字段。
+ */
+export function buildHookTask(task: any, decryptedPayload: any): Readonly<{
+    id: any;
+    uuid: any;
+    nextSendAt: any;
+    retryCount: any;
+}>;
 /**
  * Try the hook-driven fire path for one task.
  *
@@ -48,6 +65,9 @@ export function taskNeedsLlm(decryptedPayload: any): boolean;
  *   success handling as the post-LLM skip-push path.
  *   Failures (timeout / loop exceeded / config errors) throw — the caller's
  *   existing error handling turns them into task retry/failure.
+ *
+ *   收尾回执：onBeforeFire 一旦被调用，上面每一种结局（含抛错）都会调一次
+ *   `ctx.onFireSettled`，见 notifyFireSettled。
  */
 export function runAgenticFire({ task, decryptedPayload, userKey, ctx }: {
     task: import("../adapters/interface.js").TaskRow;

package/dist/lib/run-tick.d.ts

@@ -1,3 +1,17 @@
+/**
+ * 把宿主给的分组 key 变成落库用的分组标识。
+ *
+ * 不直接存 key 本身：它多半是角色 id / 联系人名这类宿主数据，而任务内容一律
+ * 加密落库，多开一列明文出口不合适。这里用该用户的存储密钥做 HMAC——同一个
+ * 用户的同一个 key 每次都得到同一个值（分组判定要的就是相等性），换个用户
+ * 得到的值必然不同（分组天然按用户隔开，SQL 那边不用再比 user_id），拿到数
+ * 据库也反推不回原 key。
+ *
+ * @param {string} userKey - 该用户的存储密钥（deriveUserEncryptionKey 的结果）
+ * @param {string} rawKey - serializeBy 返回的分组 key
+ * @returns {Promise<string>} 43 字符的 base64url 串（列宽 64 够放）
+ */
+export function deriveSerializeGroup(userKey: string, rawKey: string): Promise<string>;
 export function runScheduledTick(ctx: any): Promise<{
     totalTasks: any;
     successCount: number;
@@ -6,6 +20,7 @@ export function runScheduledTick(ctx: any): Promise<{
     executionTime: number;
     details: {
         claimSkippedTasks: number;
+        serializeSkippedTasks: number;
         deletedOnceOffTasks: number;
         updatedRecurringTasks: number;
         staleTasks: any[];

package/dist/lib/task-projection.d.ts

@@ -24,14 +24,23 @@
  * @property {string|null}  updatedAt
  * @property {string|null}  charId        - 取自 metadata.charId
  * @property {string|null}  clientTaskId  - 取自 metadata.amsgClientTaskId
+ * @property {Object|null}  [metadata]    - 只有 includeMetadata 时才有，见下
  * @property {{ at: string, occurrence: string, reason: string }|null} lastError
  */
 /**
  * @param {Object} row - 数据库任务行
  * @param {Object} decryptedPayload - 解密后的任务 payload
+ * @param {{ includeMetadata?: boolean }} [options]
+ *   includeMetadata 时多带一个完整的 `metadata`。列表接口不带：一页最多 100
+ *   条，每条都驮着宿主的整份 metadata 会把响应撑得很大，而列表要的只是「有哪
+ *   些任务」。要整份 metadata 的是另一件事——`PUT /update-message` 对 metadata
+ *   是整体替换，宿主想只改其中一个子字段就必须先读回完整的那份，那条路径走
+ *   `GET /message?id=<uuid>`（单条，带完整 metadata）。
  * @returns {TaskProjection}
  */
-export function projectTask(row: any, decryptedPayload: any): TaskProjection;
+export function projectTask(row: any, decryptedPayload: any, options?: {
+    includeMetadata?: boolean;
+}): TaskProjection;
 export type TaskProjection = {
     id: number | null;
     uuid: string | null;
@@ -56,6 +65,10 @@ export type TaskProjection = {
      * - 取自 metadata.amsgClientTaskId
      */
     clientTaskId: string | null;
+    /**
+     * - 只有 includeMetadata 时才有，见下
+     */
+    metadata?: any | null;
     lastError: {
         at: string;
         occurrence: string;

package/dist/{neon-2CS4TLNS.cjs → neon-3ASBLLCM.cjs}

@@ -6,7 +6,7 @@
 
 
 
-var _chunk4SIN2R66cjs = require('./chunk-4SIN2R66.cjs');
+var _chunkV2SDWGUBcjs = require('./chunk-V2SDWGUB.cjs');
 
 // src/server/adapters/neon.js
 var _serverless = require('@neondatabase/serverless');
@@ -25,13 +25,13 @@ var NeonAdapter = class {
   }
   async initSchema() {
     const sql = this._getSql();
-    await sql.query(_chunk4SIN2R66cjs.TABLE_SQL);
-    await sql.query(_chunk4SIN2R66cjs.PUSH_SUBSCRIPTION_TABLE_SQL);
-    for (const migration of _chunk4SIN2R66cjs.MIGRATIONS) {
+    await sql.query(_chunkV2SDWGUBcjs.TABLE_SQL);
+    await sql.query(_chunkV2SDWGUBcjs.PUSH_SUBSCRIPTION_TABLE_SQL);
+    for (const migration of _chunkV2SDWGUBcjs.MIGRATIONS) {
       await sql.query(migration.sql);
     }
     const indexResults = [];
-    for (const index of _chunk4SIN2R66cjs.INDEXES) {
+    for (const index of _chunkV2SDWGUBcjs.INDEXES) {
       try {
         await sql.query(index.sql);
         indexResults.push({
@@ -57,11 +57,11 @@ var NeonAdapter = class {
         `Critical index creation failed (${failedNames}). Please remove duplicate UUID rows and run initSchema again.`
       );
     }
-    const tableCheck = await sql.query(_chunk4SIN2R66cjs.VERIFY_TABLE_SQL);
+    const tableCheck = await sql.query(_chunkV2SDWGUBcjs.VERIFY_TABLE_SQL);
     if (tableCheck.length === 0) {
       throw new Error("Table creation verification failed");
     }
-    const columns = await sql.query(_chunk4SIN2R66cjs.COLUMNS_SQL);
+    const columns = await sql.query(_chunkV2SDWGUBcjs.COLUMNS_SQL);
     return {
       columnsCreated: columns.length,
       indexesCreated: indexResults.filter((r) => r.status === "success").length,
@@ -91,7 +91,7 @@ var NeonAdapter = class {
   async getTaskByUuid(uuid, userId) {
     const sql = this._getSql();
     const rows = await sql.query(
-      `SELECT id, user_id, uuid, encrypted_payload, message_type, next_send_at, status, retry_count
+      `SELECT id, user_id, uuid, encrypted_payload, message_type, next_send_at, status, retry_count, created_at, updated_at
        FROM scheduled_messages
        WHERE uuid = $1 AND user_id = $2 AND status = 'pending'
        LIMIT 1`,
@@ -116,7 +116,7 @@ var NeonAdapter = class {
     const values = [];
     let idx = 1;
     for (const [key, value] of Object.entries(updates)) {
-      if (!_chunk4SIN2R66cjs.UPDATABLE_COLUMNS.has(key)) {
+      if (!_chunkV2SDWGUBcjs.UPDATABLE_COLUMNS.has(key)) {
         throw new Error(`[amsg-server neon] rejected unknown update column: ${key}`);
       }
       sets.push(`${key} = $${idx}`);
@@ -138,7 +138,7 @@ var NeonAdapter = class {
     let idx = 2;
     if (extraFields) {
       for (const [key, value] of Object.entries(extraFields)) {
-        if (!_chunk4SIN2R66cjs.UPDATABLE_COLUMNS.has(key)) {
+        if (!_chunkV2SDWGUBcjs.UPDATABLE_COLUMNS.has(key)) {
           throw new Error(`[amsg-server neon] rejected unknown update column: ${key}`);
         }
         sets.push(`${key} = $${idx}`);
@@ -175,6 +175,7 @@ var NeonAdapter = class {
        FROM scheduled_messages
        WHERE status = 'pending' AND next_send_at <= NOW()
          AND (lease_until IS NULL OR lease_until <= NOW())
+         AND (retry_after IS NULL OR retry_after <= NOW())
        ORDER BY next_send_at ASC
        LIMIT $1`,
       [limit]
@@ -200,22 +201,43 @@ var NeonAdapter = class {
    * 比 next_send_at 时两边都截到毫秒：列是 timestamptz（微秒精度），驱动读
    * 出来是 JS Date（毫秒精度），原值送回去可能因为亚毫秒差对不上。
    *
+   * 带 serializeGroup 时多一道分组门：同一分组里已经有别的行拿着未到期的租
+   * 约，这条就领不走（同一分组同时只跑一条）。判定和写租约在同一条 UPDATE
+   * 里完成，「先查再占」的空档天然不存在。分组门只看租约，不看
+   * `retry_after`：等着重试的任务其实闲着，不该把同分组的其他任务一起堵住。
+   *
    * @param {number} taskId
    * @param {string|Date} expectedNextSendAt - 读这行时拿到的 next_send_at 原值
    * @param {string|Date} leaseUntil - 租期末尾
-   * @returns {Promise<boolean>} true = 领到了；false = 别人正拿着租约、排期被改过、或行已不是 pending
+   * @param {string|null} [serializeGroup] - 串行分组标识；空表示不参与分组串行
+   * @returns {Promise<boolean>} true = 领到了；false = 别人正拿着租约、同分组
+   *   有任务正在跑、排期被改过、或行已不是 pending
    */
-  async claimTask(taskId, expectedNextSendAt, leaseUntil) {
+  async claimTask(taskId, expectedNextSendAt, leaseUntil, serializeGroup = null) {
     const sql = this._getSql();
+    const grouped = typeof serializeGroup === "string" && serializeGroup.length > 0;
+    const params = [leaseUntil, taskId, expectedNextSendAt];
+    let setClause = "lease_until = $1, updated_at = NOW()";
+    let groupGuard = "";
+    if (grouped) {
+      params.push(serializeGroup);
+      setClause = "lease_until = $1, serialize_group = $4, updated_at = NOW()";
+      groupGuard = `
+          AND NOT EXISTS (
+            SELECT 1 FROM scheduled_messages busy
+             WHERE busy.serialize_group = $4 AND busy.id <> $2
+               AND busy.status = 'pending' AND busy.lease_until > NOW()
+          )`;
+    }
     const rows = await sql.query(
       `UPDATE scheduled_messages
-          SET lease_until = $1, updated_at = NOW()
+          SET ${setClause}
         WHERE id = $2 AND status = 'pending'
           AND date_trunc('milliseconds', next_send_at)
             = date_trunc('milliseconds', $3::timestamptz)
-          AND (lease_until IS NULL OR lease_until <= NOW())
+          AND (lease_until IS NULL OR lease_until <= NOW())${groupGuard}
        RETURNING id`,
-      [leaseUntil, taskId, expectedNextSendAt]
+      params
     );
     return rows.length > 0;
   }

package/dist/{neon-YUKD2B77.mjs → neon-CUIGAB2T.mjs}

@@ -6,7 +6,7 @@ import {
   TABLE_SQL,
   UPDATABLE_COLUMNS,
   VERIFY_TABLE_SQL
-} from "./chunk-WAFOSZL3.mjs";
+} from "./chunk-B2FDV7YK.mjs";
 
 // src/server/adapters/neon.js
 import { neon } from "@neondatabase/serverless";
@@ -91,7 +91,7 @@ var NeonAdapter = class {
   async getTaskByUuid(uuid, userId) {
     const sql = this._getSql();
     const rows = await sql.query(
-      `SELECT id, user_id, uuid, encrypted_payload, message_type, next_send_at, status, retry_count
+      `SELECT id, user_id, uuid, encrypted_payload, message_type, next_send_at, status, retry_count, created_at, updated_at
        FROM scheduled_messages
        WHERE uuid = $1 AND user_id = $2 AND status = 'pending'
        LIMIT 1`,
@@ -175,6 +175,7 @@ var NeonAdapter = class {
        FROM scheduled_messages
        WHERE status = 'pending' AND next_send_at <= NOW()
          AND (lease_until IS NULL OR lease_until <= NOW())
+         AND (retry_after IS NULL OR retry_after <= NOW())
        ORDER BY next_send_at ASC
        LIMIT $1`,
       [limit]
@@ -200,22 +201,43 @@ var NeonAdapter = class {
    * 比 next_send_at 时两边都截到毫秒：列是 timestamptz（微秒精度），驱动读
    * 出来是 JS Date（毫秒精度），原值送回去可能因为亚毫秒差对不上。
    *
+   * 带 serializeGroup 时多一道分组门：同一分组里已经有别的行拿着未到期的租
+   * 约，这条就领不走（同一分组同时只跑一条）。判定和写租约在同一条 UPDATE
+   * 里完成，「先查再占」的空档天然不存在。分组门只看租约，不看
+   * `retry_after`：等着重试的任务其实闲着，不该把同分组的其他任务一起堵住。
+   *
    * @param {number} taskId
    * @param {string|Date} expectedNextSendAt - 读这行时拿到的 next_send_at 原值
    * @param {string|Date} leaseUntil - 租期末尾
-   * @returns {Promise<boolean>} true = 领到了；false = 别人正拿着租约、排期被改过、或行已不是 pending
+   * @param {string|null} [serializeGroup] - 串行分组标识；空表示不参与分组串行
+   * @returns {Promise<boolean>} true = 领到了；false = 别人正拿着租约、同分组
+   *   有任务正在跑、排期被改过、或行已不是 pending
    */
-  async claimTask(taskId, expectedNextSendAt, leaseUntil) {
+  async claimTask(taskId, expectedNextSendAt, leaseUntil, serializeGroup = null) {
     const sql = this._getSql();
+    const grouped = typeof serializeGroup === "string" && serializeGroup.length > 0;
+    const params = [leaseUntil, taskId, expectedNextSendAt];
+    let setClause = "lease_until = $1, updated_at = NOW()";
+    let groupGuard = "";
+    if (grouped) {
+      params.push(serializeGroup);
+      setClause = "lease_until = $1, serialize_group = $4, updated_at = NOW()";
+      groupGuard = `
+          AND NOT EXISTS (
+            SELECT 1 FROM scheduled_messages busy
+             WHERE busy.serialize_group = $4 AND busy.id <> $2
+               AND busy.status = 'pending' AND busy.lease_until > NOW()
+          )`;
+    }
     const rows = await sql.query(
       `UPDATE scheduled_messages
-          SET lease_until = $1, updated_at = NOW()
+          SET ${setClause}
         WHERE id = $2 AND status = 'pending'
           AND date_trunc('milliseconds', next_send_at)
             = date_trunc('milliseconds', $3::timestamptz)
-          AND (lease_until IS NULL OR lease_until <= NOW())
+          AND (lease_until IS NULL OR lease_until <= NOW())${groupGuard}
        RETURNING id`,
-      [leaseUntil, taskId, expectedNextSendAt]
+      params
     );
     return rows.length > 0;
   }