skill-calorie 0.2.2 → 0.2.4

package/dist/xunji/key.js

@@ -0,0 +1,160 @@
+/** 训记 KEY 管理（老 `xunji_bridge/auth.py:35-55／110-184`，代码新写）。
+ *
+ * 口径（逐条对老）：
+ * - 只读环境变量：`XUNJI_TRAINS_KEY` 优先，空时回退 `XUNJI_API_KEY`（老 `get_key` 同序）；
+ *   **没有密钥文件**（老机器同述）；
+ * - `status` 只回「前 4 字＋末 2 字」预览（老 `auth.py:177`），全串永不进读数／回执／日志；
+ * - `set` 写用户级系统环境：Windows 走 PowerShell 写 `HKCU\Environment`
+ *   （值走 base64 进子进程，无注入风险；老 `winreg` 直写同位），成功后同步当前进程；
+ * - `clear` 删用户级变量（本来没设即幂等成功，老 `clear_key` 同述）；
+ * - 值校验：空拒绝／超 1024 字符拒绝（老 `set_key` 同值）。
+ *
+ * 本件是 KEY 两名＋缺省读法的**唯一定义地**（`upsert.ts`／`fetch.ts` 经由本件，
+ * 前者薄转出保既有引用不断；#607 §八·6／#608 §八·7 的暂住到此收口）。
+ * 短 KEY（< 7 字）不套预览公式（公式会把全串漏出来），只回等长星号。
+ */
+import { execFile } from 'node:child_process';
+import { XUNJI_EXIT_CODES } from './subcommands.js';
+/** KEY 环境变量两名（老 `auth.py:35-36` 同名同序；全模块只此一处）。 */
+export const XUNJI_KEY_ENV = {
+    primary: 'XUNJI_TRAINS_KEY',
+    legacy: 'XUNJI_API_KEY',
+};
+/** 缺省 KEY 读法（老 `get_key`，`auth.py:47-55`；空串当没配）。 */
+export function readKeyFromEnv(env = process.env) {
+    const primary = (env[XUNJI_KEY_ENV.primary] ?? '').trim();
+    if (primary !== '')
+        return primary;
+    const legacy = (env[XUNJI_KEY_ENV.legacy] ?? '').trim();
+    return legacy !== '' ? legacy : null;
+}
+/** 当前生效的 KEY 来自哪个名（老 `which`，`auth.py:58-66`；用于提示与状态）。 */
+export function whichKey(env = process.env) {
+    if ((env[XUNJI_KEY_ENV.primary] ?? '').trim() !== '')
+        return XUNJI_KEY_ENV.primary;
+    if ((env[XUNJI_KEY_ENV.legacy] ?? '').trim() !== '')
+        return XUNJI_KEY_ENV.legacy;
+    return null;
+}
+/** 预览：前 4 字＋`...`＋末 2 字（老 `auth.py:177` 原样）；短串只回等长星号，不漏全串。 */
+export function previewKey(key) {
+    if (key === '')
+        return null;
+    if (key.length < 7)
+        return '*'.repeat(key.length);
+    return key.slice(0, 4) + '...' + key.slice(-2);
+}
+/** 状态报告（老 `status`；只读环境，不调网不落盘）。 */
+export function keyStatus(deps = {}) {
+    const env = deps.env ?? process.env;
+    const primarySet = (env[XUNJI_KEY_ENV.primary] ?? '') !== '';
+    const legacySet = (env[XUNJI_KEY_ENV.legacy] ?? '') !== '';
+    const active = readKeyFromEnv(env);
+    return {
+        primary_name: XUNJI_KEY_ENV.primary,
+        legacy_name: XUNJI_KEY_ENV.legacy,
+        primary_set: primarySet,
+        legacy_set: legacySet,
+        active_source: whichKey(env),
+        active_key_preview: active === null ? null : previewKey(active),
+        recommendation: primarySet
+            ? 'OK'
+            : legacySet
+                ? '建议把 XUNJI_API_KEY 迁移到 XUNJI_TRAINS_KEY（用 key set）'
+                : '未配置，需用 key set <KEY> 设置',
+    };
+}
+/** 缺省 PowerShell 跑法（老 `_set_key_powershell` 的形状：值走 base64，无注入风险）。 */
+function defaultExecPs(command) {
+    const bin = process.platform === 'win32' ? 'powershell.exe' : 'powershell';
+    return new Promise((resolve, reject) => {
+        execFile(bin, ['-NoProfile', '-Command', command], { windowsHide: true }, (err) => {
+            if (err)
+                reject(err);
+            else
+                resolve();
+        });
+    });
+}
+function setCommand(name, value) {
+    const b64 = Buffer.from(value, 'utf8').toString('base64');
+    return (`$v = [System.Text.Encoding]::UTF8.GetString([Convert]::FromBase64String('${b64}')); ` +
+        `[Environment]::SetEnvironmentVariable('${name}', $v, 'User')`);
+}
+/** 写入用户级系统环境（老 `set_key`；成功同步当前进程，`set` 完立即可用）。 */
+export async function setKey(value, opts = {}, deps = {}) {
+    const trimmed = (value ?? '').trim();
+    if (trimmed === '')
+        return { ok: false, error: 'KEY 不能为空' };
+    if (trimmed.length > 1024)
+        return { ok: false, error: 'KEY 过长（> 1024 字符），疑似输入错误' };
+    const name = opts.legacy === true ? XUNJI_KEY_ENV.legacy : XUNJI_KEY_ENV.primary;
+    try {
+        await (deps.execPs ?? defaultExecPs)(setCommand(name, trimmed));
+    }
+    catch (e) {
+        return { ok: false, error: '写入系统环境失败：' + (e instanceof Error ? e.message : String(e)) };
+    }
+    (deps.env ?? process.env)[name] = trimmed;
+    return { ok: true, name };
+}
+/** 删除用户级系统环境变量（老 `clear_key`；本来没设即幂等成功）。 */
+export async function clearKey(opts = {}, deps = {}) {
+    const name = opts.legacy === true ? XUNJI_KEY_ENV.legacy : XUNJI_KEY_ENV.primary;
+    try {
+        await (deps.execPs ?? defaultExecPs)(`[Environment]::SetEnvironmentVariable('${name}', $null, 'User')`);
+    }
+    catch (e) {
+        return { ok: false, error: '删除系统环境变量失败：' + (e instanceof Error ? e.message : String(e)) };
+    }
+    const env = deps.env ?? process.env;
+    const had = (env[name] ?? '') !== '';
+    delete env[name];
+    return { ok: true, name, had };
+}
+/** `key` 子命令的分派（`run.ts` 调；`status` 无 KEY 退 2，`set／clear` 走 0／1）。 */
+export async function runKeyCommand(sub, values, store = {}) {
+    const refuse = (why, data) => ({
+        subcommand: 'key', code: XUNJI_EXIT_CODES.error, message: why, data, stderr: why + '（用法：' + sub.usage + '）',
+    });
+    const action = values['<子动作>'];
+    const legacy = values['--legacy'] === true;
+    if (action !== 'status' && action !== 'set' && action !== 'clear') {
+        return refuse('用法：key 的子动作只能是 status|set|clear（实际：' + String(action ?? '缺失') + '）', { usage: sub.usage });
+    }
+    if (action === 'status') {
+        const s = keyStatus(store);
+        if (s.active_source === null) {
+            const line = '未配置训记 KEY（权威名 ' + s.primary_name + '，兼容名 ' + s.legacy_name + '；用 key set <KEY> 设置）';
+            return { subcommand: 'key', code: XUNJI_EXIT_CODES.auth, message: line, data: s, stderr: line };
+        }
+        return {
+            subcommand: 'key', code: XUNJI_EXIT_CODES.ok,
+            message: 'KEY 已配置（' + s.active_source + '，预览 ' + String(s.active_key_preview) + '）',
+            data: s, stderr: null,
+        };
+    }
+    if (action === 'set') {
+        const v = values['<KEY 值>'];
+        if (typeof v !== 'string')
+            return refuse('用法：key set <KEY 值>（KEY 值缺失；KEY 值不回显、不进仓）', { usage: sub.usage });
+        const r = await setKey(v, { legacy }, store);
+        if (!r.ok)
+            return { subcommand: 'key', code: XUNJI_EXIT_CODES.error, message: r.error, data: { error: r.error }, stderr: r.error };
+        return {
+            subcommand: 'key', code: XUNJI_EXIT_CODES.ok,
+            message: '已写入 ' + r.name + '（用户级，新开终端生效）',
+            data: { name: r.name, legacy }, stderr: null,
+        };
+    }
+    const r = await clearKey({ legacy }, store);
+    if (!r.ok)
+        return { subcommand: 'key', code: XUNJI_EXIT_CODES.error, message: r.error, data: { error: r.error }, stderr: r.error };
+    const name = r.name;
+    return {
+        subcommand: 'key', code: XUNJI_EXIT_CODES.ok,
+        message: r.had ? '已删除 ' + name : name + ' 未设置，无需删除',
+        data: { name, had: r.had }, stderr: null,
+    };
+}
+//# sourceMappingURL=key.js.map

