skill-calorie 0.2.4 → 0.2.5

package/dist/xunji/catalog.js

@@ -6,9 +6,9 @@
  * 读不出来（文件不在／解析失败／`actions` 不是数组）＝「库缺失」，**不是「库是空的」**：
  * 调用方按「无法验证」报（`valid: null`），不许当成「动作不合法」（老 `catalog.py:44-89` 同口径）。
  *
- * 库路径两档（#606 票内定的口径，见证据件 §三）：
- *   ① **默认**＝包内预置快照 `src/xunji/data/训记官方动作.json`（`XUNJI_CATALOG.preset`）——
- *      同一句动作名在任何一台机器上算出同一个结果；
+ * 库路径两档（#606 票内定的口径，见证据件 §三；#676 起默认档改成读配置）：
+ *   ① **默认**＝配置里的 `xunji.catalog`；空串时回落到包内预置快照 `src/xunji/data/训记官方动作.json`
+ *      （`XUNJI_CATALOG.preset`）——同一句动作名在任何一台机器上算出同一个结果；
  *   ② **显式覆盖**＝调用方把老机器路径（`%USERPROFILE%\.minimax\训记官方动作.json`）传进来
  *      （`XUNJI_CATALOG.machine`；子命令读法 `verify --catalog <路径>`）。
  *      **模块不隐式读机器路径**：那会让「这台机器放没放库」变成第二套口径，与编辑器库面（吃预置库）分叉。
@@ -17,6 +17,7 @@ import { homedir } from 'node:os';
 import { dirname, join, resolve } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { readFileSync } from 'node:fs';
+import { loadCalorieConfig } from '../config.js';
 /** 包根：本模块往上两级（源码态 `src/xunji` 与构建态 `dist/xunji` 都成立，与渲染层模板装载器同法）。 */
 const PACKAGE_ROOT = resolve(dirname(fileURLToPath(import.meta.url)), '..', '..');
 /** 库路径两档的**唯一定义地**（默认口径与显式覆盖；读法见件头）。 */
@@ -27,11 +28,16 @@ export const XUNJI_CATALOG = {
     /** ② 显式覆盖：老的机器路径（只作**可传的一个值**，模块不隐式读它）。 */
     machine: join(homedir(), '.minimax', '训记官方动作.json'),
 };
+/** 库来源的缺省落点：配置里 `xunji.catalog` 非空即用它，空串＝包内预置快照（#676 起配置是唯一真相）。 */
+export function defaultCatalogPath() {
+    const configured = loadCalorieConfig().values.xunji.catalog;
+    return configured !== '' ? configured : XUNJI_CATALOG.preset;
+}
 function errorText(e) {
     return e instanceof Error ? e.message : String(e);
 }
