ccusage 15.2.0 → 15.3.0

package/dist/{pricing-fetcher-fT0o6CKK.js → pricing-fetcher-DaK2jizg.js}

@@ -1,5 +1,5 @@
-import { modelPricingSchema } from "./_types-CmSE0O0q.js";
-import { logger } from "./logger-CeR-gFvq.js";
+import { modelPricingSchema } from "./_types-BHFM59hI.js";
+import { logger } from "./logger-DeTONwj8.js";
 import { createRequire } from "node:module";
 import path from "node:path";
 import F, { homedir } from "node:os";
@@ -25,6 +25,107 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 var __require = /* @__PURE__ */ createRequire(import.meta.url);
+const isFailure = (result) => "Failure" === result.type;
+const isPromise = (value) => "object" == typeof value && null !== value && "then" in value && "function" == typeof value.then && "catch" in value && "function" == typeof value.catch;
+const andThen = (fn) => (result) => {
+	const apply = (r) => {
+		if (isFailure(r)) return r;
+		return fn(r.value);
+	};
+	return isPromise(result) ? result.then(apply) : apply(result);
+};
+const andThrough = (fn) => (result) => {
+	const apply = (r) => {
+		if (isFailure(r)) return r;
+		const next = fn(r.value);
+		if (isPromise(next)) return next.then((n) => {
+			if (isFailure(n)) return n;
+			return r;
+		});
+		if (isFailure(next)) return next;
+		return r;
+	};
+	return isPromise(result) ? result.then(apply) : apply(result);
+};
+const succeed = (...args) => {
+	const value = args[0];
+	if (void 0 === value) return { type: "Success" };
+	if (isPromise(value)) return value.then((value$1) => ({
+		type: "Success",
+		value: value$1
+	}));
+	return {
+		type: "Success",
+		value
+	};
+};
+const fail = (...args) => {
+	const error = args[0];
+	if (void 0 === error) return { type: "Failure" };
+	if (isPromise(error)) return error.then((error$1) => ({
+		type: "Failure",
+		error: error$1
+	}));
+	return {
+		type: "Failure",
+		error
+	};
+};
+const isSuccess = (result) => "Success" === result.type;
+const inspect = (fn) => (result) => {
+	const apply = (r) => {
+		if (isSuccess(r)) fn(r.value);
+		return r;
+	};
+	return isPromise(result) ? result.then(apply) : apply(result);
+};
+const inspectError = (fn) => (result) => {
+	const apply = (r) => {
+		if (isFailure(r)) fn(r.error);
+		return r;
+	};
+	return isPromise(result) ? result.then(apply) : apply(result);
+};
+const map = (fn) => (result) => {
+	const apply = (r) => {
+		if (isFailure(r)) return r;
+		return succeed(fn(r.value));
+	};
+	if (isPromise(result)) return result.then(apply);
+	return apply(result);
+};
+const orElse = (fn) => (result) => {
+	const apply = (r) => {
+		if (isSuccess(r)) return r;
+		return fn(r.error);
+	};
+	return isPromise(result) ? result.then(apply) : apply(result);
+};
+const pipe = (value, ...functions) => {
+	let next = value;
+	for (const func of functions) next = func(next);
+	return next;
+};
+const try_ = (options) => {
+	if (isPromise(options.try)) {
+		if ("safe" in options && options.safe) return succeed(options.try);
+		return options.try.then((value) => succeed(value), (error) => fail(options.catch(error)));
+	}
+	return (...args) => {
+		try {
+			const output = options.try(...args);
+			if (isPromise(output)) {
+				const promise = succeed(output);
+				if ("safe" in options && options.safe) return promise;
+				return promise.catch((error) => fail(options.catch(error)));
+			}
+			return succeed(output);
+		} catch (error) {
+			if ("safe" in options && options.safe) throw error;
+			return fail(options.catch(error));
+		}
+	};
+};
 const homeDirectory = F.homedir();
 const { env } = process;
 const xdgData = env.XDG_DATA_HOME || (homeDirectory ? path.join(homeDirectory, ".local", "share") : void 0);
