weaver-work-cli 0.1.21 → 0.1.23

package/dist/shortcuts/invoice/host.js

@@ -135,10 +135,11 @@ export function createInvoiceHost(ctx, dependencies = {}) {
         if (typeof token !== 'string' || !token.trim()) {
             throw invoiceAuthError('invoice_token_missing', '未取得业票通业务 Token');
         }
-        const saved = await tokenStore.save(token);
-        if (!saved) {
-            throw invoiceAuthError('invoice_token_cache_failed', '发票 Token 安全缓存写入失败，已停止业务请求');
-        }
+        // Headless Web/Linux hosts may not provide a system keyring (for example,
+        // Secret Service over D-Bus). Persistence is only an optimization: keep
+        // the token in this process so the current business request can proceed,
+        // without falling back to an insecure plaintext cache.
+        await tokenStore.save(token);
         invoiceToken = token;
         return token;
     }

package/dist/shortcuts/meeting/operations/change.js

@@ -1,7 +1,7 @@
 import { createHash } from 'node:crypto';
 import { meetingConfirmationError, meetingPartialError, meetingValidationError } from '../errors.js';
 import { meetingSuccess, SCHEMA_DATETIME_MINUTE, SCHEMA_ID } from './types.js';
-import { assertDateTimeMinute, extractRows, toIdCsv, toIdString } from './shared.js';
+import { assertDateTimeMinute, extractRows, mergeSnapshot, toIdCsv, toIdString } from './shared.js';
 const CONTINUATION_TTL_SECONDS = 600;
 const LIST_PATH = '/api/meeting/search/getMeetingList';
 function fingerprint(value) {
@@ -202,15 +202,18 @@ const meetingChangeApply = {
             caller: SCHEMA_ID,
             contacter: SCHEMA_ID,
         },
-        required: ['confirm', 'continuation', 'id'],
+        required: ['confirm', 'continuation'],
     },
     handler: async (args, env) => {
         requireConfirm(args, 'meeting.change.apply');
         const lease = await verifyLease(args, 'meeting.change.apply', env);
-        const body = normalizeChangeInput(args);
+        // 只传 confirm+continuation 时用 prepare 快照（含 prepare 时算好的 id / 字段）；
+        // 传入字段则覆盖快照，仍由 fingerprint 决定是否 target_changed。
+        const merged = mergeSnapshot(lease.payload, args);
+        const { operateType: leaseOperateType, ...mergedBody } = merged;
+        const body = normalizeChangeInput(mergedBody);
         const id = String(body.id);
         const { operateType, mtStatus } = await resolveOperateType(id, env, 'meeting.change.apply');
-        const leaseOperateType = lease.payload?.operateType;
         if (leaseOperateType && leaseOperateType !== operateType) {
             throw meetingValidationError('target_changed', `会议状态已变化（prepare 时按 ${leaseOperateType}、当前按 ${operateType}，当前状态：${mtStatus}），请重新执行 prepare 并向用户确认`);
         }

package/dist/shortcuts/meeting/operations/create.js

@@ -1,7 +1,7 @@
 import { createHash } from 'node:crypto';
 import { meetingConflictError, meetingConfirmationError, meetingPartialError, meetingValidationError } from '../errors.js';
 import { meetingSuccess, SCHEMA_DATETIME_MINUTE, SCHEMA_ID } from './types.js';
-import { assertDateTimeMinute, extractConflict, toIdCsv, toIdString, } from './shared.js';
+import { assertDateTimeMinute, extractConflict, mergeSnapshot, toIdCsv, toIdString, } from './shared.js';
 const CONTINUATION_TTL_SECONDS = 600;
 function fingerprint(value) {
     return createHash('sha256').update(JSON.stringify(value ?? null)).digest('hex').slice(0, 32);
@@ -309,13 +309,15 @@ const meetingCreateApply = {
             repeatDesc: { type: 'string' },
             serviceItems: { type: 'string' },
         },
-        required: ['confirm', 'continuation', 'name', 'beginDatetime', 'endDatetime'],
+        required: ['confirm', 'continuation'],
     },
     handler: async (args, env) => {
         requireConfirm(args, 'meeting.create.apply');
         const lease = await verifyLease(args, 'meeting.create.apply', env);
         const session = await env.host.getSession();
-        const body = normalizeCreateInput(args, session.userId);
+        // 只传 confirm+continuation 时用 prepare 快照（用户已确认的内容）；传入其它字段则作为覆盖，
+        // 由下面的 fingerprint 校验决定是否 target_changed。
+        const body = normalizeCreateInput(mergeSnapshot(lease.payload, args), session.userId);
         if (lease.fingerprint !== fingerprint(body)) {
             throw meetingValidationError('target_changed', '会议内容与 prepare 时的快照不一致，请重新执行 prepare');
         }

package/dist/shortcuts/meeting/operations/eb/association.js

@@ -0,0 +1,151 @@
+/**
+ * EB 建会后的**关联数据补建**（占用 / 回执 / 签到）。
+ *
+ * 为什么必须补（2026-09-21 真机确认，应用设置 `open_mt_approve=0` + `only_flow_create=0`）：
+ * eBuilder 的**自定义接口** `create_meeting` 只写会议主表，**不会**像页面建会那样
+ * 自动生成占用视图 / 回执 / 签到记录；而这三样恰好是后续能力的硬依赖：
+ *
+ * - 没有**占用**（roomusage）⇒ 会议室冲突检测（`query_roomusage_list`）查不到这场会，
+ *   以后别人在同一时段订同一间会议室不会被拦住；
+ * - 没有**回执**（receipt）⇒ 参会人冲突检测（以回执表 member_id 为准）对本场会议失效；
+ * - 没有**签到**记录（sign）⇒ `meeting.eb.sign.mark`（补签）报「未找到签到记录」。
+ *
+ * 因此建会成功后由本模块按「会议 + 参会人」逐条补齐，语义与页面建会一致。
+ *
+ * 失败语义（重要）：主写入（建会）**已经成功**，这里任何一步失败都**不抛错**，
+ * 只把失败原因汇总进 `warnings` 并标明后果 —— 否则调用方会以为建会失败而重试，导致重复建会。
+ */
+import { EB_BASE, ebBusinessSuccess, normalizeEbWrite, writeBody } from './factory.js';
+import { EB_ENDPOINTS } from './catalog.js';
+/** 只在建会后补建关联数据；其他写操作直接跳过。 */
+const CREATE_MEETING_PK = 'create_meeting';
+/** 回执人员类型：1 = 参会人员（参会人冲突检测只统计该类型）。 */
+const MEMBER_TYPE_ATTENDEE = '1';
+function requireEndpoint(interfacePk) {
+    const endpoint = EB_ENDPOINTS.find((item) => item.interfacePk === interfacePk);
+    if (!endpoint)
+        throw new Error(`EB catalog 缺少 ${interfacePk}，请检查 catalog.ts 声明`);
+    return endpoint;
+}
+/** 逗号分隔 id 串（`hrm_members` 等）→ 去重去空后的数组。 */
+function splitIds(value) {
+    if (value === undefined || value === null)
+        return [];
+    const text = String(value).trim();
+    if (text === '')
+        return [];
+    const seen = new Set();
+    for (const part of text.split(',')) {
+        const id = part.trim();
+        if (id !== '')
+            seen.add(id);
+    }
+    return [...seen];
+}
+function errorText(error) {
+    return error instanceof Error ? error.message : String(error);
+}
+/**
+ * 单条 EB 写入。**不抛错**：返回失败原因交由调用方汇总（主写入已成功，不可中断）。
+ * 复用 `normalizeEbWrite` 以保证字段白名单 / 必填 / 日期格式与手动调用完全一致。
+ */
+async function writeOne(env, interfacePk, args) {
+    try {
+        const session = await env.host.getSession();
+        const payload = normalizeEbWrite(requireEndpoint(interfacePk), args, session.userId);
+        const response = await env.host.request({
+            method: 'POST',
+            path: `${EB_BASE}/saveFormData/${interfacePk}`,
+            operation: 'meeting.eb.meeting.create.apply',
+            body: writeBody(session.userId, payload),
+            acceptBusiness: ebBusinessSuccess,
+        });
+        if (response?.datajson?.status === false) {
+            return { ok: false, error: `${interfacePk} 返回 status=false` };
+        }
+        return { ok: true };
+    }
+    catch (error) {
+        return { ok: false, error: `${interfacePk}: ${errorText(error)}` };
+    }
+}
+export const ebMeetingAssociation = async (ctx) => {
+    if (ctx.endpoint.interfacePk !== CREATE_MEETING_PK)
+        return undefined;
+    const mtId = ctx.dataIds[0];
+    if (!mtId) {
+        return {
+            status: 'SKIPPED',
+            reason: 'create_meeting 未返回会议 id，无法补建占用/回执/签到，请到会议详情页确认。',
+        };
+    }
+    const main = ctx.payload.mainTable;
+    const warnings = [];
+    const created = {};
+    // ① 会议室占用：仅在指定了会议室时写入。
+    const address = main.address === undefined || main.address === null ? '' : String(main.address).trim();
+    if (address === '') {
+        warnings.push('会议未指定会议室（address），已跳过占用写入。');
+    }
+    else {
+        const result = await writeOne(ctx.env, 'create_roomusage', {
+            mt_id: mtId,
+            room_id: address,
+            startdate: main.begin_datetime,
+            enddate: main.end_datetime,
+        });
+        if (result.ok)
+            created.roomUsage = [address];
+        else {
+            warnings.push(`会议室占用写入失败（${result.error}）：该会议不会被会议室冲突检测识别，`
+                + '建议到会议详情页确认，或按需重新创建占用。');
+        }
+    }
+    // ② 回执 + ③ 签到：按 hrm_members 逐人补齐。
+    const members = splitIds(main.hrm_members);
+    if (members.length === 0) {
+        warnings.push('会议未提供具体参会人员（hrm_members 为空），已跳过回执与签到写入：'
+            + '参会人冲突检测与签到/补签都依赖这些记录；若通过 org_members 指定了部门，本 CLI 不展开部门成员，'
+            + '请到会议详情页确认参会人后按需补建。');
+    }
+    else {
+        const receiptFailed = [];
+        const signFailed = [];
+        for (const memberId of members) {
+            const receipt = await writeOne(ctx.env, 'create_meeting_receipt', {
+                mt_id: mtId,
+                member_type: MEMBER_TYPE_ATTENDEE,
+                member_id: memberId,
+                member_manager: memberId,
+            });
+            if (receipt.ok)
+                (created.receipt ??= []).push(memberId);
+            else
+                receiptFailed.push(`${memberId}（${receipt.error}）`);
+            const sign = await writeOne(ctx.env, 'create_meeting_sign', {
+                mt_id: mtId,
+                user_id: memberId,
+            });
+            if (sign.ok)
+                (created.sign ??= []).push(memberId);
+            else
+                signFailed.push(`${memberId}（${sign.error}）`);
+        }
+        if (receiptFailed.length > 0) {
+            warnings.push(`回执写入失败 ${receiptFailed.length}/${members.length} 人：${receiptFailed.join('、')}。`
+                + '参会人冲突检测以回执表为准，缺失将导致该会议的参会人冲突漏检。');
+        }
+        if (signFailed.length > 0) {
+            warnings.push(`签到记录写入失败 ${signFailed.length}/${members.length} 人：${signFailed.join('、')}。`
+                + '这些人将无法通过 meeting.eb.sign.mark 补签（无签到记录可定位）。');
+        }
+    }
+    return {
+        status: warnings.length === 0 ? 'COMPLETE' : 'PARTIAL',
+        mtId,
+        created,
+        ...(warnings.length > 0 ? { warnings } : {}),
+        note: 'eBuilder 自定义接口 create_meeting 不会像页面建会那样自动生成占用/回执/签到，'
+            + '本步骤由 CLI 按「会议 + 参会人」补齐，供会议室/参会人冲突检测与签到补签使用。',
+    };
+};

package/dist/shortcuts/meeting/operations/eb/attendance-summary.js

@@ -0,0 +1,153 @@
+/**
+ * 签到 / 回执列表的**出席情况汇总**（供 `meeting.eb.sign.list` 与 `meeting.eb.receipt.list`
+ * 声明式挂载，见 catalog 的 `summarizeRows`）。机制与 `task-progress.ts` 一致：
+ * 只**增**一个 `data.progress` 字段，原始 `rows` 原样返回。
+ *
+ * 真机确立的取值口径（2026-09-21/22，实现前务必看清）：
+ * - `is_sign` / `attend_status` 回的是**数字字符串**（`"1"` / `""`），不是中文渲染值；
+ * - **"未签到 / 未回执" = 空字符串**，而 `is_sign="0"` 是**缺席**（是"已表态"而非"没签"）——
+ *   两者语义不同，混在一起会得出错误的出席率；
+ * - `sign_out_status`：`0` 已签退 / `1` 未签退 / `2` 早退 / 空 = 未签到；
+ * - ⚠️ **两张表的 `mt_id` 语义不同**：签到表回的是**会议名称文本**，回执表回的是**会议 id** ——
+ *   故汇总里统一命名为 `mtRef`（原样透出），不硬称为 id 或 name。
+ */
+function toText(value) {
+    return value === undefined || value === null ? '' : String(value).trim();
+}
+/** 百分比字符串（保留 1 位小数）；分母为 0 时返回 "0.0%"。 */
+function rate(part, whole) {
+    if (whole <= 0)
+        return '0.0%';
+    return `${((part / whole) * 100).toFixed(1)}%`;
+}
+/**
+ * `is_sign` 归一化。
+ *
+ * 数字字符串为主（实测 `"1"` / `""`），同时兼容中文渲染值与"已签退但未填 is_sign"的兜底：
+ * **空值一律算「未签到」**（不是缺席）。
+ */
+export function normalizeSignState(isSign, signTime) {
+    const text = toText(isSign);
+    if (text === '') {
+        // is_sign 为空：只要 sign_time 有值说明实际签过，按正常处理，避免误判成"未签到"。
+        return toText(signTime) === '' ? 'notSigned' : 'normal';
+    }
+    if (text.includes('正常'))
+        return 'normal';
+    if (text.includes('请假'))
+        return 'leave';
+    if (text.includes('迟到早退'))
+        return 'lateAndEarlyLeave';
+    if (text.includes('迟到未签退'))
+        return 'lateAndNotSignedOut';
+    if (text.includes('迟到'))
+        return 'late';
+    if (text.includes('早退'))
+        return 'earlyLeave';
+    if (text.includes('未签退'))
+        return 'notSignedOut';
+    if (text === '0' || text.includes('缺席'))
+        return 'absent';
+    switch (text) {
+        case '1': return 'normal';
+        case '2': return 'leave';
+        case '3': return 'late';
+        case '4': return 'earlyLeave';
+        case '5': return 'notSignedOut';
+        case '6': return 'lateAndNotSignedOut';
+        case '7': return 'lateAndEarlyLeave';
+        default: return 'unknown';
+    }
+}
+const SIGN_STATES = [
+    'normal', 'leave', 'late', 'earlyLeave', 'notSignedOut', 'lateAndNotSignedOut',
+    'lateAndEarlyLeave', 'absent', 'notSigned', 'unknown',
+];
+/** `meeting.eb.sign.list` 的结果后处理。 */
+export function summarizeSignRows(rows) {
+    const byState = Object.fromEntries(SIGN_STATES.map((key) => [key, 0]));
+    const items = rows.map((row) => {
+        const main = (row?.mainTable ?? row ?? {});
+        const state = normalizeSignState(main.is_sign, main.sign_time);
+        byState[state] += 1;
+        return {
+            id: toText(main.id),
+            userId: toText(main.user_id),
+            mtRef: toText(main.mt_id),
+            state,
+            signTime: toText(main.sign_time),
+            signBackTime: toText(main.signback_time),
+            signOutStatus: toText(main.sign_out_status),
+        };
+    });
+    const total = items.length;
+    const notSigned = byState.notSigned;
+    const signed = total - notSigned;
+    return {
+        summary: {
+            total,
+            signed,
+            notSigned,
+            signedOut: items.filter((item) => item.signOutStatus === '0').length,
+            // 出席率按"已签到"口径（未签到 = 没来），比把"缺席"也算作出席更直观。
+            attendanceRate: rate(signed, total),
+            byState,
+        },
+        items,
+    };
+}
+/** `attend_status` 归一化：空 = 未回执；`0` = 不参加；`1` = 参加。 */
+export function normalizeReceiptState(raw) {
+    const text = toText(raw);
+    if (text === '')
+        return 'noReply';
+    if (text === '1' || text.includes('参加') && !text.includes('不参加'))
+        return 'attend';
+    if (text === '0' || text.includes('不参加'))
+        return 'decline';
+    return 'unknown';
+}
+/** `meeting.eb.receipt.list` 的结果后处理。 */
+export function summarizeReceiptRows(rows) {
+    const byMemberType = { attendee: 0, customer: 0, other: 0, unknown: 0 };
+    const items = rows.map((row) => {
+        const main = (row?.mainTable ?? row ?? {});
+        const memberType = toText(main.member_type);
+        if (memberType === '1')
+            byMemberType.attendee += 1;
+        else if (memberType === '2')
+            byMemberType.customer += 1;
+        else if (memberType === '3')
+            byMemberType.other += 1;
+        else
+            byMemberType.unknown += 1;
+        return {
+            id: toText(main.id),
+            memberId: toText(main.member_id),
+            mtRef: toText(main.mt_id),
+            state: normalizeReceiptState(main.attend_status),
+            memberType,
+            attendStatus: toText(main.attend_status),
+            bookRoom: toText(main.book_room),
+            bookTicket: toText(main.book_ticket),
+        };
+    });
+    const total = items.length;
+    const attend = items.filter((item) => item.state === 'attend').length;
+    const decline = items.filter((item) => item.state === 'decline').length;
+    const replied = attend + decline;
+    return {
+        summary: {
+            total,
+            attend,
+            decline,
+            noReply: total - replied,
+            replyRate: rate(replied, total),
+            attendRate: rate(attend, total),
+            byMemberType,
+            bookRoom: items.filter((item) => item.bookRoom !== '').length,
+            bookTicket: items.filter((item) => item.bookTicket !== '').length,
+        },
+        items,
+    };
+}