-/** 读一份库文件（默认＝包内预置快照）。缺文件／解析失败／形状不对一律**不抛错**，读成 `loaded=false`。 */
-export function readMovementCatalog(path = XUNJI_CATALOG.preset) {
+/** 读一份库文件（缺省＝配置里的 `xunji.catalog`，空＝包内预置快照）。缺文件／解析失败／形状不对一律**不抛错**，读成 `loaded=false`。 */
+export function readMovementCatalog(path = defaultCatalogPath()) {
     let raw;
     try {
         raw = readFileSync(path, 'utf8');
@@ -70,7 +76,7 @@ function sourceOf(opts) {
             set: new Set(names),
         };
     }
-    const path = opts.catalogPath ?? XUNJI_CATALOG.preset;
+    const path = opts.catalogPath ?? defaultCatalogPath();
     const read = readMovementCatalog(path);
     return { loaded: read.loaded, path, error: read.reason, names: [...read.names], set: new Set(read.names) };
 }

package/dist/xunji/catalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/xunji/catalog.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AAEvC,qEAAqE;AACrE,MAAM,YAAY,GAAG,OAAO,CAAC,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;AAElF,wCAAwC;AACxC,MAAM,CAAC,MAAM,aAAa,GAAG;IAC3B;iEAC6D;IAC7D,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC;IACjE,2CAA2C;IAC3C,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,UAAU,EAAE,aAAa,CAAC;CAC3C,CAAC;AAqDX,SAAS,SAAS,CAAC,CAAU;IAC3B,OAAO,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AACpD,CAAC;AAED,kEAAkE;AAClE,MAAM,UAAU,mBAAmB,CAAC,OAAe,aAAa,CAAC,MAAM;IACrE,IAAI,GAAW,CAAC;IAChB,IAAI,CAAC;QACH,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAC5F,CAAC;IACD,IAAI,MAAe,CAAC;IACpB,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;IAC7F,CAAC;IACD,MAAM,OAAO,GAAI,MAAmD,EAAE,OAAO,CAAC;IAC9E,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,UAAU,GAAG,IAAI,GAAG,iBAAiB,EAAE,CAAC;IAC3F,CAAC;IACD,kEAAkE;IAClE,mDAAmD;IACnD,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3F,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,SAAS,GAAG,IAAI,GAAG,UAAU,EAAE,CAAC;IACnF,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;AACrD,CAAC;AAED,SAAS,QAAQ,CAAC,IAAmB;IACnC,MAAM,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC;IAC3B,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,KAAK,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;QACzB,OAAO;YACL,MAAM,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC;YACxB,IAAI,EAAE,aAAa;YACnB,KAAK,EAAE,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,sBAAsB;YACvD,KAAK;YACL,GAAG,EAAE,IAAI,GAAG,CAAC,KAAK,CAAC;SACpB,CAAC;IACJ,CAAC;IACD,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,IAAI,aAAa,CAAC,MAAM,CAAC;IACtD,MAAM,IAAI,GAAG,mBAAmB,CAAC,IAAI,CAAC,CAAC;IACvC,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;AAC7G,CAAC;AAED,0CAA0C;AAC1C,MAAM,UAAU,cAAc,CAAC,IAAY,EAAE,KAAuB,EAAE,IAAI,GAAG,CAAC;IAC5E,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACvD,IAAI,GAAG,CAAC,MAAM,IAAI,CAAC;YAAE,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IACD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,IAAI,CAAC;QAAE,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;IACnD,MAAM,GAAG,GAAa,EAAE,CAAC;IACzB,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;QACtB,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACZ,MAAM;YACR,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;AACnC,CAAC;AAED,SAAS,SAAS,CAAC,IAAY,EAAE,GAAkB;IACjD,MAAM,KAAK,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;IAClC,IAAI,KAAK,KAAK,EAAE,EAAE,CAAC;QACjB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;IACzG,CAAC;IACD,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,CAAC;QAChB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;IACrG,CAAC;IACD,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;IAC/F,CAAC;IACD,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IACxD,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,WAAW,EAAE,CAAC;AAC9G,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,eAAe,CAAC,KAAwB,EAAE,OAAsB,EAAE;IAChF,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC3B,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACpD,OAAO;QACL,cAAc,EAAE,GAAG,CAAC,MAAM;QAC1B,YAAY,EAAE,GAAG,CAAC,IAAI;QACtB,aAAa,EAAE,GAAG,CAAC,KAAK;QACxB,KAAK,EAAE,OAAO,CAAC,MAAM;QACrB,WAAW,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,MAAM;QAC3D,aAAa,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,CAAC,MAAM;QAC9D,kBAAkB,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,MAAM;QAClE,OAAO;KACR,CAAC;AACJ,CAAC"}
+{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../../src/xunji/catalog.ts"],"names":[],"mappings":"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"}

package/dist/xunji/fetch.d.ts

@@ -6,13 +6,12 @@
  * - 超时缺省 30 秒（老 `:47` 的 `timeout=30`），超时走 `network` 进重试（老 `:107-110`）；
  * - 重试 `max_retries=2`（老 `:113`），分类与退避走 `retry.ts`（软错误同判，老 `:94-101`）；
  * - 限频档 `full=30s／light=15s`（老 `auth.py:42-44`），缺省**不守**（老 `:47` 缺省关）；
- *   开关打开时才看状态文件 `~/.mavis/xunji_bridge_rate.json`（老 `:40` 同路径同键名）；
+ *   开关打开时才看状态文件 `<状态目录>/xunji_bridge_rate.json`（老 `:40` 同件名；目录＝配置 `xunji.stateDir`）；
  * - 无 KEY 直接失败（老 `:66` 的 `require_key` 抛错位），不调网、不重试；
  * - `attempts > 1` 才回写（老 `:114-115`）；
  * - 响应 `gzip` 由运行时自动解（Node 全局 fetch 缺省解压；老 `:89-90` 手工解是 urllib 才要的）。
  *
- * KEY 口径暂住 `upsert.ts`（`XUNJI_KEY_ENV`＋`readKeyFromEnv`；实现归 #610 的 `key.ts`）。
- */
+ * #676 · KEY 口径住 `key.ts`（配置文件里的 `xunji.key`；环境变量读取已删）。 */
 import type { XunjiCallOutcome } from './retry.js';
 import type { UpsertTransport } from './upsert.js';
 /** 拉取接口地址（老 `fetch.py:43-44` 同值；全模块只此一处）。 */
@@ -22,7 +21,7 @@ export declare const FETCH_RATE_LIMIT_SECONDS: {
     readonly full: 30;
     readonly light: 15;
 };
-/** 缺省限频状态文件（老 `auth.py:40` 同路径；与推送侧 `xunji_push_rate.json` 分开）。 */
+/** 缺省限频状态文件（老 `auth.py:40` 同件名，目录＝`xunjiStateDir()`；与推送侧 `xunji_push_rate.json` 分开）。 */
 export declare function defaultFetchRateLimitPath(): string;
 /** `fetchTrains` 的可注入件（测试挡板从这里进；生产全缺省）。 */
 export interface FetchOptions {

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

@@ -1 +1 @@
-{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/xunji/fetch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAMH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,6CAA6C;AAC7C,eAAO,MAAM,oBAAoB,qDAAqD,CAAC;AAEvF,mDAAmD;AACnD,eAAO,MAAM,wBAAwB;;;CAAmC,CAAC;AAEzE,mEAAmE;AACnE,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,2CAA2C;AAC3C,MAAM,WAAW,YAAY;IAC3B,wEAAwE;IACxE,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,+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,8BAA8B;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,CAAC;IACrC,6CAA6C;IAC7C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,2BAA2B;IAC3B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,kCAAkC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,yCAAyC;IACzC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,iCAAiC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,6DAA6D;IAC7D,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC;AAED,4CAA4C;AAC5C,MAAM,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAqC5C,2CAA2C;AAC3C,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,YAAiB,GAAG,OAAO,CAAC,YAAY,CAAC,CA+DjG;AAYD,wEAAwE;AACxE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACxB;AAED,oCAAoC;AACpC,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,aAAa,EAAE,CAAC;CACzC;AAED,6BAA6B;AAC7B,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,SAAS,kBAAkB,EAAE,CAAC;CACnD;AAUD,+CAA+C;AAC/C,wBAAgB,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,UAAU,EAAE,CAc3D"}
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/xunji/fetch.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;2DAa2D;AAK3D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAGnD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,6CAA6C;AAC7C,eAAO,MAAM,oBAAoB,qDAAqD,CAAC;AAEvF,mDAAmD;AACnD,eAAO,MAAM,wBAAwB;;;CAAmC,CAAC;AAEzE,wFAAwF;AACxF,wBAAgB,yBAAyB,IAAI,MAAM,CAElD;AAED,2CAA2C;AAC3C,MAAM,WAAW,YAAY;IAC3B,wEAAwE;IACxE,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,+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,8BAA8B;IAC9B,QAAQ,CAAC,SAAS,CAAC,EAAE,eAAe,CAAC;IACrC,6CAA6C;IAC7C,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IAC5B,2BAA2B;IAC3B,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,kCAAkC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/C,yCAAyC;IACzC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC;IACpC,iCAAiC;IACjC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,MAAM,CAAC;IAC5B,6DAA6D;IAC7D,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACxC;AAED,4CAA4C;AAC5C,MAAM,MAAM,YAAY,GAAG,gBAAgB,CAAC;AAqC5C,2CAA2C;AAC3C,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,GAAE,YAAiB,GAAG,OAAO,CAAC,YAAY,CAAC,CA8DjG;AAYD,wEAAwE;AACxE,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;CACxB;AAED,oCAAoC;AACpC,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,SAAS,aAAa,EAAE,CAAC;CACzC;AAED,6BAA6B;AAC7B,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IACxB,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,SAAS,kBAAkB,EAAE,CAAC;CACnD;AAUD,+CAA+C;AAC/C,wBAAgB,WAAW,CAAC,QAAQ,EAAE,OAAO,GAAG,UAAU,EAAE,CAc3D"}

package/dist/xunji/fetch.js

@@ -6,25 +6,24 @@
  * - 超时缺省 30 秒（老 `:47` 的 `timeout=30`），超时走 `network` 进重试（老 `:107-110`）；
  * - 重试 `max_retries=2`（老 `:113`），分类与退避走 `retry.ts`（软错误同判，老 `:94-101`）；
  * - 限频档 `full=30s／light=15s`（老 `auth.py:42-44`），缺省**不守**（老 `:47` 缺省关）；
- *   开关打开时才看状态文件 `~/.mavis/xunji_bridge_rate.json`（老 `:40` 同路径同键名）；
+ *   开关打开时才看状态文件 `<状态目录>/xunji_bridge_rate.json`（老 `:40` 同件名；目录＝配置 `xunji.stateDir`）；
  * - 无 KEY 直接失败（老 `:66` 的 `require_key` 抛错位），不调网、不重试；
  * - `attempts > 1` 才回写（老 `:114-115`）；
  * - 响应 `gzip` 由运行时自动解（Node 全局 fetch 缺省解压；老 `:89-90` 手工解是 urllib 才要的）。
  *
- * KEY 口径暂住 `upsert.ts`（`XUNJI_KEY_ENV`＋`readKeyFromEnv`；实现归 #610 的 `key.ts`）。
- */
-import { homedir } from 'node:os';
+ * #676 · KEY 口径住 `key.ts`（配置文件里的 `xunji.key`；环境变量读取已删）。 */
 import { dirname, join } from 'node:path';
 import { mkdirSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
 import { classifyStatusBody, classifyThrown, retryWithBackoff, softFailureOf } from './retry.js';
-import { XUNJI_KEY_ENV, readKeyFromEnv } from './upsert.js';
+import { xunjiStateDir } from './rateLimit.js';
+import { readKey } from './key.js';
 /** 拉取接口地址（老 `fetch.py:43-44` 同值；全模块只此一处）。 */
 export const XUNJI_FETCH_ENDPOINT = 'https://trains.xunjiapp.cn/api_trains_for_llm_v2';
 /** 拉取限频两档（秒；老 `auth.py:42-44` 同值；全模块只此一处，别处引用）。 */
 export const FETCH_RATE_LIMIT_SECONDS = { full: 30, light: 15 };
-/** 缺省限频状态文件（老 `auth.py:40` 同路径；与推送侧 `xunji_push_rate.json` 分开）。 */
+/** 缺省限频状态文件（老 `auth.py:40` 同件名，目录＝`xunjiStateDir()`；与推送侧 `xunji_push_rate.json` 分开）。 */
 export function defaultFetchRateLimitPath() {
-    return join(homedir(), '.mavis', 'xunji_bridge_rate.json');
+    return join(xunjiStateDir(), 'xunji_bridge_rate.json');
 }
 function readRateState(statePath) {
     try {
@@ -67,13 +66,13 @@ export async function fetchTrains(dateStr, opts = {}) {
         if (since !== null && since < threshold)
             await sleep((threshold - since) * 1000);
     }
-    const key = opts.key !== undefined && opts.key !== null && opts.key !== '' ? opts.key : (opts.readKey ?? readKeyFromEnv)();
+    const key = opts.key !== undefined && opts.key !== null && opts.key !== '' ? opts.key : (opts.readKey ?? readKey)();
     if (key === null || key === '') {
         return {
             ok: false,
             failure: {
                 error_type: 'auth',
-                message: '未配置训记 KEY（权威名 ' + XUNJI_KEY_ENV.primary + '，兼容名 ' + XUNJI_KEY_ENV.legacy + '；用 key set 设置，归 #610）',
+                message: '未配置训记 KEY（配置文件里的 xunji.key；用 key set <KEY> 写进去）',
                 retry_after: null,
                 raw_body: null,
                 code: null,

package/dist/xunji/fetch.js.map

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

package/dist/xunji/key.d.ts

@@ -1,77 +1,37 @@
-/** 训记 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 type { XunjiSubcommand } from './subcommands.js';
 import type { XunjiRun } from './run.js';
-/** KEY 环境变量两名（老 `auth.py:35-36` 同名同序；全模块只此一处）。 */
-export declare const XUNJI_KEY_ENV: {
-    readonly primary: "XUNJI_TRAINS_KEY";
-    readonly legacy: "XUNJI_API_KEY";
-};
-/** 当前生效的 KEY 是从哪个名读到的（null＝都没配）。 */
-export type XunjiKeySource = 'XUNJI_TRAINS_KEY' | 'XUNJI_API_KEY' | null;
-/** KEY 存取的注入缝（测试挡板从这里进；生产全缺省＝真环境＋真 PowerShell）。 */
-export interface KeyStoreDeps {
-    /** 环境表（缺省 `process.env`；测 `set／clear` 的落点时传假表，**不碰真系统**）。 */
-    readonly env?: Record<string, string | undefined>;
-    /** 平台（缺省 `process.platform`；测分发时覆盖）。 */
-    readonly platform?: string;
-    /** 跑一条 PowerShell（缺省真跑；测试给挡板，**不写真系统环境**）。 */
-    readonly execPs?: (command: string) => Promise<void>;
-}
-/** 缺省 KEY 读法（老 `get_key`，`auth.py:47-55`；空串当没配）。 */
-export declare function readKeyFromEnv(env?: Record<string, string | undefined>): string | null;
-/** 当前生效的 KEY 来自哪个名（老 `which`，`auth.py:58-66`；用于提示与状态）。 */
-export declare function whichKey(env?: Record<string, string | undefined>): XunjiKeySource;
+/** KEY 在配置文件里的落点（全模块只此一处；设置页的行名与它同源）。 */
+export declare const XUNJI_KEY_FIELD = "xunji.key";
+/** 当前生效的 KEY（配置文件里的那一项，空串当没配）。 */
+export declare function readKey(): string | null;
 /** 预览：前 4 字＋`...`＋末 2 字（老 `auth.py:177` 原样）；短串只回等长星号，不漏全串。 */
 export declare function previewKey(key: string): string | null;
-/** `status` 的读数（老 `auth.py:166-184` 七键；**无全串位**——全串永不进读数）。 */
+/** `status` 的读数（**无全串位**——全串永不进读数）。 */
 export interface KeyStatus {
-    readonly primary_name: string;
-    readonly legacy_name: string;
-    readonly primary_set: boolean;
-    readonly legacy_set: boolean;
-    readonly active_source: XunjiKeySource;
+    readonly key_field: string;
+    readonly configured: boolean;
     readonly active_key_preview: string | null;
     readonly recommendation: string;
 }
-/** 状态报告（老 `status`；只读环境，不调网不落盘）。 */
-export declare function keyStatus(deps?: KeyStoreDeps): KeyStatus;
-/** 写入用户级系统环境（老 `set_key`；成功同步当前进程，`set` 完立即可用）。 */
-export declare function setKey(value: string, opts?: {
-    readonly legacy?: boolean;
-}, deps?: KeyStoreDeps): Promise<{
+/** 状态报告（老 `status`；只读配置，不调网不落盘）。 */
+export declare function keyStatus(): KeyStatus;
+/** 设置 KEY（空／超长拒绝；成功即写盘，下次调用（含子进程）生效）。 */
+export declare function setKey(value: string): {
     readonly ok: true;
-    readonly name: string;
 } | {
     readonly ok: false;
     readonly error: string;
-}>;
-/** 删除用户级系统环境变量（老 `clear_key`；本来没设即幂等成功）。 */
-export declare function clearKey(opts?: {
-    readonly legacy?: boolean;
-}, deps?: KeyStoreDeps): Promise<{
+};
+/** 删除 KEY（写回空串；本来没配即幂等成功）。 */
+export declare function clearKey(): {
     readonly ok: true;
-    readonly name: string;
     readonly had: boolean;
 } | {
     readonly ok: false;
     readonly error: string;
-}>;
+};
 type Values = Readonly<Record<string, string | boolean | readonly string[]>>;
 /** `key` 子命令的分派（`run.ts` 调；`status` 无 KEY 退 2，`set／clear` 走 0／1）。 */
-export declare function runKeyCommand(sub: XunjiSubcommand, values: Values, store?: KeyStoreDeps): Promise<XunjiRun>;
+export declare function runKeyCommand(sub: XunjiSubcommand, values: Values): Promise<XunjiRun>;
 export {};
 //# sourceMappingURL=key.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"key.d.ts","sourceRoot":"","sources":["../../src/xunji/key.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAIH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,kDAAkD;AAClD,eAAO,MAAM,aAAa;;;CAGhB,CAAC;AAEX,oCAAoC;AACpC,MAAM,MAAM,cAAc,GAAG,kBAAkB,GAAG,eAAe,GAAG,IAAI,CAAC;AAEzE,mDAAmD;AACnD,MAAM,WAAW,YAAY;IAC3B,6DAA6D;IAC7D,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAClD,wCAAwC;IACxC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,8CAA8C;IAC9C,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CACtD;AAED,oDAAoD;AACpD,wBAAgB,cAAc,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,GAAG,IAAI,CAKnG;AAED,0DAA0D;AAC1D,wBAAgB,QAAQ,CAAC,GAAG,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,cAAc,CAI9F;AAED,8DAA8D;AAC9D,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIrD;AAED,8DAA8D;AAC9D,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,cAAc,CAAC;IACvC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,oCAAoC;AACpC,wBAAgB,SAAS,CAAC,IAAI,GAAE,YAAiB,GAAG,SAAS,CAkB5D;AAqBD,mDAAmD;AACnD,wBAAsB,MAAM,CAC1B,KAAK,EAAE,MAAM,EACb,IAAI,GAAE;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,EACxC,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAYxG;AAED,4CAA4C;AAC5C,wBAAsB,QAAQ,CAC5B,IAAI,GAAE;IAAE,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,EACxC,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAAC,CAW/H;AAED,KAAK,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,MAAM,EAAE,CAAC,CAAC,CAAC;AAE7E,qEAAqE;AACrE,wBAAsB,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,YAAiB,GAAG,OAAO,CAAC,QAAQ,CAAC,CAwCrH"}
+{"version":3,"file":"key.d.ts","sourceRoot":"","sources":["../../src/xunji/key.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AAEzC,yCAAyC;AACzC,eAAO,MAAM,eAAe,cAAc,CAAC;AAE3C,kCAAkC;AAClC,wBAAgB,OAAO,IAAI,MAAM,GAAG,IAAI,CAGvC;AAED,8DAA8D;AAC9D,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAIrD;AAED,uCAAuC;AACvC,MAAM,WAAW,SAAS;IACxB,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;IAC3C,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,oCAAoC;AACpC,wBAAgB,SAAS,IAAI,SAAS,CAUrC;AAcD,yCAAyC;AACzC,wBAAgB,MAAM,CACpB,KAAK,EAAE,MAAM,GACZ;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAKxE;AAED,8BAA8B;AAC9B,wBAAgB,QAAQ,IAAI;IAAE,QAAQ,CAAC,EAAE,EAAE,IAAI,CAAC;IAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAA;CAAE,GAAG;IAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAIxH;AAED,KAAK,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,MAAM,EAAE,CAAC,CAAC,CAAC;AAE7E,qEAAqE;AACrE,wBAAsB,aAAa,CAAC,GAAG,EAAE,eAAe,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAsC3F"}

package/dist/xunji/key.js

@@ -1,40 +1,11 @@
-/** 训记 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 { loadCalorieConfig, saveCalorieConfig } from '../config.js';
 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;
+/** KEY 在配置文件里的落点（全模块只此一处；设置页的行名与它同源）。 */
+export const XUNJI_KEY_FIELD = 'xunji.key';
+/** 当前生效的 KEY（配置文件里的那一项，空串当没配）。 */
+export function readKey() {
+    const value = loadCalorieConfig().values.xunji.key.trim();
+    return value !== '' ? value : null;
 }
 /** 预览：前 4 字＋`...`＋末 2 字（老 `auth.py:177` 原样）；短串只回等长星号，不漏全串。 */
 export function previewKey(key) {
@@ -44,93 +15,63 @@ export function previewKey(key) {
         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);
+/** 状态报告（老 `status`；只读配置，不调网不落盘）。 */
+export function keyStatus() {
+    const active = readKey();
     return {
-        primary_name: XUNJI_KEY_ENV.primary,
-        legacy_name: XUNJI_KEY_ENV.legacy,
-        primary_set: primarySet,
-        legacy_set: legacySet,
-        active_source: whichKey(env),
+        key_field: XUNJI_KEY_FIELD,
+        configured: active !== null,
         active_key_preview: active === null ? null : previewKey(active),
-        recommendation: primarySet
+        recommendation: active !== null
             ? 'OK'
-            : legacySet
-                ? '建议把 XUNJI_API_KEY 迁移到 XUNJI_TRAINS_KEY（用 key set）'
-                : '未配置，需用 key set <KEY> 设置',
+            : '未配置，请在卡路里设置页里填「训记 KEY」，或用 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')`);
+/** 把 KEY 写进配置文件（写给的是**完整一份**：没给的项由配置件按默认值补齐）。 */
+function writeKey(value) {
+    try {
+        const values = loadCalorieConfig().values;
+        const next = { ...values, xunji: { ...values.xunji, key: value } };
+        saveCalorieConfig(next);
+        return { ok: true };
+    }
+    catch (e) {
+        return { ok: false, error: '写配置文件失败：' + (e instanceof Error ? e.message : String(e)) };
+    }
 }
-/** 写入用户级系统环境（老 `set_key`；成功同步当前进程，`set` 完立即可用）。 */
-export async function setKey(value, opts = {}, deps = {}) {
+/** 设置 KEY（空／超长拒绝；成功即写盘，下次调用（含子进程）生效）。 */
+export function setKey(value) {
     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 };
+    return writeKey(trimmed);
 }
-/** 删除用户级系统环境变量（老 `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（写回空串；本来没配即幂等成功）。 */
+export function clearKey() {
+    const had = readKey() !== null;
+    const r = writeKey('');
+    return r.ok ? { ok: true, had } : r;
 }
 /** `key` 子命令的分派（`run.ts` 调；`status` 无 KEY 退 2，`set／clear` 走 0／1）。 */
-export async function runKeyCommand(sub, values, store = {}) {
+export async function runKeyCommand(sub, values) {
     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> 设置）';
+        const s = keyStatus();
+        if (!s.configured) {
+            const line = '未配置训记 KEY（配置项 ' + s.key_field + '；用 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) + '）',
+            message: 'KEY 已配置（' + s.key_field + '，预览 ' + String(s.active_key_preview) + '）',
             data: s, stderr: null,
         };
     }
@@ -138,23 +79,22 @@ export async function runKeyCommand(sub, values, store = {}) {
         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);
+        const r = setKey(v);
         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,
+            message: '已写入配置文件（' + XUNJI_KEY_FIELD + '）：下次调用即生效',
+            data: { key_field: XUNJI_KEY_FIELD }, stderr: null,
         };
     }
-    const r = await clearKey({ legacy }, store);
+    const r = clearKey();
     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,
+        message: r.had ? '已删除配置里的 KEY' : 'KEY 未配置，无需删除',
+        data: { key_field: XUNJI_KEY_FIELD, had: r.had }, stderr: null,
     };
 }
 //# sourceMappingURL=key.js.map

package/dist/xunji/key.js.map

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

package/dist/xunji/planSource.d.ts

@@ -2,15 +2,15 @@
  *
  * 口径：
  * - 只读打开（`db/readonly.ts` 的 `openDbReadOnly`：不建表、不迁移；与 `cli/cmd_read.ts:97` 同法）；
- * - 库路径＝`SKILLS_DB_PATH` 下的 `calorie_data.db`（`paths.ts` 的 `resolveDbDir`＋`DB_FILENAME`；
- *   不用 `resolveDbPath`——它会 `mkdir`，只读口不许有落盘副作用）；
+ * - 库路径＝配置里 `db.dir`（空＝数据目录）下的 `db.name`（`paths.ts` 的
+ *   `resolveDbDir`＋`resolveDbFileName`；不用 `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` 带人话原因，
+ * - 存在性预检：库目录取不到／库文件不在／打开失败一律回 `found: false` 带人话原因，
  *   不抛错（调用方按退出码 1 报；“失败不许静默吞”）；
  * - “无任何计划”（无配置且无会话）与“计划缺开始日期”同样回 `found: false`；
  *   “这天没排练”（休息日／计划未开始／超周）回 `found: true, sessions: []`——调用方按老

package/dist/xunji/planSource.js

@@ -2,15 +2,15 @@
  *
  * 口径：
  * - 只读打开（`db/readonly.ts` 的 `openDbReadOnly`：不建表、不迁移；与 `cli/cmd_read.ts:97` 同法）；
- * - 库路径＝`SKILLS_DB_PATH` 下的 `calorie_data.db`（`paths.ts` 的 `resolveDbDir`＋`DB_FILENAME`；
- *   不用 `resolveDbPath`——它会 `mkdir`，只读口不许有落盘副作用）；
+ * - 库路径＝配置里 `db.dir`（空＝数据目录）下的 `db.name`（`paths.ts` 的
+ *   `resolveDbDir`＋`resolveDbFileName`；不用 `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` 带人话原因，
+ * - 存在性预检：库目录取不到／库文件不在／打开失败一律回 `found: false` 带人话原因，
  *   不抛错（调用方按退出码 1 报；“失败不许静默吞”）；
  * - “无任何计划”（无配置且无会话）与“计划缺开始日期”同样回 `found: false`；
  *   “这天没排练”（休息日／计划未开始／超周）回 `found: true, sessions: []`——调用方按老
@@ -18,7 +18,7 @@
  */
 import { existsSync } from 'node:fs';
 import { join } from 'node:path';
-import { DB_FILENAME, resolveDbDir } from '../paths.js';
+import { resolveDbDir, resolveDbFileName } from '../paths.js';
 import { openDbReadOnly } from '../db/readonly.js';
 import { getPlan } from '../workout/index.js';
 import { weekOfDate } from '../render/index.js';
@@ -38,14 +38,14 @@ export function resolveDayPlan(dateStr, opts = {}) {
     let dbFile = opts.dbFile;
     if (dbFile === undefined) {
         try {
-            dbFile = join(resolveDbDir(), DB_FILENAME);
+            dbFile = join(resolveDbDir(), resolveDbFileName());
         }
         catch (e) {
             return { found: false, reason: e instanceof Error ? e.message : String(e) };
         }
     }
     if (!existsSync(dbFile)) {
-        return { found: false, reason: '卡路里库文件不在（' + dbFile + '）：先确认 SKILLS_DB_PATH 指对，再看库在不在' };
+        return { found: false, reason: '卡路里库文件不在（' + dbFile + '）：先确认配置项 db.dir 指对（空＝数据目录），再看库在不在' };
     }
     let db = null;
     try {