@praeviso/code-env-switch 0.1.5 → 0.1.7

package/docs/usage_zh.md

@@ -0,0 +1,126 @@
+# 用量统计逻辑
+
+用量来自两条路径（状态栏输入同步 + 会话日志解析），最终追加到 `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 拆分；缺少拆分则不显示金额。
+
+## 示例
+
+### `usage.jsonl` 记录
+
+每行一条 JSON（字段可能为空或缺省，取决于来源）：
+
+```json
+{"ts":"2026-01-25T12:34:56.789Z","type":"codex","profileKey":"p_a1b2c3","profileName":"primary","model":"gpt-5.1-codex","sessionId":"a6f9c4d8-1234-5678-9abc-def012345678","inputTokens":1200,"outputTokens":300,"cacheReadTokens":200,"cacheWriteTokens":0,"totalTokens":1700}
+```
+
+`totalTokens` 会取“上报 total”和“拆分合计”的较大值，因此可能 >= input + output + cache。
+
+## 状态栏输入示例（Codex/Claude）
+
+可通过设置 `CODE_ENV_STATUSLINE_DEBUG=1`，在 `statusline-debug.jsonl`
+（或 `CODE_ENV_STATUSLINE_DEBUG_PATH` 指定路径）看到实际 JSON。
+
+### Codex（token_usage totals）
+
+```json
+{
+  "type": "codex",
+  "session_id": "a6f9c4d8-1234-5678-9abc-def012345678",
+  "profile": { "key": "p_a1b2c3", "name": "primary", "type": "codex" },
+  "model": "gpt-5.1-codex",
+  "token_usage": {
+    "total_token_usage": {
+      "input_tokens": 1200,
+      "output_tokens": 300,
+      "cached_input_tokens": 200,
+      "cache_creation_input_tokens": 50,
+      "total_tokens": 1750
+    },
+    "last_token_usage": {
+      "input_tokens": 100,
+      "output_tokens": 20,
+      "cached_input_tokens": 10,
+      "cache_creation_input_tokens": 0,
+      "total_tokens": 130
+    }
+  }
+}
+```
+
+可识别字段（节选）：
+- `token_usage.total_token_usage` 或 `token_usage.totalTokenUsage`
+- `last_token_usage` 或 `lastTokenUsage`
+- `input_tokens` / `inputTokens` / `input`
+- `output_tokens` / `outputTokens` / `output` / `reasoning_output_tokens`
+- `cached_input_tokens` / `cache_read_input_tokens`
+- `cache_creation_input_tokens` / `cache_write_input_tokens`
+- `total_tokens` / `totalTokens` / `total`
+
+`token_usage` 也可以是数字，或直接提供 `usage`。
+
+### Claude（context_window totals）
+
+```json
+{
+  "type": "claude",
+  "session_id": "1f2e3d4c-5678-90ab-cdef-1234567890ab",
+  "profile": { "key": "p_c3d4e5", "name": "default", "type": "claude" },
+  "model": { "display_name": "Claude Sonnet 4.5" },
+  "context_window": {
+    "total_input_tokens": 800,
+    "total_output_tokens": 250,
+    "current_usage": {
+      "cache_read_input_tokens": 100,
+      "cache_creation_input_tokens": 40
+    },
+    "context_window_size": 200000
+  }
+}
+```
+
+可识别字段（节选）：
+- `context_window` 或 `contextWindow`
+- `current_usage` 或 `currentUsage`
+- `total_input_tokens` / `totalInputTokens`
+- `total_output_tokens` / `totalOutputTokens`
+- `cache_read_input_tokens` / `cacheReadInputTokens`
+- `cache_creation_input_tokens` / `cacheWriteInputTokens`
+
+也可直接提供 `usage`，字段包括 `todayTokens` / `totalTokens` / `inputTokens` /
+`outputTokens` / `cacheReadTokens` / `cacheWriteTokens`。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@praeviso/code-env-switch",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "description": "Switch between Claude Code and Codex environment variables from a single CLI",
   "bin": {
     "codenv": "bin/index.js"

package/src/cli/args.ts

@@ -5,6 +5,7 @@ import type {
     ParsedArgs,
     InitArgs,
     AddArgs,
+    UsageResetArgs,
     ProfileType,
     StatuslineArgs,
 } from "../types";
@@ -156,6 +157,19 @@ export function parseAddArgs(args: string[]): AddArgs {
     return result;
 }
 
+export function parseUsageResetArgs(args: string[]): UsageResetArgs {
+    const result: UsageResetArgs = { 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: string | null | undefined, flag: string): number {
     if (value === null || value === undefined || value === "") {
         throw new Error(`Missing value for ${flag}.`);

package/src/cli/help.ts

@@ -27,6 +27,7 @@ Usage:
   codenv launch <codex|claude> [--] [args...]
   codenv init
   codenv statusline [options]
+  codenv usage-reset [--yes]
 
 Options:
   -c, --config <path>   Path to config JSON
@@ -57,6 +58,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
@@ -67,6 +71,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/src/cli/index.ts

@@ -1,5 +1,11 @@
 /**
  * CLI module exports
  */
-export { parseArgs, parseInitArgs, parseAddArgs, parseStatuslineArgs } from "./args";
+export {
+    parseArgs,
+    parseInitArgs,
+    parseAddArgs,
+    parseUsageResetArgs,
+    parseStatuslineArgs,
+} from "./args";
 export { printHelp } from "./help";

package/src/commands/index.ts

@@ -8,3 +8,4 @@ export { printShow } from "./show";
 export { printUnset } from "./unset";
 export { runLaunch } from "./launch";
 export { printStatusline } from "./statusline";
+export { runUsageReset } from "./usage";

package/src/commands/usage.ts

@@ -0,0 +1,53 @@
+/**
+ * Usage history reset command
+ */
+import type { Config, UsageResetArgs } from "../types";
+import { clearUsageHistory } from "../usage";
+import { askConfirm, createReadline } from "../ui";
+
+export async function runUsageReset(
+    config: Config,
+    configPath: string | null,
+    args: UsageResetArgs
+): Promise<void> {
+    if (!args.yes) {
+        const rl = createReadline();
+        try {
+            const confirmed = await askConfirm(
+                rl,
+                "Clear all usage history files? This cannot be undone. (y/N): "
+            );
+            if (!confirmed) return;
+        } finally {
+            rl.close();
+        }
+    }
+
+    const result = 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/src/index.ts

@@ -10,6 +10,7 @@ import {
     parseArgs,
     parseInitArgs,
     parseAddArgs,
+    parseUsageResetArgs,
     parseStatuslineArgs,
     printHelp,
 } from "./cli";
@@ -33,6 +34,7 @@ import {
     printUnset,
     runLaunch,
     printStatusline,
+    runUsageReset,
 } from "./commands";
 import { logProfileUse } from "./usage";
 import { createReadline, askConfirm, runInteractiveAdd, runInteractiveUse } from "./ui";
@@ -152,6 +154,15 @@ async function main() {
             return;
         }
 
+        if (cmd === "usage-reset" || cmd === "reset-usage") {
+            const resetArgs = parseUsageResetArgs(args.slice(1));
+            const configPath =
+                process.env.CODE_ENV_CONFIG_PATH || findConfigPath(parsed.configPath);
+            const config = readConfigIfExists(configPath);
+            await runUsageReset(config, configPath, resetArgs);
+            return;
+        }
+
         const configPath = findConfigPath(parsed.configPath);
         const config = readConfig(configPath!);
 

package/src/statusline/debug.ts

@@ -16,7 +16,7 @@ function resolveDefaultConfigDir(configPath: string | null): string {
     return path.join(os.homedir(), ".config", "code-env");
 }
 
-function getStatuslineDebugPath(configPath: string | null): string {
+export function getStatuslineDebugPath(configPath: string | null): string {
     const envPath = resolvePath(process.env.CODE_ENV_STATUSLINE_DEBUG_PATH);
     if (envPath) return envPath;
     return path.join(resolveDefaultConfigDir(configPath), "statusline-debug.jsonl");

package/src/statusline/usage/codex.ts

@@ -18,21 +18,20 @@ function resolveOutputTokens(record: Record<string, unknown>): number | null {
             record.reasoningOutputTokens,
             record.reasoning_output
         ) ?? null;
-    if (outputTokens === null && reasoningTokens === null) return null;
-    if (reasoningTokens === null) return outputTokens;
-    return (outputTokens || 0) + reasoningTokens;
+    if (outputTokens !== null) return outputTokens;
+    if (reasoningTokens !== null) return reasoningTokens;
+    return null;
 }
 
-function parseCodexUsageTotalsRecord(
+function splitInputTokens(
     record: Record<string, unknown>
-): StatuslineUsageTotals | null {
-    const inputTokens =
+): { inputTokens: number | null; cacheReadTokens: number | null } {
+    const rawInput =
         firstNumber(
             record.inputTokens,
             record.input,
             record.input_tokens
         ) ?? null;
-    const outputTokens = resolveOutputTokens(record);
     const cacheRead =
         firstNumber(
             record.cached_input_tokens,
@@ -42,6 +41,23 @@ function parseCodexUsageTotalsRecord(
             record.cache_read,
             record.cacheRead
         ) ?? 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: Record<string, unknown>
+): StatuslineUsageTotals | null {
+    const split = splitInputTokens(record);
+    const inputTokens = split.inputTokens;
+    const outputTokens = resolveOutputTokens(record);
+    const cacheRead = split.cacheReadTokens;
     const cacheWrite =
         firstNumber(
             record.cache_creation_input_tokens,
@@ -106,22 +122,10 @@ function parseCodexInputUsageRecord(
             record.total,
             record.total_tokens
         ) ?? null;
-    const inputTokens =
-        firstNumber(
-            record.inputTokens,
-            record.input,
-            record.input_tokens
-        ) ?? null;
+    const split = splitInputTokens(record);
+    const inputTokens = split.inputTokens;
     const outputTokens = resolveOutputTokens(record);
-    const cacheRead =
-        firstNumber(
-            record.cached_input_tokens,
-            record.cachedInputTokens,
-            record.cache_read_input_tokens,
-            record.cacheReadInputTokens,
-            record.cache_read,
-            record.cacheRead
-        ) ?? null;
+    const cacheRead = split.cacheReadTokens;
     const cacheWrite =
         firstNumber(
             record.cache_creation_input_tokens,
@@ -197,15 +201,6 @@ export function getCodexUsageTotalsFromInput(
             const parsed = parseCodexUsageTotalsRecord(totalUsage);
             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 as Record<string, unknown>);
         if (parsed) return parsed;
     }

package/src/types.ts

@@ -101,6 +101,10 @@ export interface AddArgs {
     type: ProfileType | null;
 }
 
+export interface UsageResetArgs {
+    yes: boolean;
+}
+
 export type StatuslineFormat = "text" | "json";
 
 export interface StatuslineArgs {