skill-calorie 0.2.2 → 0.2.4

package/dist/xunji/rows.js

@@ -0,0 +1,74 @@
+/** 训记响应 → `exercise_log` 行（老 `adapters/xunji_adapter.py:xunji_response_to_rows`，代码新写）。
+ *
+ * 口径（逐条对老 `:28-69`）：
+ * - 一 train 一 localid（转串）＋ title ＋ datestr；difficulty 取 train 级（老 `:35`）；
+ * - 只收 `done` 的 set（老 `:38-39` 未完成不同步）；
+ * - `load_kg` 走单位换算（`exerciseStore.convertLoadKg`，即老 `convert_load_kg`）；
+ * - `reps` 范围串 `"12-16"` 取最大（老 `:44-48`），转坏即 0（老 `:50-53`）；
+ * - 热量＝容量 × 0.08（`exerciseStore.estimateCaloriesFromTraining`，即老公式）；
+ * - 分类走动作名推断（`exerciseStore.inferCategory`，即老 `_infer_category`）。
+ *
+ * 本件是纯函数：不读库、不调网、不读时钟——同输入必得同输出（挡板断言直接调它）。
+ * 跨能力引用走运动门（R2 收口 #613：`exercise/index.js#exerciseBackfillBridge` 唯一缝合点，
+ * 定义仍在 `exerciseStore.ts`，本件不深引对方内部件）。
+ */
+import { exerciseBackfillBridge } from '../exercise/index.js';
+function asRecord(v) {
+    return typeof v === 'object' && v !== null ? v : {};
+}
+function asList(v) {
+    return Array.isArray(v) ? v : [];
+}
+function asText(v, fallback) {
+    return typeof v === 'string' ? v : fallback;
+}
+/** set 的次数：范围串取最大（老 `:44-48`），转坏即 0（老 `:50-53`）。 */
+export function parseSetReps(raw) {
+    if (typeof raw === 'string' && raw.includes('-')) {
+        const parts = raw.split('-').map((x) => Number(x.trim())).filter((n) => Number.isInteger(n));
+        return parts.length > 0 ? Math.max(...parts) : 0;
+    }
+    const n = Number(raw);
+    return Number.isInteger(n) ? n : 0;
+}
+function parseSetIndex(raw) {
+    return typeof raw === 'number' && Number.isFinite(raw) ? raw : null;
+}
+/** 训记 GET 响应 → 回写行列表（每行一个完成的 set；形状不对即空表，不抛）。 */
+export function xunjiResponseToRows(response) {
+    const rows = [];
+    const trains = asList(asRecord(asRecord(response).res).trains);
+    for (const t of trains) {
+        const train = asRecord(t);
+        const localid = String(train.localid ?? '');
+        const title = asText(train.title, '');
+        const datestr = asText(train.datestr, '');
+        const rawDifficulty = train.difficulty;
+        const difficulty = typeof rawDifficulty === 'string' ? rawDifficulty : null;
+        for (const m of asList(train.movements)) {
+            const move = asRecord(m);
+            const name = asText(move.name, '');
+            for (const s of asList(move.sets)) {
+                const set = asRecord(s);
+                if (set.done !== true)
+                    continue;
+                const load = exerciseBackfillBridge.convertLoadKg(set.weight ?? '0', set.unit ?? 'kg');
+                const reps = parseSetReps(set.reps ?? 0);
+                rows.push({
+                    date: datestr,
+                    exerciseType: name,
+                    reps,
+                    setIndex: parseSetIndex(set.index),
+                    loadKg: load,
+                    caloriesBurned: exerciseBackfillBridge.estimateCaloriesFromTraining(load * reps),
+                    category: exerciseBackfillBridge.inferCategory(name),
+                    difficulty,
+                    xunjiLocalid: localid,
+                    xunjiTitle: title,
+                });
+            }
+        }
+    }
+    return rows;
+}
+//# sourceMappingURL=rows.js.map

package/dist/xunji/rows.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rows.js","sourceRoot":"","sources":["../../src/xunji/rows.ts"],"names":[],"mappings":"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"}

package/dist/xunji/run-sync.d.ts

