weaver-work-cli 0.1.6 → 0.1.7

package/dist/shortcuts/{yimiaoban → im}/operations/msg-sync.js

@@ -1,40 +1,47 @@
-import { ymbValidationError } from '../errors.js';
-import { READ, schemaOf, ymbSuccess, } from './types.js';
-import { assertImOk, compact, formatFullTime, makeMinMaxIdByTm, minMsgId, parseMsg, parseTimeToSec, resolveAuthUid, str, todayRange, unwrapInner, } from './shared.js';
+import { imValidationError } from '../errors.js';
+import { READ, schemaOf, imSuccess, } from './types.js';
+import { assertImOk, clampTimeRangeTo7Days, compact, DEFAULT_PAGE_SIZE, formatFullTime, makeMinMaxIdByTm, paginationMeta, parseMsg, parseTimeToSec, pullPaged, rangeShrinkMeta, resolveAuthUid, sortMessagesNewestFirst, str, todayRange, unwrapInner, } from './shared.js';
 import { collapseNewlines, collectI18nIds, collectPersonIds, extractFiles, extractImgs, extractVideos, parseContent, senderName, } from './msg-parse.js';
 const MAX_MSG_ID = String((1n << 63n) - 1n);
-const DEFAULT_PAGE_SIZE = 20;
-const MAX_PAGE_SIZE = 50;
-/** 时间/最新/游标/显式 id 计算 start/end。 */
-function resolveStartEnd(args, fallback = {}) {
-    // 1) 显式 start/end 最高优先
-    if (args.start !== undefined && args.start !== null && args.start !== '') {
-        const start = String(args.start);
-        const end = args.end !== undefined && args.end !== null && args.end !== '' ? String(args.end) : '0';
-        return { start, end };
+/**
+ * 时间/最新/显式 id 计算 start/end（与源 skill 一致）：
+ *   1) 显式 start/end（群聊为 startId/endId）最高优先；
+ *   2) `latest:true` → 不限日期（无界区间，只拉一页）；
+ *   3) `from`/`to` 时间范围 → 时间转消息 id 区间，跨度 > 7 天自动收敛为最后 7 个自然日；
+ *   4) 缺省 → 当天（有界区间，自动循环翻页拉完）。
+ */
+function resolveRange(args, idKeys = { start: 'start', end: 'end' }) {
+    const explicitStart = args[idKeys.start];
+    const explicitEnd = args[idKeys.end];
+    if (explicitStart !== undefined && explicitStart !== null && explicitStart !== '') {
+        return {
+            start: String(explicitStart),
+            end: explicitEnd !== undefined && explicitEnd !== null && explicitEnd !== '' ? String(explicitEnd) : '0',
+            scope: 'explicit-id',
+            shrink: null,
+        };
     }
     if (args.latest === true) {
-        return { start: MAX_MSG_ID, end: '0' };
+        return { start: MAX_MSG_ID, end: '0', scope: 'latest', shrink: null };
     }
-    // 2) 时间范围
-    if ((args.from !== undefined && args.from !== null && args.from !== '')
-        || (args.to !== undefined && args.to !== null && args.to !== '')) {
-        const fromSec = parseTimeToSec(args.from, false);
-        const toSec = parseTimeToSec(args.to, true);
-        if (toSec > 0) {
-            const start = makeMinMaxIdByTm(toSec).max;
-            const end = fromSec > 0 ? makeMinMaxIdByTm(fromSec).min : '0';
-            return { start, end };
-        }
-        return { start: MAX_MSG_ID, end: '0' };
+    const hasFrom = args.from !== undefined && args.from !== null && args.from !== '';
+    const hasTo = args.to !== undefined && args.to !== null && args.to !== '';
+    if (hasFrom || hasTo) {
+        const clamp = clampTimeRangeTo7Days(parseTimeToSec(args.from, false), parseTimeToSec(args.to, true));
+        return {
+            start: clamp.toSec > 0 ? makeMinMaxIdByTm(clamp.toSec).max : MAX_MSG_ID,
+            end: clamp.fromSec > 0 ? makeMinMaxIdByTm(clamp.fromSec).min : '0',
+            scope: 'range',
+            shrink: clamp.shrunk ? clamp : null,
+        };
     }
-    // 3) 默认当天
     const range = todayRange();
-    const startTm = fallback.toSec || range.toSec;
-    const endTm = fallback.fromSec || range.fromSec;
-    if (startTm > 0)
-        return { start: makeMinMaxIdByTm(startTm).max, end: makeMinMaxIdByTm(endTm).min };
-    return { start: MAX_MSG_ID, end: '0' };
+    return {
+        start: makeMinMaxIdByTm(range.toSec).max,
+        end: makeMinMaxIdByTm(range.fromSec).min,
+        scope: 'today',
+        shrink: null,
+    };
 }
 function pageSizeOf(args) {
     const raw = args.num;
@@ -42,8 +49,8 @@ function pageSizeOf(args) {
         return DEFAULT_PAGE_SIZE;
     const n = Number(raw);
     if (!Number.isInteger(n) || n <= 0)
-        throw ymbValidationError('num_invalid', 'num 必须是正整数');
-    return Math.min(n, MAX_PAGE_SIZE);
+        throw imValidationError('num_invalid', 'num 必须是正整数');
+    return Math.min(n, 50);
 }
 /** `actionMsg.code=1303`（无聊天记录）时按成功空列表返回，并说明本次口径。 */
 function emptyPageNote(args) {
@@ -54,17 +61,6 @@ function emptyPageNote(args) {
         return '该时间范围内无消息记录';
     return '当天无消息（如需最新消息请传 latest:true，或指定 from/to 时间范围）';
 }
-/** 单页返回公共字段：`hasMore` + 下一页锚点 + 去重提示。 */
-function pageMeta(messages, args) {
-    const hasMore = messages.length >= pageSizeOf(args);
-    const nextStart = minMsgId(messages);
-    return {
-        hasMore,
-        ...(hasMore && nextStart
-            ? { nextStart, dedupeHint: '下一页 start 传 nextStart；服务端会重复返回该条（边界消息），请按 msgid 去重' }
-            : {}),
-    };
-}
 /** 富化消息列表：并行取 i18n + 人员姓名，逐条解析 content/sender/media。 */
 async function enrichMessages(rawRows, host, options = {}) {
     const rows = rawRows.filter(Boolean);
@@ -173,22 +169,22 @@ async function enrichMessages(rawRows, host, options = {}) {
     }
     return enriched;
 }
-/** 拉单聊消息（默认当天，单页，倒序）。 */
+/** 拉单聊消息（默认当天；有界区间自动循环翻页拉完）。 */
 const msgSyncSingle = {
-    name: 'yimiaoban.msg.sync.single',
+    name: 'im.msg.sync.single',
     resource: 'msg',
     method: 'msg.sync.single',
-    action: 'yimiaoban.msg.sync.single',
-    summary: '拉取与某人的单聊消息（倒序单页，默认当天；时间范围转消息 id 区间）',
+    action: 'im.msg.sync.single',
+    summary: '拉取与某人的单聊消息（倒序，默认当天；时间范围转消息 id 区间并自动翻页拉完）',
     capability: 'msg',
     risk: READ,
     inputSchema: schemaOf({
         fromUid: { type: 'string', pattern: '^\\d+$', description: '对方 uid（必填）' },
         fromCid: { type: 'string', pattern: '^\\d+$', description: '对方 cid（必填）' },
-        num: { type: 'integer', minimum: 1, maximum: 50, description: '单页数量（默认 20，最多 50）' },
-        latest: { type: 'boolean', description: '拉最新不限日期' },
-        from: { type: 'string', description: '起始时间（YYYY-MM-DD 或 YYYY-MM-DD HH:mm:ss 或 unix 秒）' },
-        to: { type: 'string', description: '结束时间' },
+        num: { type: 'integer', minimum: 1, maximum: 50, description: '每页数量（默认 50，最多 50）' },
+        latest: { type: 'boolean', description: '拉最新不限日期（无界区间，只拉一页）' },
+        from: { type: 'string', description: '起始时间（YYYY-MM-DD 或 YYYY-MM-DD HH:mm:ss 或 unix 秒）；跨度 > 7 天自动收敛为该范围最后 7 天' },
+        to: { type: 'string', description: '结束时间（同上）' },
         start: { type: 'string', description: '显式起始消息 id（最高优先）' },
         end: { type: 'string', description: '显式结束消息 id' },
         imgFormat: { type: 'string', enum: ['small', 'large', 'original'], description: '预览规格（默认 small）' },
@@ -197,63 +193,79 @@ const msgSyncSingle = {
         const fromUid = String(args.fromUid);
         const fromCid = String(args.fromCid);
         if (!fromUid || !fromCid || fromUid === '0' || fromCid === '0') {
-            throw ymbValidationError('id_invalid', 'fromUid/fromCid 必须非 0');
+            throw imValidationError('id_invalid', 'fromUid/fromCid 必须非 0');
         }
-        const { start, end } = resolveStartEnd(args);
-        const body = {
-            trans_id: 0,
-            dev: 4,
-            enc_type: 0,
-            datas: [{ from_cid: fromCid, from_uid: fromUid, start, end, max_num: pageSizeOf(args) }],
-        };
-        const res = await host.request({
-            method: 'POST',
-            path: '/api/em/msg/executeIm/msg/syncSingleMsg',
-            body,
-            operation: 'yimiaoban.msg.sync.single',
+        const { start, end, scope, shrink } = resolveRange(args);
+        const num = pageSizeOf(args);
+        // 有界区间（end != 0：时间范围/默认当天/显式 end）自动循环翻页拉完；无界区间（latest）只拉一页
+        const autoLoop = end !== '0';
+        let actCode = 0;
+        const pulled = await pullPaged({
+            num,
+            start,
+            end,
+            autoLoop,
+            requestOnePage: async (pageStart, pageEnd, maxNum) => {
+                const body = {
+                    trans_id: 0,
+                    dev: 4,
+                    enc_type: 0,
+                    datas: [{ from_cid: fromCid, from_uid: fromUid, start: pageStart, end: pageEnd, max_num: maxNum }],
+                };
+                const res = await host.request({
+                    method: 'POST',
+                    path: '/api/em/msg/executeIm/msg/syncSingleMsg',
+                    body,
+                    operation: 'im.msg.sync.single',
+                });
+                // 1303=无聊天记录：按成功空列表返回（与群聊口径一致），并说明本次口径
+                actCode = Number(res?.data?.actionMsg?.code ?? -1);
+                if (actCode === 1303)
+                    return [];
+                assertImOk(res, '拉取单聊消息');
+                const inner = unwrapInner(res);
+                const outerDatas = inner?.datas || [];
+                const rows = [];
+                for (const group of outerDatas) {
+                    const list = group?.datas || group?.data || [];
+                    if (Array.isArray(list))
+                        rows.push(...list);
+                }
+                return rows;
+            },
         });
-        const inner = unwrapInner(res);
-        const outerDatas = inner?.datas || [];
-        const rawRows = [];
-        for (const group of outerDatas) {
-            const list = group?.datas || group?.data || [];
-            if (Array.isArray(list))
-                rawRows.push(...list);
-        }
-        // 1303=无聊天记录：按成功空列表返回（与群聊口径一致），并说明本次口径
-        const actCode = Number(res?.data?.actionMsg?.code ?? -1);
-        if (actCode !== 1303)
-            assertImOk(res, '拉取单聊消息');
         const authUid = await resolveAuthUid(host);
-        const messages = await enrichMessages(rawRows, host, {
+        const messages = await enrichMessages(pulled.rows, host, {
             authUid,
             user: { cid: fromCid, uid: fromUid },
             imgFormat: args.imgFormat,
         });
-        return ymbSuccess('yimiaoban.msg.sync.single', {
+        sortMessagesNewestFirst(messages);
+        return imSuccess('im.msg.sync.single', {
             total: messages.length,
             messages,
-            range: { from: args.from, to: args.to, start, end },
-            ...pageMeta(messages, args),
+            range: { from: args.from, to: args.to, start, end, scope, autoPaged: autoLoop },
+            ...paginationMeta(pulled, num),
+            ...(shrink ? { rangeShrink: rangeShrinkMeta(shrink) } : {}),
             ...(actCode === 1303 ? { empty: true, emptyReason: emptyPageNote(args) } : {}),
         });
     },
 };
 /** 拉群聊消息。 */
 const msgSyncGroup = {
-    name: 'yimiaoban.msg.sync.group',
+    name: 'im.msg.sync.group',
     resource: 'msg',
     method: 'msg.sync.group',
-    action: 'yimiaoban.msg.sync.group',
-    summary: '拉取某群聊天消息（倒序单页，默认当天；type=0 必传）',
+    action: 'im.msg.sync.group',
+    summary: '拉取某群聊天消息（倒序，默认当天；有界区间自动翻页拉完；type=0 必传）',
     capability: 'msg',
     risk: READ,
     inputSchema: schemaOf({
         groupId: { type: 'string', pattern: '^\\d+$', description: '群 id（必填）' },
-        num: { type: 'integer', minimum: 1, maximum: 50, description: '单页数量（默认 20，最多 50）' },
-        latest: { type: 'boolean', description: '拉最新不限日期' },
-        from: { type: 'string', description: '起始时间' },
-        to: { type: 'string', description: '结束时间' },
+        num: { type: 'integer', minimum: 1, maximum: 50, description: '每页数量（默认 50，最多 50）' },
+        latest: { type: 'boolean', description: '拉最新不限日期（无界区间，只拉一页）' },
+        from: { type: 'string', description: '起始时间；跨度 > 7 天自动收敛为该范围最后 7 天' },
+        to: { type: 'string', description: '结束时间（同上）' },
         startId: { type: 'string', description: '显式起始消息 id（最高优先）' },
         endId: { type: 'string', description: '显式结束消息 id' },
         imgFormat: { type: 'string', enum: ['small', 'large', 'original'], description: '预览规格（默认 small）' },
@@ -261,60 +273,70 @@ const msgSyncGroup = {
     handler: async (args, { host }) => {
         const groupId = String(args.groupId);
         if (!groupId || groupId === '0')
-            throw ymbValidationError('id_invalid', 'groupId 必须非 0');
+            throw imValidationError('id_invalid', 'groupId 必须非 0');
         // 群聊显式 id flag 名为 startId/endId
-        const start = args.startId !== undefined && args.startId !== null && args.startId !== ''
-            ? String(args.startId)
-            : (args.latest === true ? MAX_MSG_ID : resolveStartEnd(args).start);
-        const end = args.endId !== undefined && args.endId !== null && args.endId !== ''
-            ? String(args.endId)
-            : '0';
-        const body = {
-            trans_id: 0,
-            dev: 4,
-            type: 0,
-            enc_type: 0,
-            datas: [{ group_id: groupId, start, end, max_num: pageSizeOf(args) }],
-        };
-        const res = await host.request({
-            method: 'POST',
-            path: '/api/em/msg/executeIm/chat/syncGroupMsg',
-            body,
-            operation: 'yimiaoban.msg.sync.group',
+        const { start, end, scope, shrink } = resolveRange(args, { start: 'startId', end: 'endId' });
+        const num = pageSizeOf(args);
+        const autoLoop = end !== '0';
+        let actCode = 0;
+        const pulled = await pullPaged({
+            num,
+            start,
+            end,
+            autoLoop,
+            requestOnePage: async (pageStart, pageEnd, maxNum) => {
+                const body = {
+                    trans_id: 0,
+                    dev: 4,
+                    type: 0,
+                    enc_type: 0,
+                    datas: [{ group_id: groupId, start: pageStart, end: pageEnd, max_num: maxNum }],
+                };
+                const res = await host.request({
+                    method: 'POST',
+                    path: '/api/em/msg/executeIm/chat/syncGroupMsg',
+                    body,
+                    operation: 'im.msg.sync.group',
+                });
+                actCode = Number(res?.data?.actionMsg?.code ?? -1);
+                if (actCode === 1303)
+                    return [];
+                assertImOk(res, '拉取群聊消息');
+                const inner = unwrapInner(res);
+                const outerDatas = inner?.datas || [];
+                const rows = [];
+                for (const group of outerDatas) {
+                    const list = group?.datas || group?.data || [];
+                    if (Array.isArray(list))
+                        rows.push(...list);
+                }
+                return rows;
+            },
         });
-        const inner = unwrapInner(res);
-        const outerDatas = inner?.datas || [];
-        const rawRows = [];
-        for (const group of outerDatas) {
-            const list = group?.datas || group?.data || [];
-            if (Array.isArray(list))
-                rawRows.push(...list);
-        }
-        const actCode = Number(res?.data?.actionMsg?.code ?? -1);
-        if (actCode !== 1303)
-            assertImOk(res, '拉取群聊消息');
         const authUid = await resolveAuthUid(host);
-        const messages = await enrichMessages(rawRows, host, {
+        const messages = await enrichMessages(pulled.rows, host, {
             authUid,
             groupId,
             imgFormat: args.imgFormat,
         });
-        return ymbSuccess('yimiaoban.msg.sync.group', {
+        sortMessagesNewestFirst(messages);
+        return imSuccess('im.msg.sync.group', {
             groupId,
             total: messages.length,
             messages,
-            range: { from: args.from, to: args.to, start, end },
-            ...pageMeta(messages, args),
+            range: { from: args.from, to: args.to, start, end, scope, autoPaged: autoLoop },
+            ...paginationMeta(pulled, num),
+            ...(shrink ? { rangeShrink: rangeShrinkMeta(shrink) } : {}),
             ...(actCode === 1303 ? { empty: true, emptyReason: emptyPageNote(args) } : {}),
         });
     },
 };
 /** 群置顶消息同步。 */
 const msgTopSync = {
-    name: 'yimiaoban.msg.top.sync',
+    name: 'im.msg.top.sync',
     resource: 'msg',
     method: 'msg.top.sync',
-    action: 'yimiaoban.msg.top.sync',
+    action: 'im.msg.top.sync',
     summary: '同步群置顶消息（摘要 + 消息内容）',
     capability: 'msg',
     risk: READ,
@@ -322,11 +344,12 @@ const msgTopSync = {
         groupId: { type: 'string', pattern: '^\\d+$', description: '群 id（必填）' },
         msgids: { type: 'array', items: { type: 'string' }, description: '仅同步指定消息 id（缺省=全部置顶）' },
         encType: { type: 'integer', enum: [0, 1, 2, 3], description: '加密类型（默认 0，不解密）' },
+        imgFormat: { type: 'string', enum: ['small', 'large', 'original'], description: '置顶消息内图片的预览规格（默认 small）' },
     }, { required: ['groupId'], description: '同步群置顶消息' }),
     handler: async (args, { host }) => {
         const groupId = String(args.groupId);
         if (!groupId || groupId === '0')
-            throw ymbValidationError('id_invalid', 'groupId 必须非 0');
+            throw imValidationError('id_invalid', 'groupId 必须非 0');
         const body = compact({
             group_id: groupId,
             enc_type: Number(args.encType ?? 0),
@@ -336,7 +359,7 @@ const msgTopSync = {
             method: 'POST',
             path: '/api/em/msg/executeIm/msg/syncGroupTopMsg',
             body,
-            operation: 'yimiaoban.msg.top.sync',
+            operation: 'im.msg.top.sync',
         });
         assertImOk(res, '同步置顶消息');
         const inner = unwrapInner(res);
@@ -356,7 +379,7 @@ const msgTopSync = {
             imgFormat: args.imgFormat,
             authUid: await resolveAuthUid(host),
         });
-        return ymbSuccess('yimiaoban.msg.top.sync', {
+        return imSuccess('im.msg.top.sync', {
             groupId,
             total: summary.length,
             infos: summary,
@@ -366,10 +389,10 @@ const msgTopSync = {
 };
 /** 单聊已读状态。 */
 const msgReadSingle = {
-    name: 'yimiaoban.msg.read.single',
+    name: 'im.msg.read.single',
     resource: 'msg',
     method: 'msg.read.single',
-    action: 'yimiaoban.msg.read.single',
+    action: 'im.msg.read.single',
     summary: '查询单聊消息阅读状态（msgids=自己发出 / recvMsgids=自己接收）',
     capability: 'msg',
     risk: READ,
@@ -383,7 +406,7 @@ const msgReadSingle = {
         const hasSent = Array.isArray(args.msgids) && args.msgids.length > 0;
         const hasRecv = Array.isArray(args.recvMsgids) && args.recvMsgids.length > 0;
         if (!hasSent && !hasRecv)
-            throw ymbValidationError('msgids_required', 'msgids / recvMsgids 至少其一');
+            throw imValidationError('msgids_required', 'msgids / recvMsgids 至少其一');
         const body = compact({
             data: {
                 trans_id: 0,
@@ -396,7 +419,7 @@ const msgReadSingle = {
             method: 'POST',
             path: '/api/em/msg/executeIm/msg/getSingleMsgReadStatus',
             body,
-            operation: 'yimiaoban.msg.read.single',
+            operation: 'im.msg.read.single',
         });
         assertImOk(res, '查询单聊阅读状态');
         const inner = unwrapInner(res);
@@ -410,15 +433,15 @@ const msgReadSingle = {
                 dev: d.dev,
             }))
             : [];
-        return ymbSuccess('yimiaoban.msg.read.single', { total: rows.length, items: rows });
+        return imSuccess('im.msg.read.single', { total: rows.length, items: rows });
     },
 };
 /** 群消息已读状态（未读数）。 */
 const msgReadGroup = {
-    name: 'yimiaoban.msg.read.group',
+    name: 'im.msg.read.group',
     resource: 'msg',
     method: 'msg.read.group',
-    action: 'yimiaoban.msg.read.group',
+    action: 'im.msg.read.group',
     summary: '查询群消息阅读状态汇总（每条消息已读/未读情况，原样输出）',
     capability: 'msg',
     risk: READ,
@@ -431,7 +454,7 @@ const msgReadGroup = {
         const hasSent = Array.isArray(args.msgids) && args.msgids.length > 0;
         const hasRecv = Array.isArray(args.recvMsgids) && args.recvMsgids.length > 0;
         if (!hasSent && !hasRecv)
-            throw ymbValidationError('msgids_required', 'msgids / recvMsgids 至少其一');
+            throw imValidationError('msgids_required', 'msgids / recvMsgids 至少其一');
         const body = compact({
             trans_id: 0,
             group_id: String(args.groupId),
@@ -442,11 +465,11 @@ const msgReadGroup = {
             method: 'POST',
             path: '/api/em/msg/executeIm/msg/getGroupMsgReadStatus',
             body,
-            operation: 'yimiaoban.msg.read.group',
+            operation: 'im.msg.read.group',
         });
         assertImOk(res, '查询群阅读状态');
         const inner = unwrapInner(res);
-        return ymbSuccess('yimiaoban.msg.read.group', {
+        return imSuccess('im.msg.read.group', {
             groupId: String(args.groupId),
             raw: Array.isArray(inner) ? inner : inner,
         });
@@ -454,10 +477,10 @@ const msgReadGroup = {
 };
 /** 群消息阅读状态详情（谁已读/未读）。 */
 const msgReadGroupDetail = {
-    name: 'yimiaoban.msg.read.group.detail',
+    name: 'im.msg.read.group.detail',
     resource: 'msg',
     method: 'msg.read.group.detail',
-    action: 'yimiaoban.msg.read.group.detail',
+    action: 'im.msg.read.group.detail',
     summary: '群消息阅读详情（unread/read count + 每人状态），支持分页',
     capability: 'msg',
     risk: READ,
@@ -481,7 +504,7 @@ const msgReadGroupDetail = {
             method: 'POST',
             path: '/api/em/msg/executeIm/group/syncGroupReadStatus',
             body,
-            operation: 'yimiaoban.msg.read.group.detail',
+            operation: 'im.msg.read.group.detail',
         });
         assertImOk(res, '同步群阅读详情');
         const inner = unwrapInner(res);
@@ -496,7 +519,7 @@ const msgReadGroupDetail = {
             dev: d.dev,
             time: formatFullTime(d.time),
         }));
-        return ymbSuccess('yimiaoban.msg.read.group.detail', {
+        return imSuccess('im.msg.read.group.detail', {
             groupId: String(args.groupId),
             msgid: String(args.msgid),
             unreadCount: inner?.unread_count,
@@ -516,4 +539,4 @@ export const msgReadOperations = [
     msgReadGroup,
     msgReadGroupDetail,
 ];
-export { enrichMessages, resolveStartEnd };
+export { enrichMessages, resolveRange };