@@ -213,116 +314,119 @@ var PricingFetcher = class {
 	* Loads offline pricing data from pre-fetched cache
 	* @returns Map of model names to pricing information
 	*/
-	async loadOfflinePricing() {
-		const pricing = new Map(Object.entries({
-			"claude-instant-1": {
-				"input_cost_per_token": 163e-8,
-				"output_cost_per_token": 551e-8
-			},
-			"claude-instant-1.2": {
-				"input_cost_per_token": 163e-9,
-				"output_cost_per_token": 551e-9
-			},
-			"claude-2": {
-				"input_cost_per_token": 8e-6,
-				"output_cost_per_token": 24e-6
-			},
-			"claude-2.1": {
-				"input_cost_per_token": 8e-6,
-				"output_cost_per_token": 24e-6
-			},
-			"claude-3-haiku-20240307": {
-				"input_cost_per_token": 25e-8,
-				"output_cost_per_token": 125e-8,
-				"cache_creation_input_token_cost": 3e-7,
-				"cache_read_input_token_cost": 3e-8
-			},
-			"claude-3-5-haiku-20241022": {
-				"input_cost_per_token": 8e-7,
-				"output_cost_per_token": 4e-6,
-				"cache_creation_input_token_cost": 1e-6,
-				"cache_read_input_token_cost": 8e-8
-			},
-			"claude-3-5-haiku-latest": {
-				"input_cost_per_token": 1e-6,
-				"output_cost_per_token": 5e-6,
-				"cache_creation_input_token_cost": 125e-8,
-				"cache_read_input_token_cost": 1e-7
-			},
-			"claude-3-opus-latest": {
-				"input_cost_per_token": 15e-6,
-				"output_cost_per_token": 75e-6,
-				"cache_creation_input_token_cost": 1875e-8,
-				"cache_read_input_token_cost": 15e-7
-			},
-			"claude-3-opus-20240229": {
-				"input_cost_per_token": 15e-6,
-				"output_cost_per_token": 75e-6,
-				"cache_creation_input_token_cost": 1875e-8,
-				"cache_read_input_token_cost": 15e-7
-			},
-			"claude-3-sonnet-20240229": {
-				"input_cost_per_token": 3e-6,
-				"output_cost_per_token": 15e-6
-			},
-			"claude-3-5-sonnet-latest": {
-				"input_cost_per_token": 3e-6,
-				"output_cost_per_token": 15e-6,
-				"cache_creation_input_token_cost": 375e-8,
-				"cache_read_input_token_cost": 3e-7
-			},
-			"claude-3-5-sonnet-20240620": {
-				"input_cost_per_token": 3e-6,
-				"output_cost_per_token": 15e-6,
-				"cache_creation_input_token_cost": 375e-8,
-				"cache_read_input_token_cost": 3e-7
-			},
-			"claude-opus-4-20250514": {
-				"input_cost_per_token": 15e-6,
-				"output_cost_per_token": 75e-6,
-				"cache_creation_input_token_cost": 1875e-8,
-				"cache_read_input_token_cost": 15e-7
-			},
-			"claude-sonnet-4-20250514": {
-				"input_cost_per_token": 3e-6,
-				"output_cost_per_token": 15e-6,
-				"cache_creation_input_token_cost": 375e-8,
-				"cache_read_input_token_cost": 3e-7
-			},
-			"claude-4-opus-20250514": {
-				"input_cost_per_token": 15e-6,
-				"output_cost_per_token": 75e-6,
-				"cache_creation_input_token_cost": 1875e-8,
-				"cache_read_input_token_cost": 15e-7
-			},
-			"claude-4-sonnet-20250514": {
-				"input_cost_per_token": 3e-6,
-				"output_cost_per_token": 15e-6,
-				"cache_creation_input_token_cost": 375e-8,
-				"cache_read_input_token_cost": 3e-7
-			},
-			"claude-3-7-sonnet-latest": {
-				"input_cost_per_token": 3e-6,
-				"output_cost_per_token": 15e-6,
-				"cache_creation_input_token_cost": 375e-8,
-				"cache_read_input_token_cost": 3e-7
-			},
-			"claude-3-7-sonnet-20250219": {
-				"input_cost_per_token": 3e-6,
-				"output_cost_per_token": 15e-6,
-				"cache_creation_input_token_cost": 375e-8,
-				"cache_read_input_token_cost": 3e-7
-			},
-			"claude-3-5-sonnet-20241022": {
-				"input_cost_per_token": 3e-6,
-				"output_cost_per_token": 15e-6,
-				"cache_creation_input_token_cost": 375e-8,
-				"cache_read_input_token_cost": 3e-7
-			}
-		}));
-		this.cachedPricing = pricing;
-		return pricing;
-	}
+	loadOfflinePricing = try_({
+		try: async () => {
+			const pricing = new Map(Object.entries({
+				"claude-instant-1": {
+					"input_cost_per_token": 163e-8,
+					"output_cost_per_token": 551e-8
+				},
+				"claude-instant-1.2": {
+					"input_cost_per_token": 163e-9,
+					"output_cost_per_token": 551e-9
+				},
+				"claude-2": {
+					"input_cost_per_token": 8e-6,
+					"output_cost_per_token": 24e-6
+				},
+				"claude-2.1": {
+					"input_cost_per_token": 8e-6,
+					"output_cost_per_token": 24e-6
+				},
+				"claude-3-haiku-20240307": {
+					"input_cost_per_token": 25e-8,
+					"output_cost_per_token": 125e-8,
+					"cache_creation_input_token_cost": 3e-7,
+					"cache_read_input_token_cost": 3e-8
+				},
+				"claude-3-5-haiku-20241022": {
+					"input_cost_per_token": 8e-7,
+					"output_cost_per_token": 4e-6,
+					"cache_creation_input_token_cost": 1e-6,
+					"cache_read_input_token_cost": 8e-8
+				},
+				"claude-3-5-haiku-latest": {
+					"input_cost_per_token": 1e-6,
+					"output_cost_per_token": 5e-6,
+					"cache_creation_input_token_cost": 125e-8,
+					"cache_read_input_token_cost": 1e-7
+				},
+				"claude-3-opus-latest": {
+					"input_cost_per_token": 15e-6,
+					"output_cost_per_token": 75e-6,
+					"cache_creation_input_token_cost": 1875e-8,
+					"cache_read_input_token_cost": 15e-7
+				},
+				"claude-3-opus-20240229": {
+					"input_cost_per_token": 15e-6,
+					"output_cost_per_token": 75e-6,
+					"cache_creation_input_token_cost": 1875e-8,
+					"cache_read_input_token_cost": 15e-7
+				},
+				"claude-3-sonnet-20240229": {
+					"input_cost_per_token": 3e-6,
+					"output_cost_per_token": 15e-6
+				},
+				"claude-3-5-sonnet-latest": {
+					"input_cost_per_token": 3e-6,
+					"output_cost_per_token": 15e-6,
+					"cache_creation_input_token_cost": 375e-8,
+					"cache_read_input_token_cost": 3e-7
+				},
+				"claude-3-5-sonnet-20240620": {
+					"input_cost_per_token": 3e-6,
+					"output_cost_per_token": 15e-6,
+					"cache_creation_input_token_cost": 375e-8,
+					"cache_read_input_token_cost": 3e-7
+				},
+				"claude-opus-4-20250514": {
+					"input_cost_per_token": 15e-6,
+					"output_cost_per_token": 75e-6,
+					"cache_creation_input_token_cost": 1875e-8,
+					"cache_read_input_token_cost": 15e-7
+				},
+				"claude-sonnet-4-20250514": {
+					"input_cost_per_token": 3e-6,
+					"output_cost_per_token": 15e-6,
+					"cache_creation_input_token_cost": 375e-8,
+					"cache_read_input_token_cost": 3e-7
+				},
+				"claude-4-opus-20250514": {
+					"input_cost_per_token": 15e-6,
+					"output_cost_per_token": 75e-6,
+					"cache_creation_input_token_cost": 1875e-8,
+					"cache_read_input_token_cost": 15e-7
+				},
+				"claude-4-sonnet-20250514": {
+					"input_cost_per_token": 3e-6,
+					"output_cost_per_token": 15e-6,
+					"cache_creation_input_token_cost": 375e-8,
+					"cache_read_input_token_cost": 3e-7
+				},
+				"claude-3-7-sonnet-latest": {
+					"input_cost_per_token": 3e-6,
+					"output_cost_per_token": 15e-6,
+					"cache_creation_input_token_cost": 375e-8,
+					"cache_read_input_token_cost": 3e-7
+				},
+				"claude-3-7-sonnet-20250219": {
+					"input_cost_per_token": 3e-6,
+					"output_cost_per_token": 15e-6,
+					"cache_creation_input_token_cost": 375e-8,
+					"cache_read_input_token_cost": 3e-7
+				},
+				"claude-3-5-sonnet-20241022": {
+					"input_cost_per_token": 3e-6,
+					"output_cost_per_token": 15e-6,
+					"cache_creation_input_token_cost": 375e-8,
+					"cache_read_input_token_cost": 3e-7
+				}
+			}));
+			this.cachedPricing = pricing;
+			return pricing;
+		},
+		catch: (error) => new Error("Failed to load offline pricing data", { cause: error })
+	});
 	/**
 	* Handles fallback to offline pricing when network fetch fails
 	* @param originalError - The original error from the network fetch
@@ -332,15 +436,12 @@ var PricingFetcher = class {
 	async handleFallbackToCachedPricing(originalError) {
 		logger.warn("Failed to fetch model pricing from LiteLLM, falling back to cached pricing data");
 		logger.debug("Fetch error details:", originalError);
-		try {
-			const fallbackPricing = await this.loadOfflinePricing();
-			logger.info(`Using cached pricing data for ${fallbackPricing.size} models`);
-			return fallbackPricing;
-		} catch (fallbackError) {
-			logger.error("Failed to load cached pricing data as fallback:", fallbackError);
+		return pipe(this.loadOfflinePricing(), inspect((pricing) => {
+			logger.info(`Using cached pricing data for ${pricing.size} models`);
+		}), inspectError((error) => {
+			logger.error("Failed to load cached pricing data as fallback:", error);
 			logger.error("Original fetch error:", originalError);
-			throw new Error("Could not fetch model pricing data and fallback data is unavailable");
-		}
+		}));
 	}
 	/**
 	* Ensures pricing data is loaded, either from cache or by fetching
@@ -348,24 +449,30 @@ var PricingFetcher = class {
 	* @returns Map of model names to pricing information
 	*/
 	async ensurePricingLoaded() {
-		if (this.cachedPricing != null) return this.cachedPricing;
-		if (this.offline) return this.loadOfflinePricing();
-		try {
+		return pipe(this.cachedPricing != null ? succeed(this.cachedPricing) : fail(/* @__PURE__ */ new Error("Cached pricing not available")), orElse(async () => {
+			if (this.offline) return this.loadOfflinePricing();
 			logger.warn("Fetching latest model pricing from LiteLLM...");
-			const response = await fetch(LITELLM_PRICING_URL);
-			if (!response.ok) throw new Error(`Failed to fetch pricing data: ${response.statusText}`);
-			const data = await response.json();
-			const pricing = /* @__PURE__ */ new Map();
-			for (const [modelName, modelData] of Object.entries(data)) if (typeof modelData === "object" && modelData !== null) {
-				const parsed = modelPricingSchema.safeParse(modelData);
-				if (parsed.success) pricing.set(modelName, parsed.data);
-			}
-			this.cachedPricing = pricing;
-			logger.info(`Loaded pricing for ${pricing.size} models`);
-			return pricing;
-		} catch (error) {
-			return this.handleFallbackToCachedPricing(error);
-		}
+			return pipe(try_({
+				try: fetch(LITELLM_PRICING_URL),
+				catch: (error) => new Error("Failed to fetch model pricing from LiteLLM", { cause: error })
+			}), andThrough((response) => {
+				if (!response.ok) return fail(/* @__PURE__ */ new Error(`Failed to fetch pricing data: ${response.statusText}`));
+				return succeed();
+			}), andThen(async (response) => try_({
+				try: response.json(),
+				catch: (error) => new Error("Failed to parse pricing data", { cause: error })
+			})), map((data) => {
+				const pricing = /* @__PURE__ */ new Map();
+				for (const [modelName, modelData] of Object.entries(data)) if (typeof modelData === "object" && modelData !== null) {
+					const parsed = modelPricingSchema.safeParse(modelData);
+					if (parsed.success) pricing.set(modelName, parsed.data);
+				}
+				return pricing;
+			}), inspect((pricing) => {
+				this.cachedPricing = pricing;
+				logger.info(`Loaded pricing for ${pricing.size} models`);
+			}), orElse(async (error) => this.handleFallbackToCachedPricing(error)));
+		}));
 	}
 	/**
 	* Fetches all available model pricing data
@@ -381,23 +488,24 @@ var PricingFetcher = class {
 	* @returns Model pricing information or null if not found
 	*/
 	async getModelPricing(modelName) {
-		const pricing = await this.ensurePricingLoaded();
-		const directMatch = pricing.get(modelName);
-		if (directMatch != null) return directMatch;
-		const variations = [
-			modelName,
-			`anthropic/${modelName}`,
-			`claude-3-5-${modelName}`,
-			`claude-3-${modelName}`,
-			`claude-${modelName}`
-		];
-		for (const variant of variations) {
-			const match = pricing.get(variant);
-			if (match != null) return match;
-		}
-		const lowerModel = modelName.toLowerCase();
-		for (const [key, value] of pricing) if (key.toLowerCase().includes(lowerModel) || lowerModel.includes(key.toLowerCase())) return value;
-		return null;
+		return pipe(this.ensurePricingLoaded(), map((pricing) => {
+			const directMatch = pricing.get(modelName);
+			if (directMatch != null) return directMatch;
+			const variations = [
+				modelName,
+				`anthropic/${modelName}`,
+				`claude-3-5-${modelName}`,
+				`claude-3-${modelName}`,
+				`claude-${modelName}`
+			];
+			for (const variant of variations) {
+				const match = pricing.get(variant);
+				if (match != null) return match;
+			}
+			const lowerModel = modelName.toLowerCase();
+			for (const [key, value] of pricing) if (key.toLowerCase().includes(lowerModel) || lowerModel.includes(key.toLowerCase())) return value;
+			return null;
+		}));
 	}
 	/**
 	* Calculates the cost for given token usage and model
@@ -410,9 +518,7 @@ var PricingFetcher = class {
 	* @returns Total cost in USD
 	*/
 	async calculateCostFromTokens(tokens, modelName) {
-		const pricing = await this.getModelPricing(modelName);
-		if (pricing == null) return 0;
-		return this.calculateCostFromPricing(tokens, pricing);
+		return pipe(this.getModelPricing(modelName), map((pricing) => pricing == null ? 0 : this.calculateCostFromPricing(tokens, pricing)));
 	}
 	/**
 	* Calculates cost from token usage and pricing information
@@ -433,4 +539,4 @@ var PricingFetcher = class {
 		return cost;
 	}
 };
-export { BLOCKS_COMPACT_WIDTH_THRESHOLD, BLOCKS_DEFAULT_TERMINAL_WIDTH, BLOCKS_WARNING_THRESHOLD, CLAUDE_CONFIG_DIR_ENV, CLAUDE_PROJECTS_DIR_NAME, DEBUG_MATCH_THRESHOLD_PERCENT, DEFAULT_CLAUDE_CODE_PATH, DEFAULT_CLAUDE_CONFIG_PATH, DEFAULT_RECENT_DAYS, DEFAULT_REFRESH_INTERVAL_SECONDS, MAX_REFRESH_INTERVAL_SECONDS, MCP_DEFAULT_PORT, MIN_REFRESH_INTERVAL_SECONDS, MIN_RENDER_INTERVAL_MS, PricingFetcher, USAGE_DATA_GLOB_PATTERN, USER_HOME_DIR, __commonJSMin, __require, __toESM, require_usingCtx };
+export { BLOCKS_COMPACT_WIDTH_THRESHOLD, BLOCKS_DEFAULT_TERMINAL_WIDTH, BLOCKS_WARNING_THRESHOLD, CLAUDE_CONFIG_DIR_ENV, CLAUDE_PROJECTS_DIR_NAME, DEBUG_MATCH_THRESHOLD_PERCENT, DEFAULT_CLAUDE_CODE_PATH, DEFAULT_CLAUDE_CONFIG_PATH, DEFAULT_RECENT_DAYS, DEFAULT_REFRESH_INTERVAL_SECONDS, MAX_REFRESH_INTERVAL_SECONDS, MCP_DEFAULT_PORT, MIN_REFRESH_INTERVAL_SECONDS, MIN_RENDER_INTERVAL_MS, PricingFetcher, USAGE_DATA_GLOB_PATTERN, USER_HOME_DIR, __commonJSMin, __require, __toESM, isFailure, isPromise, require_usingCtx, try_ };

package/dist/pricing-fetcher.d.ts

@@ -1,2 +1,2 @@
-import { PricingFetcher } from "./pricing-fetcher-CrV0acwD.js";
+import { PricingFetcher } from "./pricing-fetcher-B3SvKOod.js";
 export { PricingFetcher };

package/dist/pricing-fetcher.js

@@ -1,4 +1,4 @@
-import { PricingFetcher } from "./pricing-fetcher-fT0o6CKK.js";
-import "./_types-CmSE0O0q.js";
-import "./logger-CeR-gFvq.js";
+import { PricingFetcher } from "./pricing-fetcher-DaK2jizg.js";
+import "./_types-BHFM59hI.js";
+import "./logger-DeTONwj8.js";
 export { PricingFetcher };

package/dist/{prompt-j5YimnLx.js → prompt-DsUFNEY7.js}

@@ -381,7 +381,7 @@ const iD = sD(), v = new Set(["\x1B", "›"]), CD = 39, w$1 = "\x07", W$1 = "[",
 `)];
 	for (const [E, a] of o$1.entries()) {
 		if (e$1 += a, v.has(a)) {
-			const { groups: B$1 } = new RegExp(`(?:\\${W$1}(?<code>\\d+)m|\\${y}(?<uri>.*)${w$1})`).exec(o$1.slice(E).join("")) || { groups: {} };
+			const { groups: B$1 } = (/* @__PURE__ */ new RegExp(`(?:\\${W$1}(?<code>\\d+)m|\\${y}(?<uri>.*)${w$1})`)).exec(o$1.slice(E).join("")) || { groups: {} };
 			if (B$1.code !== void 0) {
 				const p = Number.parseFloat(B$1.code);
 				s = p === CD ? void 0 : p;
@@ -804,7 +804,7 @@ async function prompt(message, opts = {}) {
 		if (typeof value !== "symbol" || value.toString() !== "Symbol(clack:cancel)") return value;
 		switch (opts.cancel) {
 			case "reject": {
-				const error = new Error("Prompt cancelled.");
+				const error = /* @__PURE__ */ new Error("Prompt cancelled.");
 				error.name = "ConsolaPromptCancelledError";
 				if (Error.captureStackTrace) Error.captureStackTrace(error, prompt);
 				throw error;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "ccusage",
   "type": "module",
-  "version": "15.2.0",
+  "version": "15.3.0",
   "description": "Usage analysis tool for Claude Code",
   "author": "ryoppippi",
   "license": "MIT",
@@ -30,5 +30,8 @@
   "bin": "./dist/index.js",
   "files": [
     "dist"
-  ]
+  ],
+  "engines": {
+    "node": ">=20.19.3"
+  }
 }