package/dist/xunji/key.js.map

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

package/dist/xunji/overlay-plan.d.ts

@@ -0,0 +1,79 @@
+/** 计划叠加：用本仓计划覆盖训记某天的训练（老 `xunji_bridge/overlay.py`，代码新写）。
+ *
+ * 口径（逐条对老）：
+ * - 先拉训记当天 list（只拿 title→localid，不取 start/end），再读本仓当天 sessions，按 title 对账；
+ * - 构造 `res[]`：localid 用训记已有的，start＝end＝0（覆盖＝新建语义，老 `:116-120`）；
+ * - 单次 upsert 推全部（训记单次最多 4 条，老 `:161-174`），幂等键 `overlay_{date}_{uuid8}`；
+ * - `missing` 缺省 `fail`（有缺即报 err 不推，老 `:123-138`），`skip` 只推匹配的（老 `:140-143`）；
+ * - 拉取失败即带 err 回（老 `:66-78`）；`missing=fail` 的 err 走用法错 1（老 `__main__:230-233`），
+ *   拉取／upsert 失败走 `exitMap`（无 KEY→2，401／403→3）。
+ *
+ * 修掉的老缺陷（不照抄）：老 `overlay.py:80` 的推导式 `{t["title"]: t["localid"]}`
+ * 把同 title 的多条压成一条，后面的 localid 静默丢失——新仓按 title 分组收全部 localid，
+ * sessions 按序逐条消耗（同 label 的第 2 个 session 拿第 2 个 localid），耗不完的 title
+ * 留在 `extra_in_xunji`，每条已消耗的 localid 都写在 `matched` 里（逐 session 一项）。
+ */
+import type { FetchOptions, FetchOutcome } from './fetch.js';
+import type { XunjiResItem } from './request.js';
+import type { UpsertOptions, UpsertOutcome } from './upsert.js';
+import type { DayPlanSource } from './planSource.js';
+import type { XunjiFailure } from './retry.js';
+import type { XunjiSubcommand } from './subcommands.js';
+import type { XunjiRun } from './run.js';
+/** `missing` 策略（老 `overlay_day_plan` 签名同名同值）：`fail` 有缺即报／`skip` 跳过只推有的。 */
+export type OverlayMissing = 'fail' | 'skip';
+/** `overlayDayPlan` 的注入缝（测试挡板从这里进；生产全缺省＝真拉取＋真单次 upsert）。 */
+export interface OverlayDeps {
+    /** 取某天 sessions（缺省读卡路里库，见 `planSource.ts`）。 */
+    readonly planSource?: DayPlanSource;
+    /** 拉训记当天（缺省 `fetchTrains(..., includeFullData: true)`：要 localid 全表）。 */
+    readonly fetchDay?: (dateStr: string) => Promise<FetchOutcome>;
+    /** 缺省拉取的透传件（KEY／传输／超时／重试／睡眠）。 */
+    readonly fetchOpts?: FetchOptions;
+    /** 单次 upsert（缺省走 `upsertTrains`；测试给挡板，**不许打真接口**）。 */
+    readonly upsert?: (resList: readonly XunjiResItem[], clientRequestId: string) => Promise<UpsertOutcome>;
+    /** 缺省 upsert 的透传件（KEY／传输／超时／重试／睡眠）。 */
+    readonly upsertOpts?: UpsertOptions;
+    /** 只组请求不调接口（老 `dry_run` 同述；传输 0 次）。 */
+    readonly dryRun?: boolean;
+    /** 缺 title 策略（缺省 `fail`，老签名同值）。 */
+    readonly missing?: OverlayMissing;
+}
+/** title → localid 全表（同 title 多条全留；修老 `overlay.py:80` 推导式丢 localid）。 */
+export declare function groupLocalidsByTitle(trains: readonly {
+    readonly title: unknown;
+    readonly localid: unknown;
+}[]): Map<string, number[]>;
+/** 一条 session 的叠加结果（老单条目改逐条：同 title 多 localid 才写得下）。 */
+export interface OverlayMatch {
+    readonly session_label: string;
+    readonly localid: number;
+    readonly ok: boolean;
+    readonly client_request_id: string;
+    /** 成功时为训记正文／dry-run 摘要；失败时为 `{ err: true, …失败读数 }`。 */
+    readonly resp: unknown;
+}
+/** 一天的叠加读数（老 `overlay_day_plan` 八键 ＋ 失败分类 `failure` 供退出码分流）。 */
+export interface OverlayDayResult {
+    readonly date: string;
+    readonly session_count: number;
+    readonly trains_count: number;
+    readonly matched: readonly OverlayMatch[];
+    readonly missing_in_xunji: readonly string[];
+    /** 还有 localid 没被消耗的 title（含从未匹配的；耗尽的不在内）。 */
+    readonly extra_in_xunji: readonly string[];
+    readonly ok_count: number;
+    readonly fail_count: number;
+    /** 人话失败（null＝成功；`failure` 空＋`err` 有＝用法错那支）。 */
+    readonly err: string | null;
+    readonly note: string | null;
+    /** 拉取／upsert 失败的分类（供 `exitForFailure`；成功与用法错时为 null）。 */
+    readonly failure: XunjiFailure | null;
+}
+/** 叠加一天：拉训记 → 读本仓 → 按 title 对账 → 单次 upsert（调用方保证日期形状）。 */
+export declare function overlayDayPlan(dateStr: string, deps?: OverlayDeps): Promise<OverlayDayResult>;
+type Values = Readonly<Record<string, string | boolean | readonly string[]>>;
+/** `overlay-plan` 子命令的分派（`run.ts` 调；`missing=fail` 的缺 title 走 1）。 */
+export declare function runOverlayPlanCommand(sub: XunjiSubcommand, values: Values, deps?: OverlayDeps): Promise<XunjiRun>;
+export {};
+//# sourceMappingURL=overlay-plan.d.ts.map