@@ -0,0 +1,106 @@
+/** 一条链跑完：补计划 → 记心愿 → 推送 → 回写（老 `sync_plan.py` 四步 ＋ `run_sync.py`，代码新写）。
+ *
+ * 口径（逐条对老）：
+ * - 四步顺序固定（老 `sync_plan.py:329-332`）：补计划（飞书日历）→ 记心愿（飞书 task）→
+ *   推送（串行 N 天 `push-plan`，45 秒限频）→ 回写（一次 `backfill --days N`）；
+ * - 天数缺省 3、起始偏移缺省 0（今天）、`dry-run` 只建状态文件不实际跑（老 `run_sync.py:168-175`）；
+ * - 状态文件与老同路径同写法（`~/.mavis/xunji_bridge_sync_state.json`，原子写，
+ *   供外部轮询；老 `run_sync.py:32／52-58`）；
+ * - 推送逐天记结果、回写记汇总（老 `:184-190／:221-225` 的摘要形状）。
+ *
+ * 修掉的老缺陷（不照抄）：老 `run_sync.py` 只在超时／抛错时判失败，子进程的 rc
+ * （如推送 `fail_count > 0` 退 3）只记进 `results[].rc`、不进最终状态——推送全失败
+ * 也可能 `status: completed` 退 0（`__main__:157-160` 只看 `status == "failed"`）。
+ * 新仓任一步失败即停：状态 `failed` ＋ `failed_step` 点名哪一步（`推送 YYYY-MM-DD`／
+ * `回写`／`补计划`／`记心愿`）＋ 非 0 退出（码复用 `exitMap`：无 KEY→2，其余→3，用法错→1）。
+ *
+ * 跨技能两步（补计划／记心愿）缺省跳过：作息管家／备忘录不在本仓，默认实现只记
+ * `skipped` 不算失败；#614 接线后由调用方注入真实现（见证据件过渡债务 R3）。
+ */
+import type { BackfillDeps } from './backfill.js';
+import type { PushDayDeps } from './push.js';
+import type { DayPlanSource } from './planSource.js';
+import type { XunjiSubcommand } from './subcommands.js';
+import type { XunjiRun } from './run.js';
+/** 四步的代号（顺序固定：plan → wish → push → backfill）。 */
+export type RunSyncPhase = 'plan' | 'wish' | 'push' | 'backfill';
+/** 四步的人话名（失败点名用这四个词，`key.ts` 的 `does` 同词）。 */
+export declare const RUN_SYNC_PHASE_LABEL: Record<RunSyncPhase, string>;
+/** 一步的成功（含 `skipped`：没跑但不算失败，如缺省的补计划／记心愿）。 */
+export interface RunSyncStepOk {
+    readonly ok: true;
+    readonly skipped?: boolean;
+    readonly note?: string;
+    readonly detail?: unknown;
+}
+/** 一步的失败（`code` 取值复用 `XUNJI_EXIT_CODES` 的 1／2／3，不另造码表）。 */
+export interface RunSyncStepFail {
+    readonly ok: false;
+    readonly code: 1 | 2 | 3;
+    readonly error: string;
+    readonly detail?: unknown;
+}
+/** 一步的结局（ok 即过；`skipped` 的 ok 也是 true，不触发失败停链）。 */
+export type RunSyncStepResult = RunSyncStepOk | RunSyncStepFail;
+/** `runSync` 的注入缝（四步皆可换；缺省＝推送／回写真跑，补计划／记心愿跳过）。 */
+export interface RunSyncDeps {
+    /** 今天（`YYYY-MM-DD`；缺省本地今天；测试钉住它）。 */
+    readonly todayISO?: string;
+    /** 补计划（缺省跳过：作息管家不在本仓，#614 接线）。 */
+    readonly plan?: (dates: readonly string[]) => Promise<RunSyncStepResult>;
+    /** 记心愿（缺省跳过：备忘录不在本仓，#614 接线）。 */
+    readonly wish?: (dates: readonly string[]) => Promise<RunSyncStepResult>;
+    /** 推一天（缺省读本仓计划＋`pushDayPlan` 真推）。 */
+    readonly pushDay?: (dateStr: string) => Promise<RunSyncStepResult>;
+    /** 回写（缺省 `backfillRange` 真写）。 */
+    readonly backfill?: (endISO: string, days: number) => Promise<RunSyncStepResult>;
+    /** 缺省推一天的取数口（读卡路里库，只读）。 */
+    readonly planSource?: DayPlanSource;
+    /** 缺省推一天的透传件（upsert／限频；测试挡板从这里进）。 */
+    readonly pushDeps?: PushDayDeps;
+    /** 缺省回写的透传件（拉取／开库；测试挡板从这里进）。 */
+    readonly backfillDeps?: BackfillDeps;
+    /** 状态文件（缺省老路径；传 null 即不写，测试用 tmp）。 */
+    readonly statePath?: string | null;
+}
+/** 链里一步的记录（`date` 只推送那步有；`code` 只失败有）。 */
+export interface RunSyncPhaseEntry {
+    readonly phase: RunSyncPhase;
+    readonly label: string;
+    readonly ok: boolean;
+    readonly skipped?: boolean;
+    readonly date?: string;
+    readonly note?: string;
+    readonly error?: string;
+    readonly code?: 1 | 2 | 3;
+    readonly detail?: unknown;
+}
+/** 整条链的最终状态（老 `run_sync` 状态文件同键 ＋ 点名 `failed_step`／`failed_code`）。 */
+export interface RunSyncState {
+    readonly status: 'running' | 'completed' | 'failed';
+    readonly started_at: string;
+    readonly finished_at: string | null;
+    readonly total_days: number;
+    readonly current_day: number;
+    readonly phase: RunSyncPhase | null;
+    readonly results: readonly RunSyncPhaseEntry[];
+    readonly error_summary: string | null;
+    readonly failed_step: string | null;
+    readonly failed_code: 1 | 2 | 3 | null;
+}
+/** 缺省状态文件（老 `run_sync.py:32` 同路径；外部轮询读它）。 */
+export declare function defaultRunSyncStatePath(): string;
+/** `YYYY-MM-DD` 加 N 天（调用方保证形状；纯函数）。 */
+export declare function addDaysISO(startISO: string, offset: number): string;
+/** 跑整条链（`days`／`startOffset` 由分派层校验；任一步失败即停并点名）。 */
+export declare function runSync(opts: {
+    readonly days?: number;
+    readonly startOffset?: number;
+    readonly dryRun?: boolean;
+    readonly deps?: RunSyncDeps;
+}): Promise<RunSyncState>;
+type Values = Readonly<Record<string, string | boolean | readonly string[]>>;
+/** `run-sync` 子命令的分派（`run.ts` 调；失败即非 0 并点名哪一步）。 */
+export declare function runRunSyncCommand(sub: XunjiSubcommand, values: Values, deps?: RunSyncDeps): Promise<XunjiRun>;
+export {};
+//# sourceMappingURL=run-sync.d.ts.map

