@praeviso/code-env-switch 0.1.2 → 0.1.4

package/bin/statusline/input.js

@@ -0,0 +1,249 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.readStdinJson = readStdinJson;
+exports.normalizeTypeValue = normalizeTypeValue;
+exports.detectTypeFromEnv = detectTypeFromEnv;
+exports.resolveEnvProfile = resolveEnvProfile;
+exports.getModelFromInput = getModelFromInput;
+exports.getModelProviderFromInput = getModelProviderFromInput;
+exports.getInputProfile = getInputProfile;
+exports.getInputUsage = getInputUsage;
+exports.getSessionId = getSessionId;
+exports.getContextUsedTokens = getContextUsedTokens;
+exports.getContextLeftPercent = getContextLeftPercent;
+exports.getWorkspaceDir = getWorkspaceDir;
+exports.getGitStatusFromInput = getGitStatusFromInput;
+const fs = require("fs");
+const constants_1 = require("../constants");
+const type_1 = require("../profile/type");
+const utils_1 = require("./utils");
+function readStdinJson() {
+    if (process.stdin.isTTY)
+        return null;
+    try {
+        const raw = fs.readFileSync(0, "utf8");
+        const trimmed = raw.trim();
+        if (!trimmed)
+            return null;
+        const parsed = JSON.parse(trimmed);
+        if (!(0, utils_1.isRecord)(parsed))
+            return null;
+        return parsed;
+    }
+    catch {
+        return null;
+    }
+}
+function normalizeTypeValue(value) {
+    if (!value)
+        return null;
+    const normalized = (0, type_1.normalizeType)(value);
+    if (normalized)
+        return normalized;
+    const trimmed = String(value).trim();
+    return trimmed ? trimmed : null;
+}
+function detectTypeFromEnv() {
+    const matches = constants_1.DEFAULT_PROFILE_TYPES.filter((type) => {
+        const suffix = type.toUpperCase();
+        return (process.env[`CODE_ENV_PROFILE_KEY_${suffix}`] ||
+            process.env[`CODE_ENV_PROFILE_NAME_${suffix}`]);
+    });
+    if (matches.length === 1)
+        return matches[0];
+    return null;
+}
+function resolveEnvProfile(type) {
+    const genericKey = process.env.CODE_ENV_PROFILE_KEY || null;
+    const genericName = process.env.CODE_ENV_PROFILE_NAME || null;
+    if (!type) {
+        return { key: genericKey, name: genericName };
+    }
+    const suffix = type.toUpperCase();
+    const key = process.env[`CODE_ENV_PROFILE_KEY_${suffix}`] || genericKey;
+    const name = process.env[`CODE_ENV_PROFILE_NAME_${suffix}`] || genericName;
+    return { key: key || null, name: name || null };
+}
+function getModelFromInput(input) {
+    if (!input)
+        return null;
+    const raw = input.model;
+    if (!raw)
+        return null;
+    if (typeof raw === "string")
+        return raw;
+    if ((0, utils_1.isRecord)(raw)) {
+        const displayName = raw.displayName || raw.display_name;
+        if (displayName)
+            return String(displayName);
+        if (raw.id)
+            return String(raw.id);
+    }
+    return null;
+}
+function getModelProviderFromInput(input) {
+    if (!input || !input.model_provider)
+        return null;
+    const provider = String(input.model_provider).trim();
+    return provider ? provider : null;
+}
+function getInputProfile(input) {
+    if (!input || !(0, utils_1.isRecord)(input.profile))
+        return null;
+    return input.profile;
+}
+function getInputUsage(input) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
+    if (!input)
+        return null;
+    if ((0, utils_1.isRecord)(input.usage)) {
+        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,
+            };
+        }
+        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,
+            };
+        }
+    }
+    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,
+    };
+}
+function getSessionId(input) {
+    if (!input)
+        return null;
+    return (0, utils_1.firstNonEmpty)(input.session_id, input.sessionId);
+}
+function getContextUsedTokens(input) {
+    if (!input)
+        return null;
+    return (0, utils_1.coerceNumber)(input.context_window_used_tokens);
+}
+function getContextLeftPercent(input, type) {
+    if (!input)
+        return null;
+    const raw = (0, utils_1.coerceNumber)(input.context_window_percent);
+    if (raw === null || raw < 0)
+        return null;
+    const percent = raw <= 1 ? raw * 100 : raw;
+    if (percent > 100)
+        return null;
+    const usedTokens = getContextUsedTokens(input);
+    const normalizedType = normalizeTypeValue(type);
+    const preferRemaining = normalizedType === "codex" ||
+        normalizedType === "claude" ||
+        usedTokens === null ||
+        (usedTokens <= 0 && percent >= 99);
+    const left = preferRemaining ? percent : 100 - percent;
+    return Math.max(0, Math.min(100, left));
+}
+function getWorkspaceDir(input) {
+    if (!input || !(0, utils_1.isRecord)(input.workspace))
+        return null;
+    const currentDir = input.workspace.current_dir;
+    if (currentDir) {
+        const trimmed = String(currentDir).trim();
+        if (trimmed)
+            return trimmed;
+    }
+    const projectDir = input.workspace.project_dir;
+    if (!projectDir)
+        return null;
+    const trimmed = String(projectDir).trim();
+    return trimmed ? trimmed : null;
+}
+function getGitStatusFromInput(input) {
+    if (!input || !input.git_branch)
+        return null;
+    const branch = String(input.git_branch).trim();
+    if (!branch)
+        return null;
+    return {
+        branch,
+        ahead: 0,
+        behind: 0,
+        staged: 0,
+        unstaged: 0,
+        untracked: 0,
+        conflicted: 0,
+    };
+}