package/dist/xunji/overlay-plan.d.ts.map

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

package/dist/xunji/overlay-plan.js

@@ -0,0 +1,145 @@
+/** 计划叠加：用本仓计划覆盖训记某天的训练（老 `xunji_bridge/overlay.py`，代码新写）。
+ *
+ * 口径（逐条对老）：
+ * - 先拉训记当天 list（只拿 title→localid，不取 start/end），再读本仓当天 sessions，按 title 对账；
+ * - 构造 `res[]`：localid 用训记已有的，start＝end＝0（覆盖＝新建语义，老 `:116-120`）；
+ * - 单次 upsert 推全部（训记单次最多 4 条，老 `:161-174`），幂等键 `overlay_{date}_{uuid8}`；
+ * - `missing` 缺省 `fail`（有缺即报 err 不推，老 `:123-138`），`skip` 只推匹配的（老 `:140-143`）；
+ * - 拉取失败即带 err 回（老 `:66-78`）；`missing=fail` 的 err 走用法错 1（老 `__main__:230-233`），
+ *   拉取／upsert 失败走 `exitMap`（无 KEY→2，401／403→3）。
+ *
+ * 修掉的老缺陷（不照抄）：老 `overlay.py:80` 的推导式 `{t["title"]: t["localid"]}`
+ * 把同 title 的多条压成一条，后面的 localid 静默丢失——新仓按 title 分组收全部 localid，
+ * sessions 按序逐条消耗（同 label 的第 2 个 session 拿第 2 个 localid），耗不完的 title
+ * 留在 `extra_in_xunji`，每条已消耗的 localid 都写在 `matched` 里（逐 session 一项）。
+ */
+import { randomUUID } from 'node:crypto';
+import { fetchTrains, parseTrains } from './fetch.js';
+import { sessionToResItem } from './request.js';
+import { upsertTrains } from './upsert.js';
+import { dateProblem, resolveDayPlan } from './planSource.js';
+import { exitForFailure } from './exitMap.js';
+import { XUNJI_EXIT_CODES } from './subcommands.js';
+/** title → localid 全表（同 title 多条全留；修老 `overlay.py:80` 推导式丢 localid）。 */
+export function groupLocalidsByTitle(trains) {
+    const out = new Map();
+    for (const t of trains) {
+        if (typeof t.title !== 'string' || t.title === '')
+            continue;
+        if (typeof t.localid !== 'number' || !Number.isInteger(t.localid))
+            continue;
+        const list = out.get(t.title);
+        if (list !== undefined)
+            list.push(t.localid);
+        else
+            out.set(t.title, [t.localid]);
+    }
+    return out;
+}
+function base(dateStr, sessionCount, trainsCount) {
+    return { date: dateStr, session_count: sessionCount, trains_count: trainsCount };
+}
+/** 叠加一天：拉训记 → 读本仓 → 按 title 对账 → 单次 upsert（调用方保证日期形状）。 */
+export async function overlayDayPlan(dateStr, deps = {}) {
+    const missingOpt = deps.missing ?? 'fail';
+    const fetchDay = deps.fetchDay ?? ((d) => fetchTrains(d, { ...deps.fetchOpts, includeFullData: true }));
+    const outcome = await fetchDay(dateStr);
+    if (!outcome.ok) {
+        const err = '拉取失败（没拉到）：' + outcome.failure.message;
+        return { ...base(dateStr, 0, 0), matched: [], missing_in_xunji: [], extra_in_xunji: [], ok_count: 0, fail_count: 1, err, note: null, failure: outcome.failure };
+    }
+    const trains = parseTrains(outcome.response);
+    const queues = groupLocalidsByTitle(trains);
+    const day = (deps.planSource ?? resolveDayPlan)(dateStr);
+    if (!day.found) {
+        return { ...base(dateStr, 0, trains.length), matched: [], missing_in_xunji: [], extra_in_xunji: [...queues.keys()], ok_count: 0, fail_count: 0, err: day.reason, note: null, failure: null };
+    }
+    const sessions = day.sessions;
+    if (sessions.length === 0) {
+        return {
+            ...base(dateStr, 0, trains.length), matched: [], missing_in_xunji: [], extra_in_xunji: [...queues.keys()],
+            ok_count: 0, fail_count: 0, err: null, note: '卡路里当天无 session（可能休息日或计划未配置），无可覆盖', failure: null,
+        };
+    }
+    const resList = [];
+    const consumed = [];
+    const missingInXunji = [];
+    for (const s of sessions) {
+        const label = s.session_label ?? '';
+        const localid = queues.get(label)?.shift();
+        if (localid === undefined) {
+            missingInXunji.push(label);
+            continue;
+        }
+        resList.push({ ...sessionToResItem(dateStr, s), localid });
+        consumed.push({ session_label: label, localid });
+    }
+    const extra = [...queues.entries()].filter(([, q]) => q.length > 0).map(([t]) => t);
+    if (missingInXunji.length > 0 && missingOpt === 'fail') {
+        return {
+            ...base(dateStr, sessions.length, trains.length), matched: [], missing_in_xunji: missingInXunji, extra_in_xunji: extra,
+            ok_count: 0, fail_count: 0, err: '卡路里有但训记没：' + missingInXunji.join('、') + '（missing=fail 报错退出）', note: null, failure: null,
+        };
+    }
+    if (resList.length === 0) {
+        return {
+            ...base(dateStr, sessions.length, trains.length), matched: [], missing_in_xunji: missingInXunji, extra_in_xunji: extra,
+            ok_count: 0, fail_count: 0, err: null, note: '无可推送的 session（全部 missing 或空）', failure: null,
+        };
+    }
+    const clientRequestId = 'overlay_' + dateStr + '_' + randomUUID().replace(/-/g, '').slice(0, 8);
+    if (deps.dryRun === true) {
+        const matched = consumed.map((c) => ({
+            session_label: c.session_label, localid: c.localid, ok: true, client_request_id: clientRequestId,
+            resp: { dry_run: true, client_request_id: clientRequestId, res_count: resList.length },
+        }));
+        return {
+            ...base(dateStr, sessions.length, trains.length), matched, missing_in_xunji: missingInXunji, extra_in_xunji: extra,
+            ok_count: matched.length, fail_count: 0, err: null, note: null, failure: null,
+        };
+    }
+    const callUpsert = deps.upsert ?? ((list, cid) => upsertTrains(list, { ...deps.upsertOpts, clientRequestId: cid }));
+    const up = await callUpsert(resList, clientRequestId);
+    const resp = up.ok ? up.response : { err: true, ...up.failure, attempts: up.attempts };
+    const matched = consumed.map((c) => ({ session_label: c.session_label, localid: c.localid, ok: up.ok, client_request_id: clientRequestId, resp }));
+    return {
+        ...base(dateStr, sessions.length, trains.length), matched, missing_in_xunji: missingInXunji, extra_in_xunji: extra,
+        ok_count: up.ok ? matched.length : 0, fail_count: up.ok ? 0 : 1, err: null, note: null, failure: up.ok ? null : up.failure,
+    };
+}
+/** `overlay-plan` 子命令的分派（`run.ts` 调；`missing=fail` 的缺 title 走 1）。 */
+export async function runOverlayPlanCommand(sub, values, deps = {}) {
+    const refuse = (why, data) => ({
+        subcommand: 'overlay-plan', code: XUNJI_EXIT_CODES.error, message: why, data, stderr: why + '（用法：' + sub.usage + '）',
+    });
+    const date = values['--date'];
+    if (typeof date !== 'string')
+        return refuse('缺参数：--date', { usage: sub.usage });
+    const bad = dateProblem(date);
+    if (bad !== null)
+        return refuse(bad, { usage: sub.usage });
+    const missingRaw = values['--missing'];
+    if (missingRaw !== undefined && missingRaw !== 'fail' && missingRaw !== 'skip') {
+        return refuse('--missing 只能是 fail|skip（实际：' + String(missingRaw) + '）', { usage: sub.usage });
+    }
+    const result = await overlayDayPlan(date, {
+        ...deps, dryRun: values['--dry-run'] === true, missing: missingRaw === 'skip' ? 'skip' : 'fail',
+    });
+    if (result.failure !== null) {
+        const line = result.err ?? '叠加失败';
+        return { subcommand: 'overlay-plan', code: exitForFailure(result.failure), message: line, data: result, stderr: line };
+    }
+    if (result.err !== null) {
+        return { subcommand: 'overlay-plan', code: XUNJI_EXIT_CODES.error, message: result.err, data: result, stderr: result.err };
+    }
+    if (result.fail_count > 0) {
+        const line = '叠加失败：' + date + ' upsert 未成功';
+        return { subcommand: 'overlay-plan', code: XUNJI_EXIT_CODES.api, message: line, data: result, stderr: line };
+    }
+    return {
+        subcommand: 'overlay-plan', code: XUNJI_EXIT_CODES.ok,
+        message: '叠加成功：' + date + ' ' + result.ok_count + ' 条（训记 ' + result.trains_count + ' 条里对上 ' + result.matched.length + ' 条）',
+        data: result, stderr: null,
+    };
+}
+//# sourceMappingURL=overlay-plan.js.map

