skill-calorie 0.2.2 → 0.2.4

package/dist/xunji/push.js

@@ -0,0 +1,69 @@
+/** 推一天的训练计划（老 `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 { randomUUID } from 'node:crypto';
+import { sessionToResItem } from './request.js';
+import { createRateLimiter } from './rateLimit.js';
+import { upsertTrains } from './upsert.js';
+/** 响应里有没有 train（老 `:176-184`：`res.trains` 非空数组才算强证据）。 */
+function hasTrains(response) {
+    if (typeof response !== 'object' || response === null)
+        return false;
+    const res = response.res;
+    if (typeof res !== 'object' || res === null)
+        return false;
+    const trains = res.trains;
+    return Array.isArray(trains) && trains.length > 0;
+}
+const VERIFY_NOTE = '响应里 verified=True 的表示训记已显式回执；verified=False 的实际可能已写入，' +
+    '但训记 v2 接口响应缺陷导致 trains 为空——用 fetch --full 二次确认（归 #608）';
+/** 推一天（`dateStr` 原样进 `res[].datestr` 与幂等键前缀，不做任何日期换算）。 */
+export async function pushDayPlan(dateStr, sessions, deps = {}) {
+    const dryRun = deps.dryRun ?? false;
+    if (sessions.length === 0) {
+        return {
+            date: dateStr,
+            session_count: 0,
+            results: [],
+            ok_count: 0,
+            fail_count: 0,
+            verify_note: VERIFY_NOTE,
+            note: '无 session（可能休息日或计划未配置）',
+        };
+    }
+    const limiter = createRateLimiter(deps.rateLimit ?? {});
+    const callUpsert = deps.upsert ??
+        ((resItem, clientRequestId) => upsertTrains([resItem], { ...deps.upsertOpts, clientRequestId, dryRun }));
+    const results = [];
+    let ok = 0;
+    let fail = 0;
+    for (const s of sessions) {
+        const label = s.session_label ?? '';
+        const clientRequestId = dateStr + '_' + label + '_' + randomUUID().replace(/-/g, '').slice(0, 8);
+        await limiter.guard(dryRun);
+        const resItem = sessionToResItem(dateStr, s);
+        const outcome = await callUpsert(resItem, clientRequestId);
+        if (outcome.ok) {
+            ok += 1;
+            results.push({ session_label: label, client_request_id: clientRequestId, ok: true, verified: dryRun ? false : hasTrains(outcome.response), resp: outcome.response });
+        }
+        else {
+            fail += 1;
+            results.push({ session_label: label, client_request_id: clientRequestId, ok: false, verified: false, resp: { err: true, ...outcome.failure, attempts: outcome.attempts } });
+        }
+    }
+    return { date: dateStr, session_count: sessions.length, results, ok_count: ok, fail_count: fail, verify_note: VERIFY_NOTE };
+}
+//# sourceMappingURL=push.js.map

package/dist/xunji/push.js.map

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

package/dist/xunji/rateLimit.d.ts