package/dist/xunji/run-sync.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-sync.d.ts","sourceRoot":"","sources":["../../src/xunji/run-sync.ts"],"names":[],"mappings":"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"}

package/dist/xunji/run-sync.js

@@ -0,0 +1,223 @@
+/** 一条链跑完：补计划 → 记心愿 → 推送 → 回写（老 `sync_plan.py` 四步 ＋ `run_sync.py`，代码新写）。
+ *
+ * 口径（逐条对老）：
+ * - 四步顺序固定（老 `sync_plan.py:329-332`）：补计划（飞书日历）→ 记心愿（飞书 task）→
+ *   推送（串行 N 天 `push-plan`，45 秒限频）→ 回写（一次 `backfill --days N`）；
+ * - 天数缺省 3、起始偏移缺省 0（今天）、`dry-run` 只建状态文件不实际跑（老 `run_sync.py:168-175`）；
+ * - 状态文件与老同路径同写法（`~/.mavis/xunji_bridge_sync_state.json`，原子写，
+ *   供外部轮询；老 `run_sync.py:32／52-58`）；
+ * - 推送逐天记结果、回写记汇总（老 `:184-190／:221-225` 的摘要形状）。
+ *
+ * 修掉的老缺陷（不照抄）：老 `run_sync.py` 只在超时／抛错时判失败，子进程的 rc
+ * （如推送 `fail_count > 0` 退 3）只记进 `results[].rc`、不进最终状态——推送全失败
+ * 也可能 `status: completed` 退 0（`__main__:157-160` 只看 `status == "failed"`）。
+ * 新仓任一步失败即停：状态 `failed` ＋ `failed_step` 点名哪一步（`推送 YYYY-MM-DD`／
+ * `回写`／`补计划`／`记心愿`）＋ 非 0 退出（码复用 `exitMap`：无 KEY→2，其余→3，用法错→1）。
+ *
+ * 跨技能两步（补计划／记心愿）缺省跳过：作息管家／备忘录不在本仓，默认实现只记
+ * `skipped` 不算失败；#614 接线后由调用方注入真实现（见证据件过渡债务 R3）。
+ */
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { mkdirSync, renameSync, writeFileSync } from 'node:fs';
+import { backfillRange, todayLocalISO } from './backfill.js';
+import { pushDayPlan } from './push.js';
+import { resolveDayPlan } from './planSource.js';
+import { exitForFailure } from './exitMap.js';
+import { XUNJI_EXIT_CODES } from './subcommands.js';
+/** 四步的人话名（失败点名用这四个词，`key.ts` 的 `does` 同词）。 */
+export const RUN_SYNC_PHASE_LABEL = {
+    plan: '补计划',
+    wish: '记心愿',
+    push: '推送',
+    backfill: '回写',
+};
+/** 缺省状态文件（老 `run_sync.py:32` 同路径；外部轮询读它）。 */
+export function defaultRunSyncStatePath() {
+    return join(homedir(), '.mavis', 'xunji_bridge_sync_state.json');
+}
+function nowISO() {
+    return new Date().toISOString();
+}
+/** `YYYY-MM-DD` 加 N 天（调用方保证形状；纯函数）。 */
+export function addDaysISO(startISO, offset) {
+    const [y, m, d] = startISO.split('-').map(Number);
+    return new Date(Date.UTC(y, m - 1, d) + offset * 86400000).toISOString().slice(0, 10);
+}
+function writeState(statePath, state) {
+    if (statePath === null)
+        return;
+    try {
+        mkdirSync(dirname(statePath), { recursive: true });
+        const tmp = statePath + '.tmp';
+        writeFileSync(tmp, JSON.stringify(state, null, 2), 'utf8');
+        renameSync(tmp, statePath);
+    }
+    catch {
+        /* 状态写坏不许堵死同步（坏文件当无历史；`fetch.ts` 限频落盘同口径） */
+    }
+}
+/** 推送汇总里第一个失败定码：本地缺 KEY（无 HTTP）→2，其余→3（`exitMap` 同口径）。 */
+function codeOfPushSummary(summary) {
+    let sawAuthMissing = false;
+    for (const r of summary.results) {
+        if (r.ok)
+            continue;
+        const resp = (typeof r.resp === 'object' && r.resp !== null ? r.resp : {});
+        if (resp.err === true && resp.error_type === 'auth' && (resp.code === null || resp.code === undefined)) {
+            sawAuthMissing = true;
+            continue;
+        }
+        return XUNJI_EXIT_CODES.api;
+    }
+    return sawAuthMissing ? XUNJI_EXIT_CODES.auth : XUNJI_EXIT_CODES.api;
+}
+/** 缺省推一天：读本仓计划 → `pushDayPlan`（无计划即失败，不静默跳过）。 */
+async function defaultPushDay(dateStr, deps) {
+    const day = (deps.planSource ?? resolveDayPlan)(dateStr);
+    if (!day.found)
+        return { ok: false, code: XUNJI_EXIT_CODES.error, error: '推送 ' + dateStr + '：' + day.reason };
+    const summary = await pushDayPlan(dateStr, day.sessions, deps.pushDeps ?? {});
+    if (summary.fail_count > 0) {
+        return {
+            ok: false, code: codeOfPushSummary(summary),
+            error: '推送 ' + dateStr + '：' + summary.fail_count + ' 个 session 推送失败（共 ' + summary.session_count + ' 个）',
+            detail: summary,
+        };
+    }
+    return { ok: true, detail: summary };
+}
+/** 缺省回写：`backfillRange`（失败分“没拉到”走 2／3、“拉到了没写进”走 3，`run.ts` 同词）。 */
+async function defaultBackfill(endISO, days, deps) {
+    const result = await backfillRange(endISO, days, deps.backfillDeps ?? {});
+    for (const r of result.results) {
+        if (r.fetch_ok === false && r.failure !== null) {
+            const code = exitForFailure(r.failure);
+            return { ok: false, code: code === 2 ? 2 : 3, error: '回写失败（没拉到）：' + r.date + ' ' + r.failure.message, detail: result };
+        }
+    }
+    for (const r of result.results) {
+        if (r.err !== null) {
+            return { ok: false, code: XUNJI_EXIT_CODES.api, error: '回写失败（拉到了没写进）：' + r.date + ' ' + r.err, detail: result };
+        }
+    }
+    return { ok: true, detail: result };
+}
+/** 缺省跳过（补计划／记心愿）：外部技能不在本仓，记 `skipped` 不算失败（#614 接线后换真实现）。 */
+function skippedStep(note) {
+    return Promise.resolve({ ok: true, skipped: true, note });
+}
+/** 跑整条链（`days`／`startOffset` 由分派层校验；任一步失败即停并点名）。 */
+export async function runSync(opts) {
+    const days = opts.days ?? 3;
+    const startOffset = opts.startOffset ?? 0;
+    if (!Number.isInteger(days) || days < 1)
+        throw new Error('days 须为 ≥1 整数（实际：' + String(days) + '）');
+    if (!Number.isInteger(startOffset))
+        throw new Error('startOffset 须为整数（实际：' + String(startOffset) + '）');
+    const deps = opts.deps ?? {};
+    const statePath = deps.statePath === undefined ? defaultRunSyncStatePath() : deps.statePath;
+    const today = deps.todayISO ?? todayLocalISO();
+    const dates = Array.from({ length: days }, (_, i) => addDaysISO(today, startOffset + i));
+    const startedAt = nowISO();
+    const write = (s) => writeState(statePath, s);
+    const running = {
+        status: 'running', started_at: startedAt, finished_at: null,
+        total_days: days, current_day: 0, phase: null, results: [], error_summary: null, failed_step: null, failed_code: null,
+    };
+    write(running);
+    if (opts.dryRun === true) {
+        const done = {
+            ...running, status: 'completed', finished_at: nowISO(), phase: 'push',
+            error_summary: 'dry_run 模式，只建状态文件、无实际操作',
+        };
+        write(done);
+        return done;
+    }
+    const results = [];
+    const fail = (entry, failedStep, code, error) => {
+        const done = {
+            status: 'failed', started_at: startedAt, finished_at: nowISO(),
+            total_days: days, current_day: entry.phase === 'push' ? results.filter((e) => e.phase === 'push').length : days,
+            phase: entry.phase, results: [...results, entry], error_summary: error, failed_step: failedStep, failed_code: code,
+        };
+        write(done);
+        return done;
+    };
+    const plan = await (deps.plan ?? ((ds) => skippedStep('未接入：作息管家不在本仓，#614 接线前跳过（' + ds.length + ' 天）')))(dates);
+    results.push({
+        phase: 'plan', label: RUN_SYNC_PHASE_LABEL.plan, ok: plan.ok,
+        skipped: plan.ok ? plan.skipped === true : undefined, note: plan.ok ? plan.note : undefined,
+        error: plan.ok ? undefined : plan.error, code: plan.ok ? undefined : plan.code, detail: plan.detail,
+    });
+    if (!plan.ok)
+        return fail(results[results.length - 1], RUN_SYNC_PHASE_LABEL.plan, plan.code, plan.error);
+    const wish = await (deps.wish ?? ((ds) => skippedStep('未接入：备忘录不在本仓，#614 接线前跳过（' + ds.length + ' 天）')))(dates);
+    results.push({
+        phase: 'wish', label: RUN_SYNC_PHASE_LABEL.wish, ok: wish.ok,
+        skipped: wish.ok ? wish.skipped === true : undefined, note: wish.ok ? wish.note : undefined,
+        error: wish.ok ? undefined : wish.error, code: wish.ok ? undefined : wish.code, detail: wish.detail,
+    });
+    if (!wish.ok)
+        return fail(results[results.length - 1], RUN_SYNC_PHASE_LABEL.wish, wish.code, wish.error);
+    const pushDay = deps.pushDay ?? ((d) => defaultPushDay(d, deps));
+    for (const dateStr of dates) {
+        const step = await pushDay(dateStr);
+        const entry = {
+            phase: 'push', label: RUN_SYNC_PHASE_LABEL.push, ok: step.ok, date: dateStr,
+            note: step.ok ? step.note : undefined,
+            error: step.ok ? undefined : step.error, code: step.ok ? undefined : step.code, detail: step.detail,
+        };
+        results.push(entry);
+        if (!step.ok)
+            return fail(entry, RUN_SYNC_PHASE_LABEL.push + ' ' + dateStr, step.code, step.error);
+    }
+    const endISO = dates[dates.length - 1];
+    const bf = await (deps.backfill ?? ((end, n) => defaultBackfill(end, n, deps)))(endISO, days);
+    const bfEntry = {
+        phase: 'backfill', label: RUN_SYNC_PHASE_LABEL.backfill, ok: bf.ok,
+        note: bf.ok ? bf.note : undefined,
+        error: bf.ok ? undefined : bf.error, code: bf.ok ? undefined : bf.code, detail: bf.detail,
+    };
+    results.push(bfEntry);
+    if (!bf.ok)
+        return fail(bfEntry, RUN_SYNC_PHASE_LABEL.backfill, bf.code, bf.error);
+    const done = {
+        status: 'completed', started_at: startedAt, finished_at: nowISO(),
+        total_days: days, current_day: days, phase: null, results, error_summary: null, failed_step: null, failed_code: null,
+    };
+    write(done);
+    return done;
+}
+/** `run-sync` 子命令的分派（`run.ts` 调；失败即非 0 并点名哪一步）。 */
+export async function runRunSyncCommand(sub, values, deps = {}) {
+    const refuse = (why, data) => ({
+        subcommand: 'run-sync', code: XUNJI_EXIT_CODES.error, message: why, data, stderr: why + '（用法：' + sub.usage + '）',
+    });
+    let days = 3;
+    if (values['--days'] !== undefined) {
+        const n = Number(values['--days']);
+        if (!Number.isInteger(n) || n < 1)
+            return refuse('天数须为 ≥1 整数（实际：' + String(values['--days']) + '）', { usage: sub.usage });
+        days = n;
+    }
+    let startOffset = 0;
+    if (values['--start-offset'] !== undefined) {
+        const n = Number(values['--start-offset']);
+        if (!Number.isInteger(n))
+            return refuse('起始偏移须为整数（实际：' + String(values['--start-offset']) + '）', { usage: sub.usage });
+        startOffset = n;
+    }
+    const state = await runSync({ days, startOffset, dryRun: values['--dry-run'] === true, deps });
+    if (state.status === 'failed') {
+        const line = 'run-sync 失败在' + String(state.failed_step) + '：' + String(state.error_summary);
+        return { subcommand: 'run-sync', code: state.failed_code ?? XUNJI_EXIT_CODES.api, message: line, data: state, stderr: line };
+    }
+    const skipped = state.results.filter((e) => e.skipped === true).map((e) => e.label);
+    return {
+        subcommand: 'run-sync', code: XUNJI_EXIT_CODES.ok,
+        message: 'run-sync 完成：' + days + ' 天' + (skipped.length > 0 ? '（其中 ' + skipped.join('、') + '跳过：外部技能未接入）' : '（四步全过）'),
+        data: state, stderr: null,
+    };
+}
+//# sourceMappingURL=run-sync.js.map