package/dist/xunji/overlay-plan.js.map

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

package/dist/xunji/planSource.d.ts

@@ -0,0 +1,40 @@
+/** `push-plan --date` 的取数口：日期 → 当天的 sessions（读卡路里库，只读）。
+ *
+ * 口径：
+ * - 只读打开（`db/readonly.ts` 的 `openDbReadOnly`：不建表、不迁移；与 `cli/cmd_read.ts:97` 同法）；
+ * - 库路径＝`SKILLS_DB_PATH` 下的 `calorie_data.db`（`paths.ts` 的 `resolveDbDir`＋`DB_FILENAME`；
+ *   不用 `resolveDbPath`——它会 `mkdir`，只读口不许有落盘副作用）；
+ * - 日期 →（周，日）走渲染门的 `weekOfDate`（新仓口径；老 `calc_plan_week` 的
+ *   “超总周数循环”不照抄——新仓 `buildPlanView` 同样不过滤循环周，
+ *   对不上就当这天没排练）；
+ * - 会读 `workout_plans` 全表再按（周，日）过滤（`workout` 门的 `getPlan` 只读口；
+ *   R1 收口 #613：跨能力引用一律走能力门 `workout/index.js#getPlan` 与
+ *   `render/index.js#weekOfDate`，不深引对方内部件）；
+ * - 存在性预检：`SKILLS_DB_PATH` 未设／库文件不在／打开失败一律回 `found: false` 带人话原因，
+ *   不抛错（调用方按退出码 1 报；“失败不许静默吞”）；
+ * - “无任何计划”（无配置且无会话）与“计划缺开始日期”同样回 `found: false`；
+ *   “这天没排练”（休息日／计划未开始／超周）回 `found: true, sessions: []`——调用方按老
+ *   `push.py:135-143` 回 `session_count: 0` ＋ note，退出 0。
+ */
+import type { PushSession } from './push.js';
+/** 取数结局：`found: true` 即有明确答案（含“这天没排练”的空表）；否则看 `reason` 报 1。 */
+export type DayPlan = {
+    readonly found: true;
+    readonly sessions: readonly PushSession[];
+    readonly planWeek: number;
+    readonly dayOfWeek: number;
+} | {
+    readonly found: false;
+    readonly reason: string;
+};
+/** 日期入参的取值面（测试从这里换库文件；不许打生产库）。 */
+export interface ResolveDayPlanOpts {
+    readonly dbFile?: string;
+}
+/** 日期形状检查：`YYYY-MM-DD` 且为真实日历日；null＝通过，否则为人话原因。 */
+export declare function dateProblem(v: string): string | null;
+/** 取某天的 sessions（只读；任何读不出都回 `found: false`，不抛）。 */
+export declare function resolveDayPlan(dateStr: string, opts?: ResolveDayPlanOpts): DayPlan;
+/** 取数口的函数形状（`run.ts` 的注入缝与测试挡板共用这一个类型）。 */
+export type DayPlanSource = (dateStr: string) => DayPlan;
+//# sourceMappingURL=planSource.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"planSource.d.ts","sourceRoot":"","sources":["../../src/xunji/planSource.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAQH,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAE7C,+DAA+D;AAC/D,MAAM,MAAM,OAAO,GACf;IAAE,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,SAAS,WAAW,EAAE,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAC1H;IAAE,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvD,kCAAkC;AAClC,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;CAC1B;AAED,mDAAmD;AACnD,wBAAgB,WAAW,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAQpD;AAED,mDAAmD;AACnD,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,kBAAuB,GAAG,OAAO,CAoCtF;AAED,2CAA2C;AAC3C,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC"}