@@ -0,0 +1,44 @@
+/** 推送限频：45 秒常量（唯一定义地）＋ 窗口判定 ＋ 跨进程节流器。
+ *
+ * 老口径（只读参照 `xunji_bridge/push.py:29`、`push.py:156-158`、`run_sync.py:178-190`）：
+ * - 常量 `RATE_LIMIT_SECONDS = 45`（老 `push.py:29`，注释“训记写 API 限频要求（应用层策略）”）；
+ * - 老实现只守“同一天内第 2 个 session 起”（`push.py:156-158` 的 `if i > 0`），跨天不守
+ *   （`run-sync` 逐天起子进程，天与天之间无 sleep）、`--dry-run` 不守、`overlay` 不守。
+ *
+ * 本票决议（票面点名“本票内定并写进口径”）：
+ * - **按段逐个守**：每次 upsert 调用前都看“距上次 upsert 过去了多久”，窗口内先睡够再调
+ *   （老行为“睡够再调”保留，见 `push.py:157-158`；`--dry-run` 仍不守不记，老 `:156` 同述）；
+ * - **跨天／跨进程也守**（把“跨天不守”当缺陷修掉）：上次调用时刻落在盘上状态文件里，
+ *   不同进程的两次 `push-plan` 照样排开（老读侧已有同法先例：`auth.py:40` 的
+ *   `~/.mavis/xunji_bridge_rate.json` 跨进程状态）；
+ * - 时钟／睡眠／状态文件**全可注入**：生产走真实时间与 `~/.mavis/xunji_push_rate.json`，
+ *   测试一律注入（不许睡真 45 秒，更不许碰真机状态文件）。
+ */
+/** 训记写接口限频窗口（秒）。老 `push.py:29` 同值；全模块只此一处，别处引用。 */
+export declare const RATE_LIMIT_SECONDS = 45;
+/** 缺省状态文件：`~/.mavis/` 下与读侧分开的一份（读侧是 `xunji_bridge_rate.json`，`auth.py:40`）。 */
+export declare function defaultRateLimitPath(): string;
+/** 窗口内还差多少毫秒（纯函数）：无历史／已出窗返 0，窗内返剩余量（>0）。 */
+export declare function rateLimitWaitMs(lastCallMs: number | null, nowMs: number, windowSeconds?: number): number;
+/** 节流器的可注入件（测试挡板从这里进；生产缺省见 `createRateLimiter`）。 */
+export interface RateLimiterDeps {
+    /** 现在（毫秒，缺省 `Date.now`）。 */
+    readonly now?: () => number;
+    /** 睡眠（毫秒，缺省真实 sleep）。 */
+    readonly sleep?: (ms: number) => Promise<void>;
+    /** 状态文件路径（缺省 `defaultRateLimitPath()`；传 null 即只记内存、不落盘）。 */
+    readonly statePath?: string | null;
+}
+/** 一次 upsert 调用前的限频门：窗内先睡够（返回睡了多少毫秒），并记下本次时刻。 */
+export interface RateLimiter {
+    /** 睡够再走；`dryRun` 时直接返 0（不睡不记，老 `push.py:156` 同述）。 */
+    guard(dryRun: boolean): Promise<{
+        waitedMs: number;
+        stateSaved: boolean;
+    }>;
+}
+/** 建节流器（`windowSeconds` 只供测试加速窗口换算；生产一律缺省 45 秒）。 */
+export declare function createRateLimiter(deps?: RateLimiterDeps, windowSeconds?: number): RateLimiter;
+/** 状态文件是否存在（测试断言“落盘了没有”用；生产不用它做判定）。 */
+export declare function rateLimitStateExists(statePath: string): boolean;
+//# sourceMappingURL=rateLimit.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../../src/xunji/rateLimit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAMH,mDAAmD;AACnD,eAAO,MAAM,kBAAkB,KAAK,CAAC;AAErC,+EAA+E;AAC/E,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,4CAA4C;AAC5C,wBAAgB,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,aAAa,GAAE,MAA2B,GAAG,MAAM,CAI5H;AAED,oDAAoD;AACpD,MAAM,WAAW,eAAe;IAC9B,4BAA4B;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,yBAAyB;IACzB,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,4DAA4D;IAC5D,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAkCD,iDAAiD;AACjD,MAAM,WAAW,WAAW;IAC1B,qDAAqD;IACrD,KAAK,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO,CAAC;QAAE,QAAQ,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC,CAAC;CAC5E;AAED,oDAAoD;AACpD,wBAAgB,iBAAiB,CAAC,IAAI,GAAE,eAAoB,EAAE,aAAa,GAAE,MAA2B,GAAG,WAAW,CAyBrH;AAED,uCAAuC;AACvC,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE/D"}

package/dist/xunji/rateLimit.js

