@praeviso/code-env-switch 0.1.4 → 0.1.5

package/bin/statusline/usage/codex.js

@@ -0,0 +1,168 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCodexUsageTotalsFromInput = getCodexUsageTotalsFromInput;
+exports.getCodexInputUsage = getCodexInputUsage;
+const utils_1 = require("../utils");
+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)
+        return outputTokens;
+    return (outputTokens || 0) + reasoningTokens;
+}
+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;
+    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;
+    let computedTotal = null;
+    if (inputTokens !== null ||
+        outputTokens !== null ||
+        cacheRead !== null ||
+        cacheWrite !== null) {
+        computedTotal =
+            (inputTokens || 0) +
+                (outputTokens || 0) +
+                (cacheRead || 0) +
+                (cacheWrite || 0);
+    }
+    const resolvedTotal = totalTokens !== null && totalTokens !== void 0 ? totalTokens : computedTotal;
+    if (inputTokens === null &&
+        outputTokens === null &&
+        cacheRead === null &&
+        cacheWrite === null &&
+        resolvedTotal === null) {
+        return null;
+    }
+    return {
+        inputTokens,
+        outputTokens,
+        cacheReadTokens: cacheRead,
+        cacheWriteTokens: cacheWrite,
+        totalTokens: resolvedTotal,
+    };
+}
+function parseCodexInputUsageRecord(record) {
+    var _a, _b, _c, _d, _e, _f;
+    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 = 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;
+    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
+        ? (_f = todayTokens !== null && todayTokens !== void 0 ? todayTokens : totalTokens) !== null && _f !== void 0 ? _f : computedTotal
+        : todayTokens;
+    return {
+        todayTokens: resolvedTodayTokens,
+        totalTokens: totalTokens !== null && totalTokens !== void 0 ? totalTokens : null,
+        inputTokens,
+        outputTokens,
+        cacheReadTokens: cacheRead,
+        cacheWriteTokens: cacheWrite,
+    };
+}
+function resolveNestedRecord(record, ...keys) {
+    for (const key of keys) {
+        if ((0, utils_1.isRecord)(record[key])) {
+            return record[key];
+        }
+    }
+    return null;
+}
+function getCodexUsageTotalsFromInput(input) {
+    if (!input)
+        return null;
+    const tokenUsage = input.token_usage;
+    if (typeof tokenUsage === "number") {
+        return {
+            inputTokens: null,
+            outputTokens: null,
+            cacheReadTokens: null,
+            cacheWriteTokens: null,
+            totalTokens: (0, utils_1.coerceNumber)(tokenUsage),
+        };
+    }
+    if ((0, utils_1.isRecord)(tokenUsage)) {
+        const totalUsage = resolveNestedRecord(tokenUsage, "total_token_usage", "totalTokenUsage");
+        if (totalUsage) {
+            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);
+        if (parsed)
+            return parsed;
+    }
+    if ((0, utils_1.isRecord)(input.usage)) {
+        return parseCodexUsageTotalsRecord(input.usage);
+    }
+    return null;
+}
+function getCodexInputUsage(input) {
+    if (!input)
+        return null;
+    if ((0, utils_1.isRecord)(input.usage)) {
+        const parsed = parseCodexInputUsageRecord(input.usage);
+        if (parsed)
+            return parsed;
+        return input.usage;
+    }
+    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,
+                cacheReadTokens: null,
+                cacheWriteTokens: null,
+            };
+        }
+        if ((0, utils_1.isRecord)(tokenUsage)) {
+            const totalUsage = resolveNestedRecord(tokenUsage, "total_token_usage", "totalTokenUsage");
+            if (totalUsage) {
+                const parsed = parseCodexInputUsageRecord(totalUsage);
+                if (parsed)
+                    return parsed;
+            }
+            const lastUsage = resolveNestedRecord(tokenUsage, "last_token_usage", "lastTokenUsage");
+            if (lastUsage) {
+                const parsed = parseCodexInputUsageRecord(lastUsage);
+                if (parsed)
+                    return parsed;
+            }
+            const parsed = parseCodexInputUsageRecord(tokenUsage);
+            if (parsed)
+                return parsed;
+        }
+    }
+    return null;
+}

package/bin/statusline/usage.js

@@ -1,88 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseUsageTotalsRecord = parseUsageTotalsRecord;
 exports.getUsageTotalsFromInput = getUsageTotalsFromInput;
 exports.normalizeInputUsage = normalizeInputUsage;
 exports.resolveUsageFromRecords = resolveUsageFromRecords;
 const type_1 = require("../profile/type");
 const usage_1 = require("../usage");
 const utils_1 = require("./utils");
