@praeviso/code-env-switch 0.1.4 → 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
@@ -217,6 +257,17 @@ If nothing is found, `codenv add` writes to `~/.config/code-env/config.json`.
     "type": "command",
     "padding": 0
   },
+  "pricing": {
+    "models": {
+      "Claude Sonnet 4.5": {
+        "input": 3.0,
+        "output": 15.0,
+        "cacheWrite": 3.75,
+        "cacheRead": 0.3,
+        "description": "Balanced performance and speed for daily use."
+      }
+    }
+  },
   "profiles": {
     "p_a1b2c3": {
       "name": "primary",
@@ -247,10 +298,16 @@ Notes:
   - `type`: string; statusLine type (default: `command`).
   - `padding`: number; statusLine padding (default: 0).
   - `settingsPath`: optional; override `~/.claude/settings.json` (also supports `CODE_ENV_CLAUDE_SETTINGS_PATH`).
+- `pricing`: optional; model pricing (USD per 1M tokens) used to convert token usage to dollar amounts in the status line.
+  - `models`: map of model name to pricing. Keys are matched case/format-insensitively.
+  - `input`/`output`/`cacheRead`/`cacheWrite`: token rates.
+  - Cost display uses the profile pricing model if set; otherwise the status line model label. No breakdown => no cost.
 - `name`: human-facing profile name shown in `codenv list` and used by `codenv use <name>`.
 - `type`: optional; `codex` or `claude` (alias `cc`) for `codenv use <type> <name>` matching.
 - `note`: shown in `codenv list`.
 - `removeFiles`: optional; `codenv use` emits `rm -f` for each path. Codex profiles also remove `~/.codex/auth.json`.
+- `pricing` (profile): optional; per-profile pricing override. Supports `model` plus `input`/`output`/`cacheRead`/`cacheWrite`.
+  - `multiplier`: optional; scale pricing (number).
 - `ANTHROPIC_AUTH_TOKEN`: when `ANTHROPIC_API_KEY` is set, `codenv use` also exports `ANTHROPIC_AUTH_TOKEN` with the same value.
 - `commands`: optional; emitted as-is in the switch script.
 

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
@@ -216,6 +256,17 @@ codenv use codex primary | source
     "type": "command",
     "padding": 0
   },
+  "pricing": {
+    "models": {
+      "Claude Sonnet 4.5": {
+        "input": 3.0,
+        "output": 15.0,
+        "cacheWrite": 3.75,
+        "cacheRead": 0.3,
+        "description": "平衡性能与速度，适合日常使用"
+      }
+    }
+  },
   "profiles": {
     "p_a1b2c3": {
       "name": "primary",
@@ -246,10 +297,16 @@ codenv use codex primary | source
   - `type`：字符串；statusLine 类型（默认 `command`）。
   - `padding`：数字；statusLine padding（默认 0）。
   - `settingsPath`：可选；覆盖 `~/.claude/settings.json`（也可用 `CODE_ENV_CLAUDE_SETTINGS_PATH`）。
+- `pricing`：可选；模型价格（美元 / 1M tokens），用于在状态栏将 token 用量换算为美元额度。
+  - `models`：模型名称到价格的映射（匹配时忽略大小写与格式差异）。
+  - `input`/`output`/`cacheRead`/`cacheWrite`：输入/输出/缓存价格。
+  - 优先使用 profile 中指定的 `model`，否则使用状态栏输入的模型名称；无拆分则不显示金额。
 - `name`：用于展示的 profile 名称，`codenv list` 与 `codenv use <name>` 会使用它。
 - `type`：可选，`codex` 或 `claude`（别名 `cc`），便于用 `codenv use <type> <name>` 匹配。
 - `note`：显示在 `codenv list` 输出中。
 - `removeFiles`：可选；`codenv use` 会输出对应 `rm -f`。Codex profile 还会删除 `~/.codex/auth.json`。
+- `pricing`（profile 内）：可选；为单个 profile 覆盖价格。支持 `model` 以及 `input`/`output`/`cacheRead`/`cacheWrite`。
+  - `multiplier`：可选；倍率（数字）。
 - `ANTHROPIC_AUTH_TOKEN`：当设置了 `ANTHROPIC_API_KEY` 时，`codenv use` 会自动以同样的值导出 `ANTHROPIC_AUTH_TOKEN`。
 - `commands`：可选；原样输出到切换脚本中。
 

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/list.js

@@ -4,6 +4,7 @@ exports.printList = printList;
 const display_1 = require("../profile/display");
 const defaults_1 = require("../config/defaults");
 const usage_1 = require("../usage");
+const pricing_1 = require("../usage/pricing");
 function printList(config, configPath) {
     const rows = (0, display_1.buildListRows)(config, defaults_1.getResolvedDefaultProfileKeys);
     if (rows.length === 0) {
@@ -12,6 +13,7 @@ function printList(config, configPath) {
     }
     try {
         const usageTotals = (0, usage_1.readUsageTotalsIndex)(config, configPath, true);
+        const usageCosts = (0, usage_1.readUsageCostIndex)(config, configPath, false);
         if (usageTotals) {
             for (const row of rows) {
                 if (!row.usageType)
@@ -23,6 +25,19 @@ function printList(config, configPath) {
                 row.totalTokens = usage.total;
             }
         }
+        if (usageCosts) {
+            for (const row of rows) {
+                if (!row.usageType)
+                    continue;
+                const cost = (0, usage_1.resolveUsageCostForProfile)(usageCosts, row.usageType, row.key, row.name);
+                if (!cost)
+                    continue;
+                row.todayCost = cost.today;
+                row.totalCost = cost.total;
+                row.todayBilledTokens = cost.todayTokens;
+                row.totalBilledTokens = cost.totalTokens;
+            }
+        }
     }
     catch {
         // ignore usage sync errors
@@ -32,8 +47,14 @@ function printList(config, configPath) {
     const headerToday = "TODAY";
     const headerTotal = "TOTAL";
     const headerNote = "NOTE";
-    const todayTexts = rows.map((row) => (0, usage_1.formatTokenCount)(row.todayTokens));
-    const totalTexts = rows.map((row) => (0, usage_1.formatTokenCount)(row.totalTokens));
+    const todayTexts = rows.map((row) => {
+        var _a, _b;
+        return formatUsageWithCost(row.todayTokens, (_a = row.todayBilledTokens) !== null && _a !== void 0 ? _a : null, (_b = row.todayCost) !== null && _b !== void 0 ? _b : null);
+    });
+    const totalTexts = rows.map((row) => {
+        var _a, _b;
+        return formatUsageWithCost(row.totalTokens, (_a = row.totalBilledTokens) !== null && _a !== void 0 ? _a : null, (_b = row.totalCost) !== null && _b !== void 0 ? _b : null);
+    });
     const nameWidth = Math.max(headerName.length, ...rows.map((row) => row.name.length));
     const typeWidth = Math.max(headerType.length, ...rows.map((row) => row.type.length));
     const todayWidth = Math.max(headerToday.length, ...todayTexts.map((v) => v.length));
@@ -55,3 +76,24 @@ function printList(config, configPath) {
         }
     }
 }
+function formatUsageWithCost(tokens, billedTokens, cost) {
+    const tokenText = (0, usage_1.formatTokenCount)(tokens !== null && tokens !== void 0 ? tokens : null);
+    if (tokenText === "-")
+        return tokenText;
+    if (cost === null || !Number.isFinite(cost))
+        return tokenText;
+    if (tokens === null || tokens === undefined || !Number.isFinite(tokens)) {
+        return tokenText;
+    }
+    if (billedTokens === null || !Number.isFinite(billedTokens)) {
+        return `${tokenText} (${(0, pricing_1.formatUsdAmount)(cost)})`;
+    }
+    if (billedTokens >= tokens) {
+        return `${tokenText} (${(0, pricing_1.formatUsdAmount)(cost)})`;
+    }
+    const billedText = (0, usage_1.formatTokenCount)(billedTokens);
+    if (billedText === "-") {
+        return `${tokenText} (${(0, pricing_1.formatUsdAmount)(cost)})`;
+    }
+    return `${tokenText} (billed ${billedText}, ${(0, pricing_1.formatUsdAmount)(cost)})`;
+}

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/format.js

@@ -8,6 +8,7 @@ exports.formatContextSegment = formatContextSegment;
 exports.formatContextUsedSegment = formatContextUsedSegment;
 exports.formatModeSegment = formatModeSegment;
 const usage_1 = require("../usage");
+const pricing_1 = require("../usage/pricing");
 const style_1 = require("./style");
 const path = require("path");
 function getCwdSegment(cwd) {
@@ -17,16 +18,12 @@ function getCwdSegment(cwd) {
     const segment = `${style_1.ICON_CWD} ${base}`;
     return (0, style_1.dim)(segment);
 }
-function formatUsageSegment(usage) {
-    var _a;
-    if (!usage)
+function formatUsageSegment(todayCost, sessionCost) {
+    if (todayCost === null && sessionCost === null)
         return null;
-    const today = (_a = usage.todayTokens) !== null && _a !== void 0 ? _a : (usage.inputTokens !== null || usage.outputTokens !== null
-        ? (usage.inputTokens || 0) + (usage.outputTokens || 0)
-        : usage.totalTokens);
-    if (today === null)
-        return null;
-    const text = `Today ${(0, usage_1.formatTokenCount)(today)}`;
+    const todayText = `T ${(0, pricing_1.formatUsdAmount)(todayCost)}`;
+    const sessionText = `S ${(0, pricing_1.formatUsdAmount)(sessionCost)}`;
+    const text = `${todayText} / ${sessionText}`;
     return (0, style_1.colorize)(`${style_1.ICON_USAGE} ${text}`, "33");
 }
 function formatModelSegment(model, provider) {

package/bin/statusline/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildStatuslineResult = buildStatuslineResult;
 const type_1 = require("../profile/type");
 const usage_1 = require("../usage");
+const pricing_1 = require("../usage/pricing");
 const debug_1 = require("./debug");
 const format_1 = require("./format");
 const git_1 = require("./git");
@@ -37,8 +38,10 @@ function buildStatuslineResult(args, config, configPath) {
     }
     const cwd = (0, utils_1.firstNonEmpty)(args.cwd, process.env.CODE_ENV_CWD, (0, input_1.getWorkspaceDir)(stdinInput), stdinInput ? stdinInput.cwd : null, process.cwd());
     const sessionId = (0, input_1.getSessionId)(stdinInput);
-    const stdinUsageTotals = (0, usage_2.getUsageTotalsFromInput)(stdinInput);
     const usageType = (0, type_1.normalizeType)(type || "");
+    const stdinUsageTotals = (0, usage_2.getUsageTotalsFromInput)(stdinInput, usageType);
+    const model = (0, utils_1.firstNonEmpty)(args.model, process.env.CODE_ENV_MODEL, (0, input_1.getModelFromInput)(stdinInput));
+    const modelProvider = (0, utils_1.firstNonEmpty)(process.env.CODE_ENV_MODEL_PROVIDER, (0, input_1.getModelProviderFromInput)(stdinInput));
     (0, debug_1.appendStatuslineDebug)(configPath, {
         timestamp: new Date().toISOString(),
         typeCandidate,
@@ -68,27 +71,31 @@ function buildStatuslineResult(args, config, configPath) {
         input: stdinInput,
     });
     if (args.syncUsage && sessionId && stdinUsageTotals) {
-        (0, usage_1.syncUsageFromStatuslineInput)(config, configPath, usageType, profileKey, profileName, sessionId, stdinUsageTotals, cwd);
+        (0, usage_1.syncUsageFromStatuslineInput)(config, configPath, usageType, profileKey, profileName, sessionId, stdinUsageTotals, cwd, model);
     }
-    const model = (0, utils_1.firstNonEmpty)(args.model, process.env.CODE_ENV_MODEL, (0, input_1.getModelFromInput)(stdinInput));
-    const modelProvider = (0, utils_1.firstNonEmpty)(process.env.CODE_ENV_MODEL_PROVIDER, (0, input_1.getModelProviderFromInput)(stdinInput));
     const usage = {
         todayTokens: (0, utils_1.firstNumber)(args.usageToday, process.env.CODE_ENV_USAGE_TODAY),
         totalTokens: (0, utils_1.firstNumber)(args.usageTotal, process.env.CODE_ENV_USAGE_TOTAL),
         inputTokens: (0, utils_1.firstNumber)(args.usageInput, process.env.CODE_ENV_USAGE_INPUT),
         outputTokens: (0, utils_1.firstNumber)(args.usageOutput, process.env.CODE_ENV_USAGE_OUTPUT),
+        cacheReadTokens: null,
+        cacheWriteTokens: null,
     };
     const hasExplicitUsage = usage.todayTokens !== null ||
         usage.totalTokens !== null ||
         usage.inputTokens !== null ||
         usage.outputTokens !== null;
-    const stdinUsage = (0, usage_2.normalizeInputUsage)((0, input_1.getInputUsage)(stdinInput));
+    const stdinUsage = (0, usage_2.normalizeInputUsage)((0, input_1.getInputUsage)(stdinInput, usageType));
+    const recordsUsage = (0, usage_2.resolveUsageFromRecords)(config, configPath, type, profileKey, profileName, args.syncUsage);
     let finalUsage = hasExplicitUsage ? usage : null;
+    if (!finalUsage && args.syncUsage && recordsUsage) {
+        finalUsage = recordsUsage;
+    }
     if (!finalUsage) {
         finalUsage = stdinUsage;
     }
-    if (!finalUsage) {
-        finalUsage = (0, usage_2.resolveUsageFromRecords)(config, configPath, type, profileKey, profileName, args.syncUsage);
+    if (!finalUsage && recordsUsage) {
+        finalUsage = recordsUsage;
     }
     let gitStatus = (0, git_1.getGitStatus)(cwd);
     if (!gitStatus) {
@@ -103,7 +110,38 @@ function buildStatuslineResult(args, config, configPath) {
     const gitSegment = (0, git_1.formatGitSegment)(gitStatus);
     const profileSegment = (0, format_1.formatProfileSegment)(type, profileKey, profileName);
     const modelSegment = (0, format_1.formatModelSegment)(model, modelProvider);
-    const usageSegment = (0, format_1.formatUsageSegment)(finalUsage);
+    let profile = profileKey && config.profiles ? config.profiles[profileKey] : null;
+    if (!profile && profileName && config.profiles) {
+        const matches = Object.entries(config.profiles).find(([key, entry]) => {
+            const displayName = (0, type_1.getProfileDisplayName)(key, entry);
+            return (displayName === profileName ||
+                entry.name === profileName ||
+                key === profileName);
+        });
+        if (matches)
+            profile = matches[1];
+    }
+    const sessionUsage = hasExplicitUsage ? usage : stdinUsage;
+    const pricing = (0, pricing_1.resolvePricingForProfile)(config, profile || null, model);
+    let sessionCost = null;
+    if (hasExplicitUsage) {
+        sessionCost = sessionUsage
+            ? (0, pricing_1.calculateUsageCost)(sessionUsage, pricing)
+            : null;
+    }
+    else {
+        const sessionCostFromRecords = sessionId
+            ? (0, usage_1.readUsageSessionCost)(config, configPath, type, sessionId, args.syncUsage)
+            : null;
+        sessionCost =
+            sessionCostFromRecords !== null && sessionCostFromRecords !== void 0 ? sessionCostFromRecords : (sessionUsage ? (0, pricing_1.calculateUsageCost)(sessionUsage, pricing) : null);
+    }
+    const costIndex = (0, usage_1.readUsageCostIndex)(config, configPath, args.syncUsage);
+    const costTotals = costIndex
+        ? (0, usage_1.resolveUsageCostForProfile)(costIndex, type, profileKey, profileName)
+        : null;
+    const todayCost = costTotals ? costTotals.today : null;
+    const usageSegment = (0, format_1.formatUsageSegment)(todayCost, sessionCost);
     const contextLeft = (0, input_1.getContextLeftPercent)(stdinInput, type);
     const contextSegment = (0, format_1.formatContextSegment)(contextLeft);
     const contextUsedTokens = (0, input_1.getContextUsedTokens)(stdinInput);

package/bin/statusline/input.js

@@ -17,6 +17,8 @@ const fs = require("fs");
 const constants_1 = require("../constants");
 const type_1 = require("../profile/type");
 const utils_1 = require("./utils");
+const claude_1 = require("./usage/claude");
+const codex_1 = require("./usage/codex");
 function readStdinJson() {
     if (process.stdin.isTTY)
         return null;
@@ -92,101 +94,17 @@ function getInputProfile(input) {
         return null;
     return input.profile;
 }
-function getInputUsage(input) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+function getInputUsage(input, type) {
     if (!input)
         return null;
-    if ((0, utils_1.isRecord)(input.usage)) {
-        return input.usage;
+    const normalized = normalizeTypeValue(type);
+    if (normalized === "codex") {
+        return (0, codex_1.getCodexInputUsage)(input);
     }
-    const tokenUsage = input.token_usage;
-    if (tokenUsage !== null && tokenUsage !== undefined) {
-        if (typeof tokenUsage === "number") {
-            return {
-                todayTokens: null,
-                totalTokens: (0, utils_1.coerceNumber)(tokenUsage),
-                inputTokens: null,
-                outputTokens: null,
-            };
-        }
-        if ((0, utils_1.isRecord)(tokenUsage)) {
-            const record = tokenUsage;
-            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 outputTokens = (_d = (0, utils_1.firstNumber)(record.outputTokens, record.output, record.output_tokens)) !== null && _d !== void 0 ? _d : null;
-            const cacheRead = (_e = (0, utils_1.firstNumber)(record.cache_read_input_tokens, record.cacheReadInputTokens, record.cache_read, record.cacheRead)) !== null && _e !== void 0 ? _e : null;
-            const cacheWrite = (_f = (0, utils_1.firstNumber)(record.cache_creation_input_tokens, record.cacheCreationInputTokens, record.cache_write_input_tokens, record.cacheWriteInputTokens, record.cache_write, record.cacheWrite)) !== null && _f !== void 0 ? _f : null;
-            if (todayTokens === null &&
-                totalTokens === null &&
-                inputTokens === null &&
-                outputTokens === null &&
-                cacheRead === null &&
-                cacheWrite === null) {
-                return null;
-            }
-            const hasCacheTokens = cacheRead !== null || cacheWrite !== null;
-            const computedTotal = hasCacheTokens
-                ? (inputTokens || 0) +
-                    (outputTokens || 0) +
-                    (cacheRead || 0) +
-                    (cacheWrite || 0)
-                : null;
-            const resolvedTodayTokens = hasCacheTokens
-                ? (_g = todayTokens !== null && todayTokens !== void 0 ? todayTokens : totalTokens) !== null && _g !== void 0 ? _g : computedTotal
-                : todayTokens;
-            return {
-                todayTokens: resolvedTodayTokens,
-                totalTokens: totalTokens !== null && totalTokens !== void 0 ? totalTokens : null,
-                inputTokens,
-                outputTokens,
-            };
-        }
+    if (normalized === "claude") {
+        return (0, claude_1.getClaudeInputUsage)(input);
     }
-    const contextWindow = (0, utils_1.isRecord)(input.context_window)
-        ? input.context_window
-        : (0, utils_1.isRecord)(input.contextWindow)
-            ? input.contextWindow
-            : null;
-    if (!contextWindow)
-        return null;
-    const totalInputTokens = (_h = (0, utils_1.firstNumber)(contextWindow.total_input_tokens, contextWindow.totalInputTokens)) !== null && _h !== void 0 ? _h : null;
-    const totalOutputTokens = (_j = (0, utils_1.firstNumber)(contextWindow.total_output_tokens, contextWindow.totalOutputTokens)) !== null && _j !== void 0 ? _j : null;
-    if (totalInputTokens !== null || totalOutputTokens !== null) {
-        return {
-            todayTokens: null,
-            totalTokens: null,
-            inputTokens: totalInputTokens,
-            outputTokens: totalOutputTokens,
-        };
-    }
-    const currentUsage = (0, utils_1.isRecord)(contextWindow.current_usage)
-        ? contextWindow.current_usage
-        : (0, utils_1.isRecord)(contextWindow.currentUsage)
-            ? contextWindow.currentUsage
-            : null;
-    if (!currentUsage)
-        return null;
-    const inputTokens = (_k = (0, utils_1.firstNumber)(currentUsage.input_tokens, currentUsage.inputTokens)) !== null && _k !== void 0 ? _k : null;
-    const outputTokens = (_l = (0, utils_1.firstNumber)(currentUsage.output_tokens, currentUsage.outputTokens)) !== null && _l !== void 0 ? _l : null;
-    const cacheRead = (_m = (0, utils_1.firstNumber)(currentUsage.cache_read_input_tokens, currentUsage.cacheReadInputTokens)) !== null && _m !== void 0 ? _m : null;
-    const cacheWrite = (_o = (0, utils_1.firstNumber)(currentUsage.cache_creation_input_tokens, currentUsage.cacheCreationInputTokens)) !== null && _o !== void 0 ? _o : null;
-    if (inputTokens === null &&
-        outputTokens === null &&
-        cacheRead === null &&
-        cacheWrite === null) {
-        return null;
-    }
-    const totalTokens = (inputTokens || 0) +
-        (outputTokens || 0) +
-        (cacheRead || 0) +
-        (cacheWrite || 0);
-    return {
-        todayTokens: totalTokens,
-        totalTokens: null,
-        inputTokens,
-        outputTokens,
-    };
+    return (0, codex_1.getCodexInputUsage)(input) || (0, claude_1.getClaudeInputUsage)(input);
 }
 function getSessionId(input) {
     if (!input)