package/dist/xunji/planSource.js

@@ -0,0 +1,78 @@
+/** `push-plan --date` 的取数口：日期 → 当天的 sessions（读卡路里库，只读）。
+ *
+ * 口径：
+ * - 只读打开（`db/readonly.ts` 的 `openDbReadOnly`：不建表、不迁移；与 `cli/cmd_read.ts:97` 同法）；
+ * - 库路径＝`SKILLS_DB_PATH` 下的 `calorie_data.db`（`paths.ts` 的 `resolveDbDir`＋`DB_FILENAME`；
+ *   不用 `resolveDbPath`——它会 `mkdir`，只读口不许有落盘副作用）；
+ * - 日期 →（周，日）走渲染门的 `weekOfDate`（新仓口径；老 `calc_plan_week` 的
+ *   “超总周数循环”不照抄——新仓 `buildPlanView` 同样不过滤循环周，
+ *   对不上就当这天没排练）；
+ * - 会读 `workout_plans` 全表再按（周，日）过滤（`workout` 门的 `getPlan` 只读口；
+ *   R1 收口 #613：跨能力引用一律走能力门 `workout/index.js#getPlan` 与
+ *   `render/index.js#weekOfDate`，不深引对方内部件）；
+ * - 存在性预检：`SKILLS_DB_PATH` 未设／库文件不在／打开失败一律回 `found: false` 带人话原因，
+ *   不抛错（调用方按退出码 1 报；“失败不许静默吞”）；
+ * - “无任何计划”（无配置且无会话）与“计划缺开始日期”同样回 `found: false`；
+ *   “这天没排练”（休息日／计划未开始／超周）回 `found: true, sessions: []`——调用方按老
+ *   `push.py:135-143` 回 `session_count: 0` ＋ note，退出 0。
+ */
+import { existsSync } from 'node:fs';
+import { join } from 'node:path';
+import { DB_FILENAME, resolveDbDir } from '../paths.js';
+import { openDbReadOnly } from '../db/readonly.js';
+import { getPlan } from '../workout/index.js';
+import { weekOfDate } from '../render/index.js';
+/** 日期形状检查：`YYYY-MM-DD` 且为真实日历日；null＝通过，否则为人话原因。 */
+export function dateProblem(v) {
+    if (!/^\d{4}-\d{2}-\d{2}$/.test(v))
+        return '日期须为 YYYY-MM-DD（实际：' + v + '）';
+    const [y, m, d] = v.split('-').map(Number);
+    const dt = new Date(Date.UTC(y, m - 1, d));
+    if (dt.getUTCFullYear() !== y || dt.getUTCMonth() !== m - 1 || dt.getUTCDate() !== d) {
+        return '日期不是真实日历日（实际：' + v + '）';
+    }
+    return null;
+}
+/** 取某天的 sessions（只读；任何读不出都回 `found: false`，不抛）。 */
+export function resolveDayPlan(dateStr, opts = {}) {
+    let dbFile = opts.dbFile;
+    if (dbFile === undefined) {
+        try {
+            dbFile = join(resolveDbDir(), DB_FILENAME);
+        }
+        catch (e) {
+            return { found: false, reason: e instanceof Error ? e.message : String(e) };
+        }
+    }
+    if (!existsSync(dbFile)) {
+        return { found: false, reason: '卡路里库文件不在（' + dbFile + '）：先确认 SKILLS_DB_PATH 指对，再看库在不在' };
+    }
+    let db = null;
+    try {
+        const opened = openDbReadOnly(dbFile);
+        db = opened;
+        const plan = getPlan(opened);
+        if (!plan.config && plan.sessions.length === 0) {
+            return { found: false, reason: '无训练计划（先定训练计划）' };
+        }
+        const start = plan.config?.start_date ?? null;
+        if (!start) {
+            return { found: false, reason: '计划缺开始日期，无法定位周次' };
+        }
+        const { week, dow } = weekOfDate(start, dateStr);
+        const sessions = plan.sessions.filter((s) => s.week_number === week && s.day_of_week === dow);
+        return { found: true, sessions, planWeek: week, dayOfWeek: dow };
+    }
+    catch (e) {
+        return { found: false, reason: '读训练计划失败：' + (e instanceof Error ? e.message : String(e)) };
+    }
+    finally {
+        try {
+            db?.close();
+        }
+        catch {
+            /* 关库失败不掩盖取数结论 */
+        }
+    }
+}
+//# sourceMappingURL=planSource.js.map

