@praeviso/code-env-switch 0.1.5 → 0.1.6

package/README.md

@@ -80,6 +80,46 @@ codenv remove codex primary
 `codenv list` (or `codenv ls`) prints a table with `PROFILE`, `TYPE`, and `NOTE`. Default profiles are labeled in the `NOTE` column, and the active profile is shown in green.
 If `profile.name` is set, it is shown in `PROFILE`. Otherwise the profile key is shown (with legacy `type-` prefixes stripped when possible).
 
+### Reset usage history
+
+```bash
+codenv usage-reset
+# skip confirmation
+codenv usage-reset --yes
+```
+
+This deletes usage history files (`usage.jsonl`, usage state, `profile-log.jsonl`, `statusline-debug.jsonl`) plus any backup variants in the config directory.
+
+### Usage tracking
+
+Usage stats are derived from two sources (statusline input + session logs) and appended to `usage.jsonl`.
+
+- Files and paths
+  - `usage.jsonl`: JSONL records with `ts`, `type`, `profileKey`/`profileName`, `model`, `sessionId`, and token breakdowns.
+  - `usage.jsonl.state.json`: per-session totals + per-session-file metadata (mtime/size) used to compute deltas and avoid double counting.
+  - `profile-log.jsonl`: profile usage + session binding log (`use` and `session` events).
+  - `statusline-debug.jsonl`: optional debug capture when `CODE_ENV_STATUSLINE_DEBUG` is enabled.
+  - Paths can be overridden via `usagePath`, `usageStatePath`, `profileLogPath`, `codexSessionsPath`, `claudeSessionsPath`.
+- Session binding (profile -> session)
+  - `codenv init` installs a shell wrapper so `codex`/`claude` run via `codenv launch`.
+  - `codenv launch` logs profile usage and then finds the latest unbound session file (prefers matching `cwd`, within a small grace window) and records the binding in `profile-log.jsonl`.
+  - Sync uses these bindings to attribute session usage to a profile.
+- Statusline sync (`codenv statusline --sync-usage`)
+  - Requires `sessionId`, model, and a profile (`profileKey` or `profileName`) to write usage.
+  - Reads stdin JSON for totals and computes a delta against the last stored totals in the state file.
+  - If totals decrease (session reset), the current totals are treated as fresh usage; otherwise negative sub-deltas are clamped to zero.
+  - If the token breakdown exceeds the reported total, the breakdown sum wins.
+  - Appends a delta record to `usage.jsonl` and updates the per-session totals in the state file.
+- Session log sync (`--sync-usage` and `codenv list`)
+  - Scans Codex sessions under `CODEX_HOME/sessions` (or `~/.codex/sessions`) and Claude sessions under `CLAUDE_HOME/projects` (or `~/.claude/projects`).
+  - Codex: parses `event_msg` token_count records and uses max totals; cached input is recorded as cache read and subtracted from input when possible.
+  - Claude: sums `message.usage` input/output/cache tokens across the file.
+  - Deltas are computed against prior file metadata and per-session maxima in the state file; files without a resolved binding are skipped.
+- Daily totals
+  - "Today" is computed in local time between 00:00 and the next 00:00.
+- Cost calculation
+  - Uses pricing from the profile (or `pricing.models`, plus defaults) and requires token splits; if splits are missing, cost is omitted.
+
 ### Add / update a profile
 
 ```bash

package/README_zh.md

@@ -80,6 +80,46 @@ codenv remove codex primary
 `codenv list`（或 `codenv ls`）会输出 `PROFILE` / `TYPE` / `NOTE` 的表格。默认项会标注在 `NOTE` 列，当前激活的配置会用绿色显示。
 如果设置了 `profile.name`，`PROFILE` 列会显示该名称；否则显示 profile 的 key（会尽量去掉旧的 `type-` 前缀）。
 
+### 清理用量历史
+
+```bash
+codenv usage-reset
+# 跳过确认
+codenv usage-reset --yes
+```
+
+该命令会删除用量历史文件（`usage.jsonl`、用量 state、`profile-log.jsonl`、`statusline-debug.jsonl`）以及配置目录中的相关备份文件。
+
+### 用量统计逻辑
+
+用量来自两条路径（状态栏输入同步 + 会话日志解析），最终追加到 `usage.jsonl`。
+
+- 文件与路径
+  - `usage.jsonl`：JSONL 记录，包含 `ts`/`type`/`profileKey`/`profileName`/`model`/`sessionId` 和 token 拆分字段。
+  - `usage.jsonl.state.json`：保存每个 session 的累计 totals + session 文件的 mtime/size，用于计算增量并避免重复统计。
+  - `profile-log.jsonl`：profile 使用与 session 绑定日志（`use`/`session`）。
+  - `statusline-debug.jsonl`：当 `CODE_ENV_STATUSLINE_DEBUG` 开启时写入的调试信息。
+  - 可通过 `usagePath`/`usageStatePath`/`profileLogPath`/`codexSessionsPath`/`claudeSessionsPath` 覆盖默认路径。
+- 会话绑定（profile -> session）
+  - `codenv init` 安装 shell 包装函数，使 `codex`/`claude` 实际走 `codenv launch`。
+  - `codenv launch` 记录 profile 使用，并在启动后短时间内（默认约 5 秒、每秒轮询）找到最新未绑定的 session 文件（优先 `cwd` 匹配），写入 `profile-log.jsonl`。
+  - 后续同步会用该绑定将 session 归因到对应 profile。
+- 状态栏同步（`codenv statusline --sync-usage`）
+  - 需要 `sessionId`、model，以及 profile（`profileKey` 或 `profileName`）才会写入用量。
+  - 从 stdin JSON 读取 totals，与 state 中的上次 totals 做差得到增量。
+  - 如果 totals 回退（session reset），直接把当前 totals 当作新增；否则对负数子项做 0 处理。
+  - 当拆分合计大于 total 时，以拆分合计为准。
+  - 把增量写入 `usage.jsonl`，并更新 state 中的 session totals。
+- 会话日志同步（`--sync-usage` 与 `codenv list`）
+  - 扫描 Codex 的 `CODEX_HOME/sessions`（或 `~/.codex/sessions`）与 Claude 的 `CLAUDE_HOME/projects`（或 `~/.claude/projects`）。
+  - Codex：读取 `event_msg` 的 token_count 记录，取累计最大值；cached input 计为 cache read，并在可判断时从 input 中扣除。
+  - Claude：汇总 `message.usage` 中的 input/output/cache tokens。
+  - 与 state 中的文件元数据和 session 最大值做差，生成增量并写入 `usage.jsonl`；无法解析到绑定的文件会被跳过。
+- 今日统计
+  - “今日”按本地时区 00:00 到次日 00:00 计算。
+- 费用换算
+  - 使用 profile 定价或 `pricing.models`（含默认值）换算，依赖 input/output/cache 拆分；缺少拆分则不显示金额。
+
 ### 添加 / 更新 profile
 
 ```bash