package/dist/xunji/run-sync.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"run-sync.js","sourceRoot":"","sources":["../../src/xunji/run-sync.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE7D,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAExC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AAOpD,8CAA8C;AAC9C,MAAM,CAAC,MAAM,oBAAoB,GAAiC;IAChE,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,KAAK;IACX,IAAI,EAAE,IAAI;IACV,QAAQ,EAAE,IAAI;CACf,CAAC;AAsEF,6CAA6C;AAC7C,MAAM,UAAU,uBAAuB;IACrC,OAAO,IAAI,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,8BAA8B,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,MAAM;IACb,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;AAClC,CAAC;AAED,uCAAuC;AACvC,MAAM,UAAU,UAAU,CAAC,QAAgB,EAAE,MAAc;IACzD,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAClD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAW,EAAG,CAAY,GAAG,CAAC,EAAE,CAAW,CAAC,GAAG,MAAM,GAAG,QAAQ,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;AACxH,CAAC;AAED,SAAS,UAAU,CAAC,SAAwB,EAAE,KAAmB;IAC/D,IAAI,SAAS,KAAK,IAAI;QAAE,OAAO;IAC/B,IAAI,CAAC;QACH,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACnD,MAAM,GAAG,GAAG,SAAS,GAAG,MAAM,CAAC;QAC/B,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAC3D,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC7B,CAAC;IAAC,MAAM,CAAC;QACP,4CAA4C;IAC9C,CAAC;AACH,CAAC;AAED,0DAA0D;AAC1D,SAAS,iBAAiB,CAAC,OAAuB;IAChD,IAAI,cAAc,GAAG,KAAK,CAAC;IAC3B,KAAK,MAAM,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QAChC,IAAI,CAAC,CAAC,EAAE;YAAE,SAAS;QACnB,MAAM,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAA4B,CAAC;QACtG,IAAI,IAAI,CAAC,GAAG,KAAK,IAAI,IAAI,IAAI,CAAC,UAAU,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,EAAE,CAAC;YACvG,cAAc,GAAG,IAAI,CAAC;YACtB,SAAS;QACX,CAAC;QACD,OAAO,gBAAgB,CAAC,GAAG,CAAC;IAC9B,CAAC;IACD,OAAO,cAAc,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC;AACvE,CAAC;AAED,iDAAiD;AACjD,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,IAAiB;IAC9D,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,UAAU,IAAI,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC;IACzD,IAAI,CAAC,GAAG,CAAC,KAAK;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,GAAG,OAAO,GAAG,GAAG,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC;IAC9G,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IAC9E,IAAI,OAAO,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC;QAC3B,OAAO;YACL,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,iBAAiB,CAAC,OAAO,CAAC;YAC3C,KAAK,EAAE,KAAK,GAAG,OAAO,GAAG,GAAG,GAAG,OAAO,CAAC,UAAU,GAAG,oBAAoB,GAAG,OAAO,CAAC,aAAa,GAAG,KAAK;YACxG,MAAM,EAAE,OAAO;SAChB,CAAC;IACJ,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,CAAC;AACvC,CAAC;AAED,mEAAmE;AACnE,KAAK,UAAU,eAAe,CAAC,MAAc,EAAE,IAAY,EAAE,IAAiB;IAC5E,MAAM,MAAM,GAAG,MAAM,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC;IAC1E,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,CAAC,QAAQ,KAAK,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YAC/C,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;YACvC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,YAAY,GAAG,CAAC,CAAC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QACzH,CAAC;IACH,CAAC;IACD,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC,CAAC,GAAG,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,gBAAgB,CAAC,GAAG,EAAE,KAAK,EAAE,eAAe,GAAG,CAAC,CAAC,IAAI,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAClH,CAAC;IACH,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;AACtC,CAAC;AAED,6DAA6D;AAC7D,SAAS,WAAW,CAAC,IAAY;IAC/B,OAAO,OAAO,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;AAC5D,CAAC;AAED,oDAAoD;AACpD,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,IAAuH;IACnJ,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC;IAC5B,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;IAC1C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;IACnG,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,sBAAsB,GAAG,MAAM,CAAC,WAAW,CAAC,GAAG,GAAG,CAAC,CAAC;IACxG,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;IAC7B,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,uBAAuB,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC;IAC5F,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,IAAI,aAAa,EAAE,CAAC;IAC/C,MAAM,KAAK,GAAG,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,WAAW,GAAG,CAAC,CAAC,CAAC,CAAC;IACzF,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,CAAC,CAAe,EAAQ,EAAE,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC;IAClE,MAAM,OAAO,GAAiB;QAC5B,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI;QAC3D,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI;KACtH,CAAC;IACF,KAAK,CAAC,OAAO,CAAC,CAAC;IACf,IAAI,IAAI,CAAC,MAAM,KAAK,IAAI,EAAE,CAAC;QACzB,MAAM,IAAI,GAAiB;YACzB,GAAG,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM;YACrE,aAAa,EAAE,yBAAyB;SACzC,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,MAAM,IAAI,GAAG,CAAC,KAAwB,EAAE,UAAkB,EAAE,IAAe,EAAE,KAAa,EAAgB,EAAE;QAC1G,MAAM,IAAI,GAAiB;YACzB,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE;YAC9D,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI;YAC/G,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,EAAE,KAAK,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,WAAW,EAAE,UAAU,EAAE,WAAW,EAAE,IAAI;SACnH,CAAC;QACF,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,OAAO,IAAI,CAAC;IACd,CAAC,CAAC;IACF,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,0BAA0B,GAAG,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC/G,OAAO,CAAC,IAAI,CAAC;QACX,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE;QAC5D,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QAC3F,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM;KACpG,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAsB,EAAE,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9H,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,yBAAyB,GAAG,EAAE,CAAC,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC9G,OAAO,CAAC,IAAI,CAAC;QACX,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE;QAC5D,OAAO,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QAC3F,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM;KACpG,CAAC,CAAC;IACH,IAAI,CAAC,IAAI,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAsB,EAAE,oBAAoB,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IAC9H,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;IACjE,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;QACpC,MAAM,KAAK,GAAsB;YAC/B,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,CAAC,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,OAAO;YAC3E,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;YACrC,KAAK,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM;SACpG,CAAC;QACF,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,CAAC,IAAI,CAAC,EAAE;YAAE,OAAO,IAAI,CAAC,KAAK,EAAE,oBAAoB,CAAC,IAAI,GAAG,GAAG,GAAG,OAAO,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;IACrG,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAW,CAAC;IACjD,MAAM,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;IAC9F,MAAM,OAAO,GAAsB;QACjC,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,oBAAoB,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE;QAClE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;QACjC,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,MAAM;KAC1F,CAAC;IACF,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtB,IAAI,CAAC,EAAE,CAAC,EAAE;QAAE,OAAO,IAAI,CAAC,OAAO,EAAE,oBAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IACnF,MAAM,IAAI,GAAiB;QACzB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,EAAE;QACjE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE,IAAI;KACrH,CAAC;IACF,KAAK,CAAC,IAAI,CAAC,CAAC;IACZ,OAAO,IAAI,CAAC;AACd,CAAC;AAID,mDAAmD;AACnD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAoB,EAAE,MAAc,EAAE,OAAoB,EAAE;IAClG,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,IAAa,EAAY,EAAE,CAAC,CAAC;QACxD,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,GAAG,MAAM,GAAG,GAAG,CAAC,KAAK,GAAG,GAAG;KACjH,CAAC,CAAC;IACH,IAAI,IAAI,GAAG,CAAC,CAAC;IACb,IAAI,MAAM,CAAC,QAAQ,CAAC,KAAK,SAAS,EAAE,CAAC;QACnC,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,MAAM,CAAC,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1H,IAAI,GAAG,CAAC,CAAC;IACX,CAAC;IACD,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,MAAM,CAAC,gBAAgB,CAAC,KAAK,SAAS,EAAE,CAAC;QAC3C,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC3C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC;YAAE,OAAO,MAAM,CAAC,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,GAAG,GAAG,EAAE,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC;QACvH,WAAW,GAAG,CAAC,CAAC;IAClB,CAAC;IACD,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,KAAK,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC/F,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;QAC9B,MAAM,IAAI,GAAG,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC5F,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,CAAC,WAAW,IAAI,gBAAgB,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;IAC/H,CAAC;IACD,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IACpF,OAAO;QACL,UAAU,EAAE,UAAU,EAAE,IAAI,EAAE,gBAAgB,CAAC,EAAE;QACjD,OAAO,EAAE,cAAc,GAAG,IAAI,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC;QACpH,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI;KAC1B,CAAC;AACJ,CAAC"}