package/dist/xunji/planSource.js.map

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

package/dist/xunji/push.d.ts

@@ -0,0 +1,55 @@
+/** 推一天的训练计划（老 `xunji_bridge/push.py:push_day_plan`，`:113-197`，代码新写）。
+ *
+ * 行为（逐条对老）：
+ * - 入参是**日期 ＋ 当天的 sessions**（读库取天是 `planSource.ts` 的活；本件只转＋推）；
+ * - 无 session 即回 `session_count: 0` ＋ `note`（老 `:135-143`），不算失败；
+ * - 每个 session 一个 `client_request_id`：`{date}_{label}_{uuid8}`（老 `:151-153`，
+ *   语义前缀便查日志、短 uuid 防训记去重）；
+ * - 逐个 upsert，每次调用前过 45 秒限频门（`rateLimit.ts`；老 `:156-158` 的“睡够再调”保留，
+ *   跨段／跨天一视同仁是本票修掉的那条，见该件决议）；
+ * - 汇总 `{date, session_count, results, ok_count, fail_count, verify_note}`（老 `:187-197`）；
+ * - `verified` 只在响应里真看得到 train 才 true（训记 v2 响应缺陷，老 `:173-184` 同述，
+ *   真值以 `fetch --full` 为准，归 #608）；
+ * - 失败不吞：每条结果带原响应／结构化失败，`fail_count` 进退出码（见 `exitMap.ts`；
+ *   老 `sync_plan.py:337-339` “只打印不进退出码”是缺陷，不照抄）。
+ */
+import type { XunjiResItem } from './request.js';
+import type { RateLimiterDeps } from './rateLimit.js';
+import type { UpsertOptions, UpsertOutcome } from './upsert.js';
+import type { PlanSessionRow } from '../workout/index.js';
+/** `pushDayPlan` 要的 session 形状（`planSource.ts` 给的就是这形；`movements` 缺时当空表）。 */
+export type PushSession = Pick<PlanSessionRow, 'session_label' | 'movements'>;
+/** 一个 session 的推送结果（老 `:179-185` 五键；`resp` 失败时为结构化失败，不吞）。 */
+export interface PushSessionResult {
+    readonly session_label: string;
+    readonly client_request_id: string;
+    readonly ok: boolean;
+    /** 响应里真看得到 train（老 `:183`）；dry-run 时为 false（没调接口，不断言写入）。 */
+    readonly verified: boolean;
+    /** 成功时为训记正文／dry-run 摘要；失败时为 `{ err: true, …失败读数 }`。 */
+    readonly resp: unknown;
+}
+/** 一天的推送汇总（老 `:187-197`；`note` 只在无 session 时出现）。 */
+export interface PushDaySummary {
+    readonly date: string;
+    readonly session_count: number;
+    readonly results: readonly PushSessionResult[];
+    readonly ok_count: number;
+    readonly fail_count: number;
+    readonly verify_note: string;
+    readonly note?: string;
+}
+/** `pushDayPlan` 的可注入件（测试挡板从这里进；生产全缺省）。 */
+export interface PushDayDeps {
+    /** 只转不调（仍过转换与汇总；不限频、不记限频，老 `push.py:156` 同述）。 */
+    readonly dryRun?: boolean;
+    /** upsert 调用（缺省走 `upsertTrains`；测试给挡板，**不许打真接口**）。 */
+    readonly upsert?: (resItem: XunjiResItem, clientRequestId: string) => Promise<UpsertOutcome>;
+    /** upsert 缺省路径的透传件（`key／transport／timeoutMs／maxRetries／sleep`，见 `UpsertOptions`）。 */
+    readonly upsertOpts?: UpsertOptions;
+    /** 限频门的可注入件（时钟／睡眠／状态文件，见 `RateLimiterDeps`）。 */
+    readonly rateLimit?: RateLimiterDeps;
+}
+/** 推一天（`dateStr` 原样进 `res[].datestr` 与幂等键前缀，不做任何日期换算）。 */
+export declare function pushDayPlan(dateStr: string, sessions: readonly PushSession[], deps?: PushDayDeps): Promise<PushDaySummary>;
+//# sourceMappingURL=push.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"push.d.ts","sourceRoot":"","sources":["../../src/xunji/push.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEtD,OAAO,KAAK,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAE1D,6EAA6E;AAC7E,MAAM,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,eAAe,GAAG,WAAW,CAAC,CAAC;AAE9E,6DAA6D;AAC7D,MAAM,WAAW,iBAAiB;IAChC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,4DAA4D;IAC5D,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,uDAAuD;IACvD,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACxB;AAED,oDAAoD;AACpD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAC/C,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,2CAA2C;AAC3C,MAAM,WAAW,WAAW;IAC1B,iDAAiD;IACjD,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,sDAAsD;IACtD,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC;IAC7F,qFAAqF;IACrF,QAAQ,CAAC,UAAU,CAAC,EAAE,aAAa,CAAC;IACpC,gDAAgD;IAChD,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,CAAC;CACtC;AAeD,0DAA0D;AAC1D,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,WAAW,EAAE,EAAE,IAAI,GAAE,WAAgB,GAAG,OAAO,CAAC,cAAc,CAAC,CAoCpI"}