package/bin/statusline/style.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ICON_CWD = exports.ICON_REVIEW = exports.ICON_CONTEXT = exports.ICON_USAGE = exports.ICON_MODEL = exports.ICON_PROFILE = exports.ICON_GIT = void 0;
+exports.colorize = colorize;
+exports.dim = dim;
+const COLOR_ENABLED = !process.env.NO_COLOR && process.env.TERM !== "dumb";
+const ANSI_RESET = "\x1b[0m";
+exports.ICON_GIT = "⎇";
+exports.ICON_PROFILE = "👤";
+exports.ICON_MODEL = "⚙";
+exports.ICON_USAGE = "⚡";
+exports.ICON_CONTEXT = "🧠";
+exports.ICON_REVIEW = "📝";
+exports.ICON_CWD = "📁";
+function colorize(text, colorCode) {
+    if (!COLOR_ENABLED)
+        return text;
+    return `\x1b[${colorCode}m${text}${ANSI_RESET}`;
+}
+function dim(text) {
+    return colorize(text, "2");
+}

package/bin/statusline/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/bin/statusline/usage.js

@@ -0,0 +1,123 @@
+"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;
+    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);
+    }
+    if ((0, utils_1.isRecord)(input.usage)) {
+        return parseUsageTotalsRecord(input.usage);
+    }
+    return null;
+}
+function normalizeInputUsage(inputUsage) {
+    if (!inputUsage)
+        return null;
+    const usage = {
+        todayTokens: (0, utils_1.coerceNumber)(inputUsage.todayTokens),
+        totalTokens: (0, utils_1.coerceNumber)(inputUsage.totalTokens),
+        inputTokens: (0, utils_1.coerceNumber)(inputUsage.inputTokens),
+        outputTokens: (0, utils_1.coerceNumber)(inputUsage.outputTokens),
+    };
+    const hasUsage = usage.todayTokens !== null ||
+        usage.totalTokens !== null ||
+        usage.inputTokens !== null ||
+        usage.outputTokens !== null;
+    return hasUsage ? usage : null;
+}
+function resolveUsageFromRecords(config, configPath, type, profileKey, profileName, syncUsage) {
+    try {
+        const normalized = (0, type_1.normalizeType)(type || "");
+        if (!normalized || (!profileKey && !profileName))
+            return null;
+        const totals = (0, usage_1.readUsageTotalsIndex)(config, configPath, syncUsage);
+        if (!totals)
+            return null;
+        const usage = (0, usage_1.resolveUsageTotalsForProfile)(totals, normalized, profileKey, profileName);
+        if (!usage)
+            return null;
+        return {
+            todayTokens: usage.today,
+            totalTokens: usage.total,
+            inputTokens: null,
+            outputTokens: null,
+        };
+    }
+    catch {
+        return null;
+    }
+}