@@ -0,0 +1,99 @@
+/** 推送限频：45 秒常量（唯一定义地）＋ 窗口判定 ＋ 跨进程节流器。
+ *
+ * 老口径（只读参照 `xunji_bridge/push.py:29`、`push.py:156-158`、`run_sync.py:178-190`）：
+ * - 常量 `RATE_LIMIT_SECONDS = 45`（老 `push.py:29`，注释“训记写 API 限频要求（应用层策略）”）；
+ * - 老实现只守“同一天内第 2 个 session 起”（`push.py:156-158` 的 `if i > 0`），跨天不守
+ *   （`run-sync` 逐天起子进程，天与天之间无 sleep）、`--dry-run` 不守、`overlay` 不守。
+ *
+ * 本票决议（票面点名“本票内定并写进口径”）：
+ * - **按段逐个守**：每次 upsert 调用前都看“距上次 upsert 过去了多久”，窗口内先睡够再调
+ *   （老行为“睡够再调”保留，见 `push.py:157-158`；`--dry-run` 仍不守不记，老 `:156` 同述）；
+ * - **跨天／跨进程也守**（把“跨天不守”当缺陷修掉）：上次调用时刻落在盘上状态文件里，
+ *   不同进程的两次 `push-plan` 照样排开（老读侧已有同法先例：`auth.py:40` 的
+ *   `~/.mavis/xunji_bridge_rate.json` 跨进程状态）；
+ * - 时钟／睡眠／状态文件**全可注入**：生产走真实时间与 `~/.mavis/xunji_push_rate.json`，
+ *   测试一律注入（不许睡真 45 秒，更不许碰真机状态文件）。
+ */
+import { homedir } from 'node:os';
+import { dirname, join } from 'node:path';
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
+/** 训记写接口限频窗口（秒）。老 `push.py:29` 同值；全模块只此一处，别处引用。 */
+export const RATE_LIMIT_SECONDS = 45;
+/** 缺省状态文件：`~/.mavis/` 下与读侧分开的一份（读侧是 `xunji_bridge_rate.json`，`auth.py:40`）。 */
+export function defaultRateLimitPath() {
+    return join(homedir(), '.mavis', 'xunji_push_rate.json');
+}
+/** 窗口内还差多少毫秒（纯函数）：无历史／已出窗返 0，窗内返剩余量（>0）。 */
+export function rateLimitWaitMs(lastCallMs, nowMs, windowSeconds = RATE_LIMIT_SECONDS) {
+    if (lastCallMs === null)
+        return 0;
+    const wait = lastCallMs + windowSeconds * 1000 - nowMs;
+    return wait > 0 ? wait : 0;
+}
+/** 读上次调用时刻（毫秒；文件不在／坏内容一律当“无历史”，不抛——坏文件不许堵死推送）。 */
+function readLastCallMs(statePath) {
+    let raw;
+    try {
+        raw = readFileSync(statePath, 'utf8');
+    }
+    catch {
+        return null;
+    }
+    try {
+        const parsed = JSON.parse(raw);
+        const iso = parsed?.last_upsert_iso;
+        if (typeof iso !== 'string' || iso === '')
+            return null;
+        const ms = Date.parse(iso);
+        return Number.isFinite(ms) ? ms : null;
+    }
+    catch {
+        return null;
+    }
+}
+/** 写本次调用时刻（原子写：先写 `.tmp` 再改名，老 `auth.py:218-222` 同法；写坏不抛，由调用方记备注）。 */
+function writeLastCallMs(statePath, nowMs) {
+    try {
+        mkdirSync(dirname(statePath), { recursive: true });
+        const tmp = statePath + '.tmp';
+        writeFileSync(tmp, JSON.stringify({ last_upsert_iso: new Date(nowMs).toISOString() }, null, 2), 'utf8');
+        renameSync(tmp, statePath);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/** 建节流器（`windowSeconds` 只供测试加速窗口换算；生产一律缺省 45 秒）。 */
+export function createRateLimiter(deps = {}, windowSeconds = RATE_LIMIT_SECONDS) {
+    const now = deps.now ?? Date.now;
+    const sleep = deps.sleep ??
+        ((ms) => new Promise((resolve) => { setTimeout(resolve, ms); }));
+    const statePath = deps.statePath === undefined ? defaultRateLimitPath() : deps.statePath;
+    let memLastMs = null;
+    let memUsed = false;
+    return {
+        async guard(dryRun) {
+            if (dryRun)
+                return { waitedMs: 0, stateSaved: true };
+            const at = now();
+            const last = statePath === null ? (memUsed ? memLastMs : null) : (readLastCallMs(statePath) ?? memLastMs);
+            const wait = rateLimitWaitMs(last, at, windowSeconds);
+            if (wait > 0)
+                await sleep(wait);
+            const stamped = now();
+            if (statePath === null) {
+                memLastMs = stamped;
+                memUsed = true;
+                return { waitedMs: wait, stateSaved: true };
+            }
+            memLastMs = stamped;
+            return { waitedMs: wait, stateSaved: writeLastCallMs(statePath, stamped) };
+        },
+    };
+}
+/** 状态文件是否存在（测试断言“落盘了没有”用；生产不用它做判定）。 */
+export function rateLimitStateExists(statePath) {
+    return existsSync(statePath);
+}
+//# sourceMappingURL=rateLimit.js.map

package/dist/xunji/rateLimit.js.map

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

package/dist/xunji/request.d.ts

@@ -0,0 +1,48 @@
+/** 推送请求形状：训练 session → 训记 `res[]` 项 ＋ upsert 包体组装。
+ *
+ * 口径（严格模仿老实现，代码新写；只读参照 `xunji_bridge/push.py:81-110`、`upsert.py:90-96`）：
+ * - `res[].datestr` 用传入的 `YYYY-MM-DD` 原样（**不转时间戳**）；
+ * - `localid = 0`（新建；更新语义是 `overlay-plan` 那条的活，归 #610）；
+ * - `start ＝ end ＝ 0`（避训记 BUG，老 `push.py:84-89` 注释同述）；
+ * - `movements[].name` **原样上报**：推送前**不校验**动作库（老 `push.py` 不 import `catalog`；
+ *   “先审计”是调用链的第一步，不是推送本身的能力）；
+ * - 每条 set 写死 `done: false`，重量／次数／单位各自标量化（缺省 `"0"`／`"0"`／`"kg"`，
+ *   老 `push.py:95-100`；`weight` 缺时回退读 `load`，兼容两种库内写法）。
+ *
+ * 本件是纯函数：不读库、不调网、不读时钟——同输入必得同输出（挡板断言直接调它）。
+ */
+import type { PlanSessionRow } from '../workout/index.js';
+/** 训记 `res[]` 里一条 set 的形状（上报口径，老 `push.py:95-100`）。 */
+export interface XunjiSet {
+    readonly done: boolean;
+    readonly weight: string;
+    readonly unit: string;
+    readonly reps: string;
+}
+/** 训记 `res[]` 里一个 movement 的形状（上报口径：只留 `name ＋ sets` 两键）。 */
+export interface XunjiMovement {
+    readonly name: string;
+    readonly sets: readonly XunjiSet[];
+}
+/** 训记 `res[]` 的一项（一次推送的最小单位，老 `push.py:103-110` 六键）。 */
+export interface XunjiResItem {
+    readonly datestr: string;
+    readonly localid: number;
+    readonly title: string;
+    readonly start: number;
+    readonly end: number;
+    readonly movements: readonly XunjiMovement[];
+}
+/** upsert 包体（老 `upsert.py:90-96` 五键；`res` 透传，本件不改它一字）。 */
+export interface UpsertPayload {
+    readonly schema_version: 'train_open_api_v2';
+    readonly client_request_id: string;
+    readonly dry_run: boolean;
+    readonly include_full_data: boolean;
+    readonly res: readonly XunjiResItem[];
+}
+/** 一天里一个 session → 训记 `res[]` 一项（老 `_session_to_res`，`push.py:81-110`）。 */
+export declare function sessionToResItem(dateStr: string, session: Pick<PlanSessionRow, 'session_label' | 'movements'>): XunjiResItem;
+/** 组 upsert 包体（`res` 透传；调用方已备好的 `res[]` 进来是什么出去就是什么）。 */
+export declare function buildUpsertPayload(resList: readonly XunjiResItem[], clientRequestId: string, includeFullData: boolean): UpsertPayload;
+//# sourceMappingURL=request.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../src/xunji/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EAAgB,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAExE,uDAAuD;AACvD,MAAM,WAAW,QAAQ;IACvB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACvB;AAED,6DAA6D;AAC7D,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,IAAI,EAAE,SAAS,QAAQ,EAAE,CAAC;CACpC;AAED,wDAAwD;AACxD,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,SAAS,EAAE,SAAS,aAAa,EAAE,CAAC;CAC9C;AAED,0DAA0D;AAC1D,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,cAAc,EAAE,mBAAmB,CAAC;IAC7C,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACpC,QAAQ,CAAC,GAAG,EAAE,SAAS,YAAY,EAAE,CAAC;CACvC;AA2BD,2EAA2E;AAC3E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,cAAc,EAAE,eAAe,GAAG,WAAW,CAAC,GAAG,YAAY,CAU5H;AAED,yDAAyD;AACzD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,OAAO,GACvB,aAAa,CAQf"}

package/dist/xunji/request.js

@@ -0,0 +1,60 @@
+/** 推送请求形状：训练 session → 训记 `res[]` 项 ＋ upsert 包体组装。
+ *
+ * 口径（严格模仿老实现，代码新写；只读参照 `xunji_bridge/push.py:81-110`、`upsert.py:90-96`）：
+ * - `res[].datestr` 用传入的 `YYYY-MM-DD` 原样（**不转时间戳**）；
+ * - `localid = 0`（新建；更新语义是 `overlay-plan` 那条的活，归 #610）；
+ * - `start ＝ end ＝ 0`（避训记 BUG，老 `push.py:84-89` 注释同述）；
+ * - `movements[].name` **原样上报**：推送前**不校验**动作库（老 `push.py` 不 import `catalog`；
+ *   “先审计”是调用链的第一步，不是推送本身的能力）；
+ * - 每条 set 写死 `done: false`，重量／次数／单位各自标量化（缺省 `"0"`／`"0"`／`"kg"`，
+ *   老 `push.py:95-100`；`weight` 缺时回退读 `load`，兼容两种库内写法）。
+ *
+ * 本件是纯函数：不读库、不调网、不读时钟——同输入必得同输出（挡板断言直接调它）。
+ */
+/** 任意值安全转上报串（老 `_safe_str`，`push.py:32-43`）：标量转串，非标量退回缺省。 */
+function safeStr(v, fallback) {
+    if (v === null || v === undefined)
+        return fallback;
+    if (typeof v === 'string' || typeof v === 'number' || typeof v === 'boolean')
+        return String(v);
+    return fallback;
+}
+/** 一条库内 set → 上报 set（`done` 写死 false；`weight` 缺时回退 `load`）。 */
+function toXunjiSet(s) {
+    const rec = (typeof s === 'object' && s !== null ? s : {});
+    const weight = 'weight' in rec && rec.weight !== undefined && rec.weight !== null ? rec.weight : rec.load;
+    return {
+        done: false,
+        weight: safeStr(weight, '0'),
+        unit: safeStr(rec.unit ?? 'kg', 'kg'),
+        reps: safeStr(rec.reps, '0'),
+    };
+}
+/** 一个库内动作 → 上报 movement（`name` 原样，只过标量化；`sets` 缺时为空表）。 */
+function toXunjiMovement(m) {
+    const sets = Array.isArray(m.sets) ? m.sets : [];
+    return { name: safeStr(m.name ?? '', ''), sets: sets.map(toXunjiSet) };
+}
+/** 一天里一个 session → 训记 `res[]` 一项（老 `_session_to_res`，`push.py:81-110`）。 */
+export function sessionToResItem(dateStr, session) {
+    const movements = Array.isArray(session.movements) ? session.movements : [];
+    return {
+        datestr: dateStr,
+        localid: 0,
+        title: session.session_label ?? '',
+        start: 0,
+        end: 0,
+        movements: movements.map(toXunjiMovement),
+    };
+}
+/** 组 upsert 包体（`res` 透传；调用方已备好的 `res[]` 进来是什么出去就是什么）。 */
+export function buildUpsertPayload(resList, clientRequestId, includeFullData) {
+    return {
+        schema_version: 'train_open_api_v2',
+        client_request_id: clientRequestId,
+        dry_run: false,
+        include_full_data: includeFullData,
+        res: resList,
+    };
+}
+//# sourceMappingURL=request.js.map

package/dist/xunji/request.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/xunji/request.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAqCH,6DAA6D;AAC7D,SAAS,OAAO,CAAC,CAAU,EAAE,QAAgB;IAC3C,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IACnD,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,OAAO,CAAC,KAAK,SAAS;QAAE,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC;IAC/F,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,+DAA+D;AAC/D,SAAS,UAAU,CAAC,CAAU;IAC5B,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAA4B,CAAC;IACtF,MAAM,MAAM,GAAG,QAAQ,IAAI,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC;IAC1G,OAAO;QACL,IAAI,EAAE,KAAK;QACX,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC;QAC5B,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,IAAI,IAAI,EAAE,IAAI,CAAC;QACrC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC;KAC7B,CAAC;AACJ,CAAC;AAED,0DAA0D;AAC1D,SAAS,eAAe,CAAC,CAAe;IACtC,MAAM,IAAI,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;IACjD,OAAO,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;AACzE,CAAC;AAED,2EAA2E;AAC3E,MAAM,UAAU,gBAAgB,CAAC,OAAe,EAAE,OAA4D;IAC5G,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5E,OAAO;QACL,OAAO,EAAE,OAAO;QAChB,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,OAAO,CAAC,aAAa,IAAI,EAAE;QAClC,KAAK,EAAE,CAAC;QACR,GAAG,EAAE,CAAC;QACN,SAAS,EAAE,SAAS,CAAC,GAAG,CAAC,eAAe,CAAC;KAC1C,CAAC;AACJ,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,kBAAkB,CAChC,OAAgC,EAChC,eAAuB,EACvB,eAAwB;IAExB,OAAO;QACL,cAAc,EAAE,mBAAmB;QACnC,iBAAiB,EAAE,eAAe;QAClC,OAAO,EAAE,KAAK;QACd,iBAAiB,EAAE,eAAe;QAClC,GAAG,EAAE,OAAO;KACb,CAAC;AACJ,CAAC"}

package/dist/xunji/retry.d.ts

@@ -0,0 +1,50 @@
+/** 训记错误分类 ＋ 退避重试（老 `xunji_bridge/errors.py` 的分类要点与重试口径，代码新写）。
+ *
+ * 分类（只读参照 `errors.py:39-46` 的 7 类 ＋ `:128-180` 的判定序；本件只收推送链用得到的分支）：
+ * - `auth`：HTTP 401／403，或正文含 apikey 缺失／无效（老 `:142-148`）。
+ *   注意：此 `auth` 盖两支——本地缺 KEY（无 HTTP 状态码）与服务端 401／403（有状态码）；
+ *   退出码由 `exitMap.ts#exitForFailure` 按有无状态码分流（2 vs 3，老实况，#595 §八·2）；
+ * - `vip_required`：正文含 仅VIP／vip required（老 `:135-140`）；
+ * - `rate_limit`：HTTP 429，或正文含 too frequent／frequent（老 `:151-157`），缺省 45 秒；
+ * - `validation`：HTTP 400（老 `:160-165`）；
+ * - `server`：HTTP 5xx（老 `:168-173`）；
+ * - `network`：超时／连接错（老 `:109-111` 的 NETWORK；本仓超时由 `AbortController` 触发，见 `upsert.ts`）；
+ * - `unknown`：其余（老 `:176-180`）。
+ * 软错误同判：HTTP 200 但 `success:false`／含 `error` 键／`res` 是 "too frequent" 串，
+ * 走同一套分类（老 `:79-103`）。
+ *
+ * 重试（老 `retry_with_backoff(max_retries=2, sleep_base=5)`，`upsert.py:134-135`）：
+ * - 最多调 3 次（首调 ＋ 2 次重试），退避 5 秒、10 秒，限频优先用服务端 `retry_after`
+ *   （老 `errors.py:276-282` 的 `5, 10` 与 `retry_after` 优先）；
+ * - `auth`／`vip_required`／`validation` **不重试**（老 `:270-274`，票面点名）；
+ * - 睡眠可注入（测试挡板；生产真实 sleep）。
+ */
+/** 训记错误 7 类（老 `ErrorType`，`errors.py:39-46`）。 */
+export type XunjiErrorKind = 'auth' | 'rate_limit' | 'vip_required' | 'validation' | 'server' | 'network' | 'unknown';
+/** 一次失败的结构化读数（老 `classify_error` 的 5 键，`errors.py:62-70`）。 */
+export interface XunjiFailure {
+    readonly error_type: XunjiErrorKind;
+    readonly message: string;
+    readonly retry_after: number | null;
+    readonly raw_body: unknown;
+    readonly code: number | null;
+}
+/** HTTP 状态 ＋ 已解析正文 → 结构化失败（老 `_classify_by_code_and_body`，`errors.py:128-180`）。 */
+export declare function classifyStatusBody(code: number | null, body: unknown, rawBody: unknown): XunjiFailure;
+/** 异常（超时／连接错／JSON 解析失败）→ 结构化失败（老 `classify_error` 的 Exception 分支，`:106-117`）。 */
+export declare function classifyThrown(e: unknown): XunjiFailure;
+/** 2xx 正文的软错误检测（老 `:83-93`）：命中即按失败走分类，否则当成功。 */
+export declare function softFailureOf(body: unknown): XunjiFailure | null;
+/** 单次调用的两种结局：成功透传正文，失败带结构化读数（`attempts` 只在 >1 时回写，老规矩）。 */
+export type XunjiCallOutcome = {
+    readonly ok: true;
+    readonly response: unknown;
+    readonly attempts: number;
+} | {
+    readonly ok: false;
+    readonly failure: XunjiFailure;
+    readonly attempts: number;
+};
+/** 重试包装（老 `retry_with_backoff`，`errors.py:242-295`；`call` 抛错也按失败走分类重试）。 */
+export declare function retryWithBackoff(call: () => Promise<XunjiCallOutcome>, maxRetries?: number, sleepBaseMs?: number, sleep?: (ms: number) => Promise<void>): Promise<XunjiCallOutcome>;
+//# sourceMappingURL=retry.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"retry.d.ts","sourceRoot":"","sources":["../../src/xunji/retry.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,iDAAiD;AACjD,MAAM,MAAM,cAAc,GACtB,MAAM,GACN,YAAY,GACZ,cAAc,GACd,YAAY,GACZ,QAAQ,GACR,SAAS,GACT,SAAS,CAAC;AAEd,8DAA8D;AAC9D,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,UAAU,EAAE,cAAc,CAAC;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B;AAkBD,mFAAmF;AACnF,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,OAAO,GAAG,YAAY,CAuBrG;AAED,iFAAiF;AACjF,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,GAAG,YAAY,CASvD;AAED,gDAAgD;AAChD,wBAAgB,aAAa,CAAC,IAAI,EAAE,OAAO,GAAG,YAAY,GAAG,IAAI,CAQhE;AAED,2DAA2D;AAC3D,MAAM,MAAM,gBAAgB,GACxB;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GAC5E;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,YAAY,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC;AAEtF,2EAA2E;AAC3E,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,OAAO,CAAC,gBAAgB,CAAC,EACrC,UAAU,SAAI,EACd,WAAW,SAAO,EAClB,KAAK,GAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAwE,GAC1G,OAAO,CAAC,gBAAgB,CAAC,CAmB3B"}

package/dist/xunji/retry.js

@@ -0,0 +1,106 @@
+/** 训记错误分类 ＋ 退避重试（老 `xunji_bridge/errors.py` 的分类要点与重试口径，代码新写）。
+ *
+ * 分类（只读参照 `errors.py:39-46` 的 7 类 ＋ `:128-180` 的判定序；本件只收推送链用得到的分支）：
+ * - `auth`：HTTP 401／403，或正文含 apikey 缺失／无效（老 `:142-148`）。
+ *   注意：此 `auth` 盖两支——本地缺 KEY（无 HTTP 状态码）与服务端 401／403（有状态码）；
+ *   退出码由 `exitMap.ts#exitForFailure` 按有无状态码分流（2 vs 3，老实况，#595 §八·2）；
+ * - `vip_required`：正文含 仅VIP／vip required（老 `:135-140`）；
+ * - `rate_limit`：HTTP 429，或正文含 too frequent／frequent（老 `:151-157`），缺省 45 秒；
+ * - `validation`：HTTP 400（老 `:160-165`）；
+ * - `server`：HTTP 5xx（老 `:168-173`）；
+ * - `network`：超时／连接错（老 `:109-111` 的 NETWORK；本仓超时由 `AbortController` 触发，见 `upsert.ts`）；
+ * - `unknown`：其余（老 `:176-180`）。
+ * 软错误同判：HTTP 200 但 `success:false`／含 `error` 键／`res` 是 "too frequent" 串，
+ * 走同一套分类（老 `:79-103`）。
+ *
+ * 重试（老 `retry_with_backoff(max_retries=2, sleep_base=5)`，`upsert.py:134-135`）：
+ * - 最多调 3 次（首调 ＋ 2 次重试），退避 5 秒、10 秒，限频优先用服务端 `retry_after`
+ *   （老 `errors.py:276-282` 的 `5, 10` 与 `retry_after` 优先）；
+ * - `auth`／`vip_required`／`validation` **不重试**（老 `:270-274`，票面点名）；
+ * - 睡眠可注入（测试挡板；生产真实 sleep）。
+ */
+/** 不重试的三类（老 `errors.py:270-274`；本票验收点名，单列常量不断言错位）。 */
+const NO_RETRY = new Set(['auth', 'vip_required', 'validation']);
+/** 正文里找 `retry after Ns`（老 `_parse_retry_after` 覆盖的 `(\d+)\s*s` 那一支）。 */
+function parseRetryAfterMs(body) {
+    const pick = (v) => (typeof v === 'string' ? v : '');
+    const text = [body]
+        .filter((b) => typeof b === 'object' && b !== null)
+        .map((b) => [pick(b.retry_after), pick(b.retryAfter), pick(b.message), pick(b.msg), pick(b.error), pick(b.res)].join(' '))
+        .join(' ');
+    const m = /(\d+)\s*s/.exec(text);
+    if (!m)
+        return null;
+    const n = Number(m[1]);
+    return Number.isFinite(n) ? n : null;
+}
+/** HTTP 状态 ＋ 已解析正文 → 结构化失败（老 `_classify_by_code_and_body`，`errors.py:128-180`）。 */
+export function classifyStatusBody(code, body, rawBody) {
+    const lowered = JSON.stringify(body ?? rawBody ?? '').toLowerCase();
+    if (lowered.includes('仅vip') || lowered.includes('vip required') || lowered.includes('仅 vip')) {
+        return { error_type: 'vip_required', message: '训记仅 VIP 可用，需要会员权限', retry_after: null, raw_body: rawBody, code };
+    }
+    if (code === 401 ||
+        code === 403 ||
+        (lowered.includes('apikey') && (lowered.includes('missing') || lowered.includes('invalid')))) {
+        return { error_type: 'auth', message: '训记 API KEY 缺失或无效', retry_after: null, raw_body: rawBody, code };
+    }
+    if (code === 429 || lowered.includes('too frequent') || lowered.includes('frequent')) {
+        const after = parseRetryAfterMs(body) ?? 45;
+        return { error_type: 'rate_limit', message: '训记限频（需等 ' + after + 's）', retry_after: after, raw_body: rawBody, code };
+    }
+    if (code === 400) {
+        return { error_type: 'validation', message: '请求字段错（400）', retry_after: null, raw_body: rawBody, code };
+    }
+    if (code !== null && code >= 500 && code < 600) {
+        return { error_type: 'server', message: '训记服务端错（' + code + '）', retry_after: null, raw_body: rawBody, code };
+    }
+    return { error_type: 'unknown', message: '未分类错误（code=' + String(code) + '）', retry_after: null, raw_body: rawBody, code };
+}
+/** 异常（超时／连接错／JSON 解析失败）→ 结构化失败（老 `classify_error` 的 Exception 分支，`:106-117`）。 */
+export function classifyThrown(e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    if (e instanceof Error && (e.name === 'AbortError' || e.name === 'TimeoutError' || /timed out|timeout|aborted/i.test(msg))) {
+        return { error_type: 'network', message: '训记调用超时：' + msg, retry_after: null, raw_body: msg, code: null };
+    }
+    if (/ECONN|ENOTFOUND|EAI_AGAIN|fetch failed|network/i.test(msg)) {
+        return { error_type: 'network', message: '网络错误：' + msg, retry_after: null, raw_body: msg, code: null };
+    }
+    return { error_type: 'unknown', message: '未知错误：' + msg, retry_after: null, raw_body: msg, code: null };
+}
+/** 2xx 正文的软错误检测（老 `:83-93`）：命中即按失败走分类，否则当成功。 */
+export function softFailureOf(body) {
+    if (typeof body !== 'object' || body === null)
+        return null;
+    const rec = body;
+    const resStr = typeof rec.res === 'string' ? rec.res : '';
+    if (rec.success === false || 'error' in rec || resStr.toLowerCase().includes('too frequent')) {
+        return classifyStatusBody(200, body, body);
+    }
+    return null;
+}
+/** 重试包装（老 `retry_with_backoff`，`errors.py:242-295`；`call` 抛错也按失败走分类重试）。 */
+export async function retryWithBackoff(call, maxRetries = 2, sleepBaseMs = 5000, sleep = (ms) => new Promise((resolve) => { setTimeout(resolve, ms); })) {
+    let last = { ok: true, response: null, attempts: 0 };
+    for (let i = 0; i <= maxRetries; i += 1) {
+        let out;
+        try {
+            out = await call();
+        }
+        catch (e) {
+            const failure = classifyThrown(e);
+            out = { ok: false, failure, attempts: i + 1 };
+        }
+        last = { ...out, attempts: i + 1 };
+        if (out.ok)
+            return last;
+        if (NO_RETRY.has(out.failure.error_type))
+            return last;
+        if (i < maxRetries) {
+            const wait = out.failure.retry_after !== null ? out.failure.retry_after * 1000 : sleepBaseMs * 2 ** i;
+            await sleep(wait);
+        }
+    }
+    return last;
+}
+//# sourceMappingURL=retry.js.map

package/dist/xunji/retry.js.map

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

package/dist/xunji/rows.d.ts

@@ -0,0 +1,32 @@
+/** 训记响应 → `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`，本件不深引对方内部件）。
+ */
+/** 回写一行（`store.ts` 落库的输入形状；`setIndex` 缺时为 null）。 */
+export interface XunjiBackfillRow {
+    readonly date: string;
+    readonly exerciseType: string;
+    readonly reps: number;
+    readonly setIndex: number | null;
+    readonly loadKg: number;
+    readonly caloriesBurned: number;
+    readonly category: string;
+    readonly difficulty: string | null;
+    readonly xunjiLocalid: string;
+    readonly xunjiTitle: string;
+}
+/** set 的次数：范围串取最大（老 `:44-48`），转坏即 0（老 `:50-53`）。 */
+export declare function parseSetReps(raw: unknown): number;
+/** 训记 GET 响应 → 回写行列表（每行一个完成的 set；形状不对即空表，不抛）。 */
+export declare function xunjiResponseToRows(response: unknown): XunjiBackfillRow[];
+//# sourceMappingURL=rows.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"rows.d.ts","sourceRoot":"","sources":["../../src/xunji/rows.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAIH,oDAAoD;AACpD,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAcD,oDAAoD;AACpD,wBAAgB,YAAY,CAAC,GAAG,EAAE,OAAO,GAAG,MAAM,CAOjD;AAMD,iDAAiD;AACjD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,OAAO,GAAG,gBAAgB,EAAE,CAkCzE"}