package/dist/xunji/run.d.ts

@@ -0,0 +1,56 @@
+import type { DatabaseSync } from 'node:sqlite';
+import type { DayPlanSource } from './planSource.js';
+import type { UpsertTransport } from './upsert.js';
+import type { FetchOutcome } from './fetch.js';
+import { type KeyStoreDeps } from './key.js';
+import { type OverlayDeps } from './overlay-plan.js';
+import { type RunSyncDeps } from './run-sync.js';
+/** 一次子命令调用的读数：退出码 ＋ 人话 ＋ 机器读数（＋ 命令行入口要打的那句）。 */
+export interface XunjiRun {
+    readonly subcommand: string | null;
+    readonly code: number;
+    readonly message: string;
+    /** 给回执／页面的读数（`verify`＝`MovementVerifyReport`；用法错／未实现＝读得懂的说明） */
+    readonly data: unknown;
+    /** 命令行入口要打到 stderr 的那句；没有＝null */
+    readonly stderr: string | null;
+}
+/** 分派的可注入件（测试挡板从这里进；生产缺省＝真时钟真睡真状态文件＋环境变量 KEY）。
+ * 全可选：不传即生产缺省（`upsert`／`push-plan` 真调接口——测试必须注入挡板，**不许打真接口**）。 */
+export interface XunjiCommandDeps {
+    /** 取某天 sessions（缺省读卡路里库，见 `planSource.ts`）。 */
+    readonly planSource?: DayPlanSource;
+    /** upsert 传输（缺省全局 fetch）。 */
+    readonly transport?: UpsertTransport;
+    /** 显式 KEY（给了就不用 `readKey`）。 */
+    readonly key?: string | null;
+    /** KEY 来源（缺省读环境变量；#610 后改走能力门）。 */
+    readonly readKey?: () => string | null;
+    /** 睡眠（重试退避与限频等待共用；缺省真实 sleep）。 */
+    readonly sleep?: (ms: number) => Promise<void>;
+    /** 现在（毫秒；限频门用；缺省 `Date.now`）。 */
+    readonly now?: () => number;
+    /** 限频状态文件（缺省 `~/.mavis/xunji_push_rate.json`；传 null 只记内存）。 */
+    readonly rateLimitPath?: string | null;
+    /** upsert 超时毫秒（缺省 30000）。 */
+    readonly timeoutMs?: number;
+    /** upsert 重试次数（缺省 2）。 */
+    readonly maxRetries?: number;
+    /** 拉取限频总开关（`fetch --respect-rate-limit` 或回写链显式打开；缺省 false）。 */
+    readonly respectRateLimit?: boolean;
+    /** 拉取限频状态文件（缺省读侧 `xunji_bridge_rate.json`；传 null 即不守不记）。 */
+    readonly fetchRateLimitPath?: string | null;
+    /** 回写库文件（缺省 `SKILLS_DB_PATH/calorie_data.db`；测试传 tmp）。 */
+    readonly dbFile?: string;
+    /** 回写开库（缺省 `openDb`；测试给挡板，**不许碰生产库**）。 */
+    readonly openDb?: (dbFile: string) => DatabaseSync;
+    /** 回写拉取（缺省真拉取；测试给挡板，**不许打真接口**）。 */
+    readonly fetchDay?: (dateStr: string) => Promise<FetchOutcome>;
+    /** KEY 存取面（`key set／clear／status`；缺省真环境＋真 PowerShell）＋ 叠加取数面（缺省真拉取＋真 upsert）。 */
+    readonly keyStore?: KeyStoreDeps;
+    readonly overlay?: OverlayDeps;
+    readonly sync?: RunSyncDeps;
+}
+/** 跑一条子命令（argv 不含程序名）。返回读数；命令行入口（`cli.ts`）负责打印与退出码。 */
+export declare function runXunjiCommand(argv: readonly string[], deps?: XunjiCommandDeps): Promise<XunjiRun>;
+//# sourceMappingURL=run.d.ts.map

