weaver-work-cli 0.1.6 → 0.1.7

package/dist/shortcuts/{yimiaoban → im}/operations/session.js

@@ -1,10 +1,10 @@
-import { ymbValidationError } from '../errors.js';
-import { READ, schemaOf, ymbSuccess, } from './types.js';
-import { assertImOk, formatFullTime, parseMsg, resolveAuthUid, str, toUint, unwrapInner, } from './shared.js';
+import { imValidationError } from '../errors.js';
+import { READ, schemaOf, imSuccess, } from './types.js';
+import { assertImOk, clampTimeRangeTo7Days, DEFAULT_PAGE_SIZE, formatFullTime, makeMinMaxIdByTm, MAX_PAGE_SIZE, paginationMeta, parseTimeToSec, parseMsg, pullPaged, rangeShrinkMeta, resolveAuthUid, sortMessagesNewestFirst, str, todayRange, toUint, unwrapInner, } from './shared.js';
 import { collapseNewlines, escapePipe, 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;
+/** 会话列表（getSessionContext）默认每页 20 条（不参与消息类自动翻页）。 */
+const SESSION_DEFAULT_PAGE_SIZE = 20;
 /** 会话类型归类。 */
 export function sessionTypeName(type) {
     if ([1, 6, 9].includes(type))
@@ -17,10 +17,10 @@ export function sessionTypeName(type) {
 }
 /** 会话列表。 */
 const sessionList = {
-    name: 'yimiaoban.session.list',
+    name: 'im.session.list',
     resource: 'session',
     method: 'session.list',
-    action: 'yimiaoban.session.list',
+    action: 'im.session.list',
     summary: '拉取当前用户会话列表（单聊/群聊/系统消息，解析名称与副标题）',
     capability: 'session',
     risk: READ,
@@ -32,7 +32,7 @@ const sessionList = {
         around: { type: 'boolean', description: '附近语义（flag=0 且 up/down 各半）' },
     }, { description: '拉取会话列表' }),
     handler: async (args, { host }) => {
-        const num = Math.min(toUint(args.num, 'num') ?? DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE);
+        const num = Math.min(toUint(args.num, 'num') ?? SESSION_DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE);
         const flag = args.flag !== undefined ? Number(args.flag) : 2;
         const around = args.around === true;
         const curAnchor = args.msgid !== undefined && args.msgid !== '' ? String(args.msgid) : MAX_MSG_ID;
@@ -57,7 +57,7 @@ const sessionList = {
             method: 'POST',
             path: '/api/em/msg/executeIm/data/getSessionContext',
             body,
-            operation: 'yimiaoban.session.list',
+            operation: 'im.session.list',
         });
         assertImOk(res, '拉取会话列表');
         const inner = unwrapInner(res);
@@ -80,7 +80,7 @@ const sessionList = {
         }
         const [personMap, groupRes] = await Promise.all([
             host.resolveUsersByIds([...singleTargets.keys()]),
-            groupIds.size ? host.request({ method: 'POST', path: '/api/em/msg/executeIm/group/queryGroupInfo', body: { trans_id: 0, type: 0, mask: 0, group_id: [...groupIds], flag: 0 }, operation: 'yimiaoban.session.list.groups' }) : Promise.resolve(null),
+            groupIds.size ? host.request({ method: 'POST', path: '/api/em/msg/executeIm/group/queryGroupInfo', body: { trans_id: 0, type: 0, mask: 0, group_id: [...groupIds], flag: 0 }, operation: 'im.session.list.groups' }) : Promise.resolve(null),
         ]);
         const groupInfoMap = new Map();
         if (groupRes) {
@@ -95,7 +95,7 @@ const sessionList = {
                 method: 'POST',
                 path: '/api/em/msg/executeIm/system-msg/syncGroupType',
                 body: { gids: [...sysGroupIds], tids: [], lang: 'zh_CN', showdel: 1 },
-                operation: 'yimiaoban.session.list.sysgroups',
+                operation: 'im.session.list.sysgroups',
             });
             const sg = unwrapInner(sysRes)?.groups || [];
             for (const g of sg)
@@ -172,7 +172,7 @@ const sessionList = {
         const filterType = args.type !== undefined ? Number(args.type) : undefined;
         const filtered = filterType !== undefined ? rows.filter((r) => r.sessionType === filterType) : rows;
         const minLast = filtered.length ? filtered[filtered.length - 1].lastMsgid : '';
-        return ymbSuccess('yimiaoban.session.list', {
+        return imSuccess('im.session.list', {
             total: filtered.length,
             sessions: filtered,
             nextMsgid: minLast && BigInt(minLast) > 0n ? minLast : undefined,
@@ -183,10 +183,10 @@ const sessionList = {
 };
 /** 系统消息分组配置搜索。 */
 const sysmsgGroupSearch = {
-    name: 'yimiaoban.sysmsg.groupSearch',
+    name: 'im.sysmsg.groupSearch',
     resource: 'sysmsg',
     method: 'sysmsg.groupSearch',
-    action: 'yimiaoban.sysmsg.groupSearch',
+    action: 'im.sysmsg.groupSearch',
     summary: '按名称搜索系统消息分组/类型配置（供 querySysMsgInfo 使用）',
     capability: 'sysmsg',
     risk: READ,
@@ -208,7 +208,7 @@ const sysmsgGroupSearch = {
             method: 'POST',
             path: '/api/em/msg/executeIm/system-msg/searchSysMsgGroup',
             body,
-            operation: 'yimiaoban.sysmsg.groupSearch',
+            operation: 'im.sysmsg.groupSearch',
         });
         assertImOk(res, '搜索系统消息分组');
         const inner = unwrapInner(res);
@@ -226,15 +226,15 @@ const sysmsgGroupSearch = {
             i18nName: t.i18nName,
             state: t.state,
         }));
-        return ymbSuccess('yimiaoban.sysmsg.groupSearch', { groups, types, total: Math.max(groups.length, types.length) });
+        return imSuccess('im.sysmsg.groupSearch', { groups, types, total: Math.max(groups.length, types.length) });
     },
 };
 /** 系统消息分组/类型配置拉取。 */
 const sysmsgTypeSync = {
-    name: 'yimiaoban.sysmsg.typeSync',
+    name: 'im.sysmsg.typeSync',
     resource: 'sysmsg',
     method: 'sysmsg.typeSync',
-    action: 'yimiaoban.sysmsg.typeSync',
+    action: 'im.sysmsg.typeSync',
     summary: '按 gids/tids 拉取系统消息分组/类型配置',
     capability: 'sysmsg',
     risk: READ,
@@ -246,13 +246,13 @@ const sysmsgTypeSync = {
         const gids = Array.isArray(args.gids) ? args.gids.map((x) => Number(x)).filter((n) => Number.isInteger(n)) : [];
         const tids = Array.isArray(args.tids) ? args.tids.map((x) => Number(x)).filter((n) => Number.isInteger(n)) : [];
         if (!gids.length && !tids.length)
-            throw ymbValidationError('target_required', 'gids 与 tids 至少其一');
+            throw imValidationError('target_required', 'gids 与 tids 至少其一');
         const body = { gids, tids, lang: 'zh_CN', showdel: 1 };
         const res = await host.request({
             method: 'POST',
             path: '/api/em/msg/executeIm/system-msg/syncGroupType',
             body,
-            operation: 'yimiaoban.sysmsg.typeSync',
+            operation: 'im.sysmsg.typeSync',
         });
         assertImOk(res, '同步系统消息配置');
         const inner = unwrapInner(res);
@@ -271,80 +271,96 @@ const sysmsgTypeSync = {
             i18nName: t.i18nName,
             state: t.state,
         }));
-        return ymbSuccess('yimiaoban.sysmsg.typeSync', { groups, types });
+        return imSuccess('im.sysmsg.typeSync', { groups, types });
     },
 };
 /** 系统消息内容拉取。 */
 const sysmsgQuery = {
-    name: 'yimiaoban.sysmsg.query',
+    name: 'im.sysmsg.query',
     resource: 'sysmsg',
     method: 'sysmsg.query',
-    action: 'yimiaoban.sysmsg.query',
-    summary: '拉取系统消息（流程/任务/公文等），支持阅读维度/处理状态/时间范围/单页倒序',
+    action: 'im.sysmsg.query',
+    summary: '拉取系统消息（流程/任务/公文等），支持阅读维度/处理状态/时间范围，默认当天且有界区间自动翻页拉完',
     capability: 'sysmsg',
     risk: READ,
     inputSchema: schemaOf({
         group: { type: 'integer', minimum: 1, description: '系统分组 id' },
         type: { type: 'integer', description: '消息类型 id' },
-        num: { type: 'integer', minimum: 1, maximum: 50, description: '单页条数（默认 20）' },
+        num: { type: 'integer', minimum: 1, maximum: 50, description: '每页条数（默认 50，最多 50）' },
         flag: { type: 'integer', enum: [0, 1, 2], description: '0 不分(默认)/1 已读/2 未读' },
         deal: { type: 'integer', enum: [0, 1, 2], description: '0 全部(默认)/1 未处理/2 已处理' },
-        from: { type: 'string', description: '起始时间' },
-        to: { type: 'string', description: '结束时间' },
-        latest: { type: 'boolean', description: '拉最新不限日期' },
+        from: { type: 'string', description: '起始时间；跨度 > 7 天自动收敛为该范围最后 7 天' },
+        to: { type: 'string', description: '结束时间（同上）' },
+        latest: { type: 'boolean', description: '拉最新不限日期（无界区间，只拉一页）' },
         start: { type: 'string', description: '手动起始消息 id（最高优先）' },
         end: { type: 'string', description: '手动结束消息 id' },
     }, { required: ['group'], description: '拉取系统消息' }),
     handler: async (args, { host }) => {
         const group = toUint(args.group, 'group');
         if (group === undefined || group <= 0) {
-            throw ymbValidationError('group_required', 'group（系统消息分组 id，来自 sysmsg.groupSearch 或会话列表）必填且为正整数');
+            throw imValidationError('group_required', 'group（系统消息分组 id，来自 sysmsg.groupSearch 或会话列表）必填且为正整数');
         }
         const hasType = args.type !== undefined && args.type !== null && args.type !== '';
         const msgType = { group };
         if (hasType)
             msgType.type = toUint(args.type, 'type');
-        // start/end 计算
+        // start/end 计算（与源 skill 一致）：显式 start > 时间范围（跨度 > 7 天自动收敛）> latest > 默认当天
         let start = MAX_MSG_ID;
         let end = '0';
+        let scope = 'today';
+        let shrink = null;
         if (args.start !== undefined && args.start !== null && args.start !== '') {
             start = String(args.start);
             end = args.end !== undefined && args.end !== '' ? String(args.end) : '0';
+            scope = 'explicit-id';
+        }
+        else if (args.latest === true) {
+            scope = 'latest';
         }
-        else if (args.latest !== true && (args.from || args.to)) {
-            const fromSec = args.from ? parseTs(args.from, false) : 0;
-            const toSec = args.to ? parseTs(args.to, true) : 0;
-            if (toSec > 0)
-                start = idRange(toSec).max;
-            if (fromSec > 0)
-                end = idRange(fromSec).min;
+        else if (args.from || args.to) {
+            const clamp = clampTimeRangeTo7Days(parseTimeToSec(args.from, false), parseTimeToSec(args.to, true));
+            if (clamp.toSec > 0)
+                start = makeMinMaxIdByTm(clamp.toSec).max;
+            if (clamp.fromSec > 0)
+                end = makeMinMaxIdByTm(clamp.fromSec).min;
+            shrink = clamp.shrunk ? clamp : null;
+            scope = 'range';
         }
-        else if (args.latest !== true) {
+        else {
             // 默认当天
-            const now = new Date();
-            const from = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 0, 0, 0);
-            const to = new Date(now.getFullYear(), now.getMonth(), now.getDate(), 23, 59, 59);
-            start = idRange(Math.floor(to.getTime() / 1000)).max;
-            end = idRange(Math.floor(from.getTime() / 1000)).min;
+            const range = todayRange();
+            start = makeMinMaxIdByTm(range.toSec).max;
+            end = makeMinMaxIdByTm(range.fromSec).min;
         }
-        const num = Math.min(toUint(args.num, 'num') ?? 20, MAX_PAGE_SIZE);
-        const body = {
-            trans_id: 0,
-            dev: 4,
-            enc_type: 0,
-            flag: Number(args.flag ?? 0),
-            deal_status: Number(args.deal ?? 0),
-            datas: [{ msg_type: msgType, max_num: num, start, end }],
-        };
-        const res = await host.request({
-            method: 'POST',
-            path: '/api/em/msg/executeIm/system-msg/querySysMsgInfo',
-            body,
-            operation: 'yimiaoban.sysmsg.query',
+        const num = Math.min(toUint(args.num, 'num') ?? DEFAULT_PAGE_SIZE, MAX_PAGE_SIZE);
+        // 有界区间（end != 0：时间范围/默认当天/显式 end）自动循环翻页拉完；无界区间（latest）只拉一页
+        const autoLoop = end !== '0';
+        const pulled = await pullPaged({
+            num,
+            start,
+            end,
+            autoLoop,
+            requestOnePage: async (pageStart, pageEnd, maxNum) => {
+                const body = {
+                    trans_id: 0,
+                    dev: 4,
+                    enc_type: 0,
+                    flag: Number(args.flag ?? 0),
+                    deal_status: Number(args.deal ?? 0),
+                    datas: [{ msg_type: msgType, max_num: maxNum, start: pageStart, end: pageEnd }],
+                };
+                const res = await host.request({
+                    method: 'POST',
+                    path: '/api/em/msg/executeIm/system-msg/querySysMsgInfo',
+                    body,
+                    operation: 'im.sysmsg.query',
+                });
+                assertImOk(res, '拉取系统消息');
+                const inner = unwrapInner(res);
+                return Array.isArray(inner?.datas) ? inner.datas : [];
+            },
         });
-        assertImOk(res, '拉取系统消息');
-        const inner = unwrapInner(res);
-        const rawRows = inner?.datas || [];
+        const rawRows = pulled.rows;
         // 状态模式：查 group 配置的 sunread（1=处理状态 / 0=阅读状态）
         let dealMode = false;
         try {
@@ -352,7 +368,7 @@ const sysmsgQuery = {
                 method: 'POST',
                 path: '/api/em/msg/executeIm/system-msg/syncGroupType',
                 body: { gids: [group], tids: [], lang: 'zh_CN', showdel: 1 },
-                operation: 'yimiaoban.sysmsg.query.cfg',
+                operation: 'im.sysmsg.query.cfg',
             });
             const cfg = unwrapInner(cfgRes)?.groups?.[0];
             dealMode = Number(cfg?.sunread) === 1;
@@ -399,36 +415,19 @@ const sysmsgQuery = {
                 statusLabel,
             };
         });
-        return ymbSuccess('yimiaoban.sysmsg.query', {
+        sortMessagesNewestFirst(messages);
+        return imSuccess('im.sysmsg.query', {
             group,
             type: hasType ? Number(args.type) : undefined,
             dealMode,
             total: messages.length,
             messages,
-            start,
-            end,
-            hasMore: messages.length >= num,
+            range: { start, end, scope, autoPaged: autoLoop },
+            ...paginationMeta(pulled, num),
+            ...(shrink ? { rangeShrink: rangeShrinkMeta(shrink) } : {}),
         });
     },
 };
-function parseTs(value, isEnd) {
-    const s = String(value ?? '').trim();
-    if (/^\d{10}$/.test(s))
-        return Number(s);
-    const m = s.match(/^(\d{4})-(\d{1,2})-(\d{1,2})(?:[ T](\d{1,2}):(\d{1,2})(?::(\d{1,2}))?)?$/);
-    if (!m)
-        throw ymbValidationError('time_invalid', `无法解析时间参数: ${s}`);
-    const hh = m[4] !== undefined ? Number(m[4]) : (isEnd ? 23 : 0);
-    const mm = m[5] !== undefined ? Number(m[5]) : (isEnd ? 59 : 0);
-    const ss = m[6] !== undefined ? Number(m[6]) : (isEnd ? 59 : 0);
-    return Math.floor(new Date(Number(m[1]), Number(m[2]) - 1, Number(m[3]), hh, mm, ss).getTime() / 1000);
-}
-function idRange(tmSec) {
-    if (!tmSec || tmSec <= 0)
-        return { min: '0', max: '0' };
-    const base = BigInt(Math.floor(tmSec)) * 1000000000n;
-    return { min: base.toString(), max: (base + 999999999n).toString() };
-}
 export const sessionOperations = [
     sessionList,
     sysmsgGroupSearch,