package/bin/statusline/utils.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isRecord = isRecord;
+exports.firstNonEmpty = firstNonEmpty;
+exports.coerceNumber = coerceNumber;
+exports.firstNumber = firstNumber;
+function isRecord(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function firstNonEmpty(...values) {
+    for (const value of values) {
+        if (value === null || value === undefined)
+            continue;
+        const text = String(value).trim();
+        if (text)
+            return text;
+    }
+    return null;
+}
+function coerceNumber(value) {
+    if (value === null || value === undefined || value === "")
+        return null;
+    const num = Number(value);
+    if (!Number.isFinite(num))
+        return null;
+    return num;
+}
+function firstNumber(...values) {
+    for (const value of values) {
+        const num = coerceNumber(value);
+        if (num !== null)
+            return num;
+    }
+    return null;
+}

package/bin/usage/index.js

@@ -9,6 +9,7 @@ exports.formatTokenCount = formatTokenCount;
 exports.buildUsageTotals = buildUsageTotals;
 exports.readUsageTotalsIndex = readUsageTotalsIndex;
 exports.resolveUsageTotalsForProfile = resolveUsageTotalsForProfile;
+exports.syncUsageFromStatuslineInput = syncUsageFromStatuslineInput;
 exports.logProfileUse = logProfileUse;
 exports.logSessionBinding = logSessionBinding;
 exports.readSessionBindingIndex = readSessionBindingIndex;
@@ -120,6 +121,18 @@ function normalizeUsageType(type) {
     const trimmed = String(type).trim();
     return trimmed ? trimmed : null;
 }
+function buildSessionKey(type, sessionId) {
+    const normalized = normalizeUsageType(type || "");
+    return normalized ? `${normalized}::${sessionId}` : sessionId;
+}
+function toFiniteNumber(value) {
+    if (value === null || value === undefined)
+        return null;
+    const num = Number(value);
+    if (!Number.isFinite(num))
+        return null;
+    return num;
+}
 function buildUsageLookupKey(type, profileId) {
     if (!profileId)
         return null;
@@ -147,6 +160,75 @@ function resolveUsageTotalsForProfile(totals, type, profileKey, profileName) {
         (nameLookup && totals.byName.get(nameLookup)) ||
         null);
 }
+function syncUsageFromStatuslineInput(config, configPath, type, profileKey, profileName, sessionId, totals, cwd) {
+    var _a, _b, _c;
+    if (!sessionId)
+        return;
+    if (!totals)
+        return;
+    if (!profileKey && !profileName)
+        return;
+    const normalizedType = (0, type_1.normalizeType)(type || "");
+    if (!normalizedType)
+        return;
+    const usagePath = getUsagePath(config, configPath);
+    if (!usagePath)
+        return;
+    const inputTokens = (_a = toFiniteNumber(totals.inputTokens)) !== null && _a !== void 0 ? _a : 0;
+    const outputTokens = (_b = toFiniteNumber(totals.outputTokens)) !== null && _b !== void 0 ? _b : 0;
+    const totalTokens = (_c = toFiniteNumber(totals.totalTokens)) !== null && _c !== void 0 ? _c : inputTokens + outputTokens;
+    if (!Number.isFinite(totalTokens))
+        return;
+    const statePath = getUsageStatePath(usagePath, config);
+    const lockPath = `${statePath}.lock`;
+    const lockFd = acquireLock(lockPath);
+    if (lockFd === null)
+        return;
+    try {
+        const state = readUsageState(statePath);
+        const sessions = state.sessions || {};
+        const key = buildSessionKey(normalizedType, sessionId);
+        const prev = sessions[key];
+        const prevInput = prev ? prev.inputTokens : 0;
+        const prevOutput = prev ? prev.outputTokens : 0;
+        const prevTotal = prev ? prev.totalTokens : 0;
+        let deltaInput = inputTokens - prevInput;
+        let deltaOutput = outputTokens - prevOutput;
+        let deltaTotal = totalTokens - prevTotal;
+        if (deltaTotal < 0 || deltaInput < 0 || deltaOutput < 0) {
+            deltaInput = inputTokens;
+            deltaOutput = outputTokens;
+            deltaTotal = totalTokens;
+        }
+        if (deltaTotal > 0) {
+            const record = {
+                ts: new Date().toISOString(),
+                type: normalizedType,
+                profileKey: profileKey || null,
+                profileName: profileName || null,
+                inputTokens: deltaInput,
+                outputTokens: deltaOutput,
+                totalTokens: deltaTotal,
+            };
+            appendUsageRecord(usagePath, record);
+        }
+        const now = new Date().toISOString();
+        sessions[key] = {
+            type: normalizedType,
+            inputTokens,
+            outputTokens,
+            totalTokens,
+            startTs: prev ? prev.startTs : now,
+            endTs: now,
+            cwd: cwd || (prev ? prev.cwd : null),
+        };
+        state.sessions = sessions;
+        writeUsageState(statePath, state);
+    }
+    finally {
+        releaseLock(lockPath, lockFd);
+    }
+}
 function logProfileUse(config, configPath, profileKey, requestedType, terminalTag, cwd) {
     const profile = config.profiles && config.profiles[profileKey];
     if (!profile)
@@ -285,19 +367,20 @@ function resolveProfileForSession(config, logEntries, type, sessionFile, session
 }
 function readUsageState(statePath) {
     if (!statePath || !fs.existsSync(statePath)) {
-        return { version: 1, files: {} };
+        return { version: 1, files: {}, sessions: {} };
     }
     try {
         const raw = fs.readFileSync(statePath, "utf8");
         const parsed = JSON.parse(raw);
         if (!parsed || typeof parsed !== "object") {
-            return { version: 1, files: {} };
+            return { version: 1, files: {}, sessions: {} };
         }
         const files = parsed.files && typeof parsed.files === "object" ? parsed.files : {};
-        return { version: 1, files };
+        const sessions = parsed.sessions && typeof parsed.sessions === "object" ? parsed.sessions : {};
+        return { version: 1, files, sessions };
     }
     catch {
-        return { version: 1, files: {} };
+        return { version: 1, files: {}, sessions: {} };
     }
 }
 function writeUsageState(statePath, state) {
@@ -632,6 +715,7 @@ function syncUsageFromSessions(config, configPath, usagePath) {
         const logEntries = readProfileLogEntries([profileLogPath]);
         const state = readUsageState(statePath);
         const files = state.files || {};
+        const sessions = state.sessions || {};
         const codexFiles = collectSessionFiles(getCodexSessionsPath(config));
         const claudeFiles = collectSessionFiles(getClaudeSessionsPath(config));
         const processFile = (filePath, type) => {
@@ -661,16 +745,34 @@ function syncUsageFromSessions(config, configPath, usagePath) {
             const resolved = resolveProfileForSession(config, logEntries, type, filePath, stats.sessionId);
             if (!resolved.match)
                 return;
+            const sessionKey = stats.sessionId ? buildSessionKey(type, stats.sessionId) : null;
+            const sessionPrev = sessionKey ? sessions[sessionKey] : null;
             const prevInput = prev ? prev.inputTokens : 0;
             const prevOutput = prev ? prev.outputTokens : 0;
             const prevTotal = prev ? prev.totalTokens : 0;
-            let deltaInput = stats.inputTokens - prevInput;
-            let deltaOutput = stats.outputTokens - prevOutput;
-            let deltaTotal = stats.totalTokens - prevTotal;
+            const prevInputMax = sessionPrev
+                ? Math.max(prevInput, sessionPrev.inputTokens)
+                : prevInput;
+            const prevOutputMax = sessionPrev
+                ? Math.max(prevOutput, sessionPrev.outputTokens)
+                : prevOutput;
+            const prevTotalMax = sessionPrev
+                ? Math.max(prevTotal, sessionPrev.totalTokens)
+                : prevTotal;
+            let deltaInput = stats.inputTokens - prevInputMax;
+            let deltaOutput = stats.outputTokens - prevOutputMax;
+            let deltaTotal = stats.totalTokens - prevTotalMax;
             if (deltaTotal < 0 || deltaInput < 0 || deltaOutput < 0) {
-                deltaInput = stats.inputTokens;
-                deltaOutput = stats.outputTokens;
-                deltaTotal = stats.totalTokens;
+                if (sessionPrev) {
+                    deltaInput = 0;
+                    deltaOutput = 0;
+                    deltaTotal = 0;
+                }
+                else {
+                    deltaInput = stats.inputTokens;
+                    deltaOutput = stats.outputTokens;
+                    deltaTotal = stats.totalTokens;
+                }
             }
             if (deltaTotal > 0) {
                 const record = {
@@ -684,6 +786,26 @@ function syncUsageFromSessions(config, configPath, usagePath) {
                 };
                 appendUsageRecord(usagePath, record);
             }
+            if (sessionKey) {
+                const nextInput = sessionPrev
+                    ? Math.max(sessionPrev.inputTokens, stats.inputTokens)
+                    : stats.inputTokens;
+                const nextOutput = sessionPrev
+                    ? Math.max(sessionPrev.outputTokens, stats.outputTokens)
+                    : stats.outputTokens;
+                const nextTotal = sessionPrev
+                    ? Math.max(sessionPrev.totalTokens, stats.totalTokens)
+                    : stats.totalTokens;
+                sessions[sessionKey] = {
+                    type,
+                    inputTokens: nextInput,
+                    outputTokens: nextOutput,
+                    totalTokens: nextTotal,
+                    startTs: sessionPrev ? sessionPrev.startTs : stats.startTs,
+                    endTs: stats.endTs || (sessionPrev ? sessionPrev.endTs : null),
+                    cwd: stats.cwd || (sessionPrev ? sessionPrev.cwd : null),
+                };
+            }
             files[filePath] = {
                 mtimeMs: stat.mtimeMs,
                 size: stat.size,
@@ -701,6 +823,7 @@ function syncUsageFromSessions(config, configPath, usagePath) {
         for (const filePath of claudeFiles)
             processFile(filePath, "claude");
         state.files = files;
+        state.sessions = sessions;
         writeUsageState(statePath, state);
     }
     finally {

package/package.json

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