package/dist/xunji/run.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/xunji/run.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAMhD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAIrD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAE/C,OAAO,EAAiB,KAAK,YAAY,EAAE,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAyB,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAC5E,OAAO,EAAqB,KAAK,WAAW,EAAE,MAAM,eAAe,CAAC;AAIpE,gDAAgD;AAChD,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,gEAAgE;IAChE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,kCAAkC;IAClC,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC;AAED;kEACkE;AAClE,MAAM,WAAW,gBAAgB;IAC/B,+CAA+C;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;IACpC,6BAA6B;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,CAAC;IACrC,+BAA+B;IAC/B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,mCAAmC;IACnC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IACvC,kCAAkC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,iCAAiC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,8DAA8D;IAC9D,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,6BAA6B;IAC7B,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,yBAAyB;IACzB,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,+DAA+D;IAC/D,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,4DAA4D;IAC5D,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5C,0DAA0D;IAC1D,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,0CAA0C;IAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,YAAY,CAAC;IACnD,oCAAoC;IACpC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;IAC/D,iFAAiF;IACjF,QAAQ,CAAC,QAAQ,CAAC,EAAE,YAAY,CAAC;IACjC,QAAQ,CAAC,OAAO,CAAC,EAAE,WAAW,CAAC;IAC/B,QAAQ,CAAC,IAAI,CAAC,EAAE,WAAW,CAAC;CAC7B;AA6OD,uDAAuD;AACvD,wBAAsB,eAAe,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,EAAE,IAAI,GAAE,gBAAqB,GAAG,OAAO,CAAC,QAAQ,CAAC,CA6B7G"}