package/bin/cli/args.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseArgs = parseArgs;
 exports.parseInitArgs = parseInitArgs;
 exports.parseAddArgs = parseAddArgs;
+exports.parseUsageResetArgs = parseUsageResetArgs;
 exports.parseStatuslineArgs = parseStatuslineArgs;
 const type_1 = require("../profile/type");
 function parseArgs(argv) {
@@ -150,6 +151,18 @@ function parseAddArgs(args) {
     }
     return result;
 }
+function parseUsageResetArgs(args) {
+    const result = { yes: false };
+    for (let i = 0; i < args.length; i++) {
+        const arg = args[i];
+        if (arg === "-y" || arg === "--yes") {
+            result.yes = true;
+            continue;
+        }
+        throw new Error(`Unknown usage-reset argument: ${arg}`);
+    }
+    return result;
+}
 function parseNumberFlag(value, flag) {
     if (value === null || value === undefined || value === "") {
         throw new Error(`Missing value for ${flag}.`);

package/bin/cli/help.js

@@ -29,6 +29,7 @@ Usage:
   codenv launch <codex|claude> [--] [args...]
   codenv init
   codenv statusline [options]
+  codenv usage-reset [--yes]
 
 Options:
   -c, --config <path>   Path to config JSON
@@ -59,6 +60,9 @@ Statusline options:
   --usage-output <n>          Set output token usage
   --sync-usage                Sync usage from sessions before reading
 
+Usage reset options:
+  -y, --yes                   Skip confirmation prompt
+
 Examples:
   codenv init
   codenv use codex primary
@@ -69,6 +73,7 @@ Examples:
   codenv remove --all
   codenv launch codex -- --help
   codenv statusline --format json
+  codenv usage-reset --yes
   CODE_ENV_CONFIG=~/.config/code-env/config.json codenv use claude default
   codenv add --type codex primary OPENAI_BASE_URL=https://api.example.com/v1 OPENAI_API_KEY=YOUR_API_KEY
   codenv add

package/bin/cli/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printHelp = exports.parseStatuslineArgs = exports.parseAddArgs = exports.parseInitArgs = exports.parseArgs = void 0;
+exports.printHelp = exports.parseStatuslineArgs = exports.parseUsageResetArgs = exports.parseAddArgs = exports.parseInitArgs = exports.parseArgs = void 0;
 /**
  * CLI module exports
  */
@@ -8,6 +8,7 @@ var args_1 = require("./args");
 Object.defineProperty(exports, "parseArgs", { enumerable: true, get: function () { return args_1.parseArgs; } });
 Object.defineProperty(exports, "parseInitArgs", { enumerable: true, get: function () { return args_1.parseInitArgs; } });
 Object.defineProperty(exports, "parseAddArgs", { enumerable: true, get: function () { return args_1.parseAddArgs; } });
+Object.defineProperty(exports, "parseUsageResetArgs", { enumerable: true, get: function () { return args_1.parseUsageResetArgs; } });
 Object.defineProperty(exports, "parseStatuslineArgs", { enumerable: true, get: function () { return args_1.parseStatuslineArgs; } });
 var help_1 = require("./help");
 Object.defineProperty(exports, "printHelp", { enumerable: true, get: function () { return help_1.printHelp; } });

package/bin/commands/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.printStatusline = exports.runLaunch = exports.printUnset = exports.printShow = exports.addConfig = exports.printList = exports.printUse = exports.buildUseLines = void 0;
+exports.runUsageReset = exports.printStatusline = exports.runLaunch = exports.printUnset = exports.printShow = exports.addConfig = exports.printList = exports.printUse = exports.buildUseLines = void 0;
 /**
  * Commands module exports
  */
@@ -19,3 +19,5 @@ var launch_1 = require("./launch");
 Object.defineProperty(exports, "runLaunch", { enumerable: true, get: function () { return launch_1.runLaunch; } });
 var statusline_1 = require("./statusline");
 Object.defineProperty(exports, "printStatusline", { enumerable: true, get: function () { return statusline_1.printStatusline; } });
+var usage_1 = require("./usage");
+Object.defineProperty(exports, "runUsageReset", { enumerable: true, get: function () { return usage_1.runUsageReset; } });

package/bin/commands/usage.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.runUsageReset = runUsageReset;
+const usage_1 = require("../usage");
+const ui_1 = require("../ui");
+async function runUsageReset(config, configPath, args) {
+    if (!args.yes) {
+        const rl = (0, ui_1.createReadline)();
+        try {
+            const confirmed = await (0, ui_1.askConfirm)(rl, "Clear all usage history files? This cannot be undone. (y/N): ");
+            if (!confirmed)
+                return;
+        }
+        finally {
+            rl.close();
+        }
+    }
+    const result = (0, usage_1.clearUsageHistory)(config, configPath);
+    const removed = result.removed.sort();
+    const missing = result.missing.sort();
+    const failed = result.failed.sort((a, b) => a.path.localeCompare(b.path));
+    if (removed.length === 0 && failed.length === 0) {
+        console.log("No usage files found.");
+        return;
+    }
+    if (removed.length > 0) {
+        console.log(`Removed ${removed.length} file(s):`);
+        for (const filePath of removed) {
+            console.log(`- ${filePath}`);
+        }
+    }
+    if (missing.length > 0) {
+        console.log(`Skipped ${missing.length} missing file(s).`);
+    }
+    if (failed.length > 0) {
+        for (const failure of failed) {
+            console.error(`Failed to remove ${failure.path}: ${failure.error}`);
+        }
+        process.exitCode = 1;
+    }
+}

package/bin/index.js

@@ -111,6 +111,13 @@ async function main() {
             (0, commands_1.printStatusline)(config, configPath, statuslineArgs);
             return;
         }
+        if (cmd === "usage-reset" || cmd === "reset-usage") {
+            const resetArgs = (0, cli_1.parseUsageResetArgs)(args.slice(1));
+            const configPath = process.env.CODE_ENV_CONFIG_PATH || (0, config_1.findConfigPath)(parsed.configPath);
+            const config = (0, config_1.readConfigIfExists)(configPath);
+            await (0, commands_1.runUsageReset)(config, configPath, resetArgs);
+            return;
+        }
         const configPath = (0, config_1.findConfigPath)(parsed.configPath);
         const config = (0, config_1.readConfig)(configPath);
         if (cmd === "default") {

package/bin/statusline/debug.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStatuslineDebugPath = getStatuslineDebugPath;
 exports.appendStatuslineDebug = appendStatuslineDebug;
 const fs = require("fs");
 const path = require("path");

package/bin/statusline/usage/codex.js

@@ -7,19 +7,33 @@ function resolveOutputTokens(record) {
     var _a, _b;
     const outputTokens = (_a = (0, utils_1.firstNumber)(record.outputTokens, record.output, record.output_tokens)) !== null && _a !== void 0 ? _a : null;
     const reasoningTokens = (_b = (0, utils_1.firstNumber)(record.reasoning_output_tokens, record.reasoningOutputTokens, record.reasoning_output)) !== null && _b !== void 0 ? _b : null;
-    if (outputTokens === null && reasoningTokens === null)
-        return null;
-    if (reasoningTokens === null)
+    if (outputTokens !== null)
         return outputTokens;
-    return (outputTokens || 0) + reasoningTokens;
+    if (reasoningTokens !== null)
+        return reasoningTokens;
+    return null;
+}
+function splitInputTokens(record) {
+    var _a, _b;
+    const rawInput = (_a = (0, utils_1.firstNumber)(record.inputTokens, record.input, record.input_tokens)) !== null && _a !== void 0 ? _a : null;
+    const cacheRead = (_b = (0, utils_1.firstNumber)(record.cached_input_tokens, record.cachedInputTokens, record.cache_read_input_tokens, record.cacheReadInputTokens, record.cache_read, record.cacheRead)) !== null && _b !== void 0 ? _b : null;
+    if (rawInput === null) {
+        return { inputTokens: null, cacheReadTokens: cacheRead };
+    }
+    if (cacheRead === null) {
+        return { inputTokens: rawInput, cacheReadTokens: null };
+    }
+    const nonCachedInput = Math.max(0, rawInput - cacheRead);
+    return { inputTokens: nonCachedInput, cacheReadTokens: cacheRead };
 }
 function parseCodexUsageTotalsRecord(record) {
-    var _a, _b, _c, _d;
-    const inputTokens = (_a = (0, utils_1.firstNumber)(record.inputTokens, record.input, record.input_tokens)) !== null && _a !== void 0 ? _a : null;
+    var _a, _b;
+    const split = splitInputTokens(record);
+    const inputTokens = split.inputTokens;
     const outputTokens = resolveOutputTokens(record);
-    const cacheRead = (_b = (0, utils_1.firstNumber)(record.cached_input_tokens, record.cachedInputTokens, record.cache_read_input_tokens, record.cacheReadInputTokens, record.cache_read, record.cacheRead)) !== null && _b !== void 0 ? _b : null;
-    const cacheWrite = (_c = (0, utils_1.firstNumber)(record.cache_creation_input_tokens, record.cacheCreationInputTokens, record.cache_write_input_tokens, record.cacheWriteInputTokens, record.cache_write, record.cacheWrite)) !== null && _c !== void 0 ? _c : null;
-    const totalTokens = (_d = (0, utils_1.firstNumber)(record.totalTokens, record.total, record.total_tokens)) !== null && _d !== void 0 ? _d : null;
+    const cacheRead = split.cacheReadTokens;
+    const cacheWrite = (_a = (0, utils_1.firstNumber)(record.cache_creation_input_tokens, record.cacheCreationInputTokens, record.cache_write_input_tokens, record.cacheWriteInputTokens, record.cache_write, record.cacheWrite)) !== null && _a !== void 0 ? _a : null;
+    const totalTokens = (_b = (0, utils_1.firstNumber)(record.totalTokens, record.total, record.total_tokens)) !== null && _b !== void 0 ? _b : null;
     let computedTotal = null;
     if (inputTokens !== null ||
         outputTokens !== null ||
@@ -48,13 +62,14 @@ function parseCodexUsageTotalsRecord(record) {
     };
 }
 function parseCodexInputUsageRecord(record) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d;
     const todayTokens = (_a = (0, utils_1.firstNumber)(record.todayTokens, record.today, record.today_tokens, record.daily, record.daily_tokens)) !== null && _a !== void 0 ? _a : null;
     const totalTokens = (_b = (0, utils_1.firstNumber)(record.totalTokens, record.total, record.total_tokens)) !== null && _b !== void 0 ? _b : null;
-    const inputTokens = (_c = (0, utils_1.firstNumber)(record.inputTokens, record.input, record.input_tokens)) !== null && _c !== void 0 ? _c : null;
+    const split = splitInputTokens(record);
+    const inputTokens = split.inputTokens;
     const outputTokens = resolveOutputTokens(record);
-    const cacheRead = (_d = (0, utils_1.firstNumber)(record.cached_input_tokens, record.cachedInputTokens, record.cache_read_input_tokens, record.cacheReadInputTokens, record.cache_read, record.cacheRead)) !== null && _d !== void 0 ? _d : null;
-    const cacheWrite = (_e = (0, utils_1.firstNumber)(record.cache_creation_input_tokens, record.cacheCreationInputTokens, record.cache_write_input_tokens, record.cacheWriteInputTokens, record.cache_write, record.cacheWrite)) !== null && _e !== void 0 ? _e : null;
+    const cacheRead = split.cacheReadTokens;
+    const cacheWrite = (_c = (0, utils_1.firstNumber)(record.cache_creation_input_tokens, record.cacheCreationInputTokens, record.cache_write_input_tokens, record.cacheWriteInputTokens, record.cache_write, record.cacheWrite)) !== null && _c !== void 0 ? _c : null;
     if (todayTokens === null &&
         totalTokens === null &&
         inputTokens === null &&
@@ -71,7 +86,7 @@ function parseCodexInputUsageRecord(record) {
             (cacheWrite || 0)
         : null;
     const resolvedTodayTokens = hasCacheTokens
-        ? (_f = todayTokens !== null && todayTokens !== void 0 ? todayTokens : totalTokens) !== null && _f !== void 0 ? _f : computedTotal
+        ? (_d = todayTokens !== null && todayTokens !== void 0 ? todayTokens : totalTokens) !== null && _d !== void 0 ? _d : computedTotal
         : todayTokens;
     return {
         todayTokens: resolvedTodayTokens,
@@ -110,12 +125,6 @@ function getCodexUsageTotalsFromInput(input) {
             if (parsed)
                 return parsed;
         }
-        const lastUsage = resolveNestedRecord(tokenUsage, "last_token_usage", "lastTokenUsage");
-        if (lastUsage) {
-            const parsed = parseCodexUsageTotalsRecord(lastUsage);
-            if (parsed)
-                return parsed;
-        }
         const parsed = parseCodexUsageTotalsRecord(tokenUsage);
         if (parsed)
             return parsed;