-function parseUsageTotalsRecord(record) {
-    var _a, _b, _c, _d, _e;
-    const inputTokens = (_a = (0, utils_1.firstNumber)(record.inputTokens, record.input, record.input_tokens)) !== null && _a !== void 0 ? _a : null;
-    const outputTokens = (_b = (0, utils_1.firstNumber)(record.outputTokens, record.output, record.output_tokens)) !== null && _b !== void 0 ? _b : null;
-    const totalTokens = (_c = (0, utils_1.firstNumber)(record.totalTokens, record.total, record.total_tokens)) !== null && _c !== void 0 ? _c : null;
-    const cacheRead = (_d = (0, utils_1.firstNumber)(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;
-    let computedTotal = null;
-    if (inputTokens !== null ||
-        outputTokens !== null ||
-        cacheRead !== null ||
-        cacheWrite !== null) {
-        computedTotal =
-            (inputTokens || 0) +
-                (outputTokens || 0) +
-                (cacheRead || 0) +
-                (cacheWrite || 0);
-    }
-    const resolvedTotal = totalTokens !== null && totalTokens !== void 0 ? totalTokens : computedTotal;
-    if (inputTokens === null &&
-        outputTokens === null &&
-        resolvedTotal === null) {
-        return null;
-    }
-    return {
-        inputTokens,
-        outputTokens,
-        totalTokens: resolvedTotal,
-    };
-}
-function getUsageTotalsFromInput(input) {
-    var _a, _b;
+const claude_1 = require("./usage/claude");
+const codex_1 = require("./usage/codex");
+function getUsageTotalsFromInput(input, type) {
     if (!input)
         return null;
-    const contextWindow = (0, utils_1.isRecord)(input.context_window)
-        ? input.context_window
-        : (0, utils_1.isRecord)(input.contextWindow)
-            ? input.contextWindow
-            : null;
-    if (contextWindow) {
-        const totalInputTokens = (_a = (0, utils_1.firstNumber)(contextWindow.total_input_tokens, contextWindow.totalInputTokens)) !== null && _a !== void 0 ? _a : null;
-        const totalOutputTokens = (_b = (0, utils_1.firstNumber)(contextWindow.total_output_tokens, contextWindow.totalOutputTokens)) !== null && _b !== void 0 ? _b : null;
-        if (totalInputTokens !== null || totalOutputTokens !== null) {
-            return {
-                inputTokens: totalInputTokens,
-                outputTokens: totalOutputTokens,
-                totalTokens: (totalInputTokens || 0) + (totalOutputTokens || 0),
-            };
-        }
-    }
-    if (typeof input.token_usage === "number") {
-        return {
-            inputTokens: null,
-            outputTokens: null,
-            totalTokens: (0, utils_1.coerceNumber)(input.token_usage),
-        };
-    }
-    if ((0, utils_1.isRecord)(input.token_usage)) {
-        const tokenUsage = input.token_usage;
-        const totalUsage = ((0, utils_1.isRecord)(tokenUsage.total_token_usage)
-            ? tokenUsage.total_token_usage
-            : null) ||
-            ((0, utils_1.isRecord)(tokenUsage.totalTokenUsage)
-                ? tokenUsage.totalTokenUsage
-                : null);
-        if (totalUsage) {
-            const parsed = parseUsageTotalsRecord(totalUsage);
-            if (parsed)
-                return parsed;
-        }
-        return parseUsageTotalsRecord(tokenUsage);
+    const normalized = (0, type_1.normalizeType)(type || "");
+    if (normalized === "codex") {
+        return (0, codex_1.getCodexUsageTotalsFromInput)(input);
     }
-    if ((0, utils_1.isRecord)(input.usage)) {
-        return parseUsageTotalsRecord(input.usage);
+    if (normalized === "claude") {
+        return (0, claude_1.getClaudeUsageTotalsFromInput)(input);
     }
-    return null;
+    return ((0, codex_1.getCodexUsageTotalsFromInput)(input) ||
+        (0, claude_1.getClaudeUsageTotalsFromInput)(input));
 }
 function normalizeInputUsage(inputUsage) {
     if (!inputUsage)
@@ -92,14 +29,19 @@ function normalizeInputUsage(inputUsage) {
         totalTokens: (0, utils_1.coerceNumber)(inputUsage.totalTokens),
         inputTokens: (0, utils_1.coerceNumber)(inputUsage.inputTokens),
         outputTokens: (0, utils_1.coerceNumber)(inputUsage.outputTokens),
+        cacheReadTokens: (0, utils_1.coerceNumber)(inputUsage.cacheReadTokens),
+        cacheWriteTokens: (0, utils_1.coerceNumber)(inputUsage.cacheWriteTokens),
     };
     const hasUsage = usage.todayTokens !== null ||
         usage.totalTokens !== null ||
         usage.inputTokens !== null ||
-        usage.outputTokens !== null;
+        usage.outputTokens !== null ||
+        usage.cacheReadTokens !== null ||
+        usage.cacheWriteTokens !== null;
     return hasUsage ? usage : null;
 }
 function resolveUsageFromRecords(config, configPath, type, profileKey, profileName, syncUsage) {
+    var _a, _b, _c, _d;
     try {
         const normalized = (0, type_1.normalizeType)(type || "");
         if (!normalized || (!profileKey && !profileName))
@@ -113,8 +55,10 @@ function resolveUsageFromRecords(config, configPath, type, profileKey, profileNa
         return {
             todayTokens: usage.today,
             totalTokens: usage.total,
-            inputTokens: null,
-            outputTokens: null,
+            inputTokens: (_a = usage.todayInput) !== null && _a !== void 0 ? _a : null,
+            outputTokens: (_b = usage.todayOutput) !== null && _b !== void 0 ? _b : null,
+            cacheReadTokens: (_c = usage.todayCacheRead) !== null && _c !== void 0 ? _c : null,
+            cacheWriteTokens: (_d = usage.todayCacheWrite) !== null && _d !== void 0 ? _d : null,
         };
     }
     catch {