ccusage 0.1.12 → 0.2.1

package/README.md

@@ -41,10 +41,12 @@ This tool helps you understand the value you're getting from your subscription b
 - 🎨 **Beautiful Output**: Colorful table-formatted display
 - 📄 **JSON Output**: Export data in structured JSON format with `--json`
 - 💰 **Cost Tracking**: Shows costs in USD for each day/session
+- 🔄 **Cache Token Support**: Tracks and displays cache creation and cache read tokens separately
 
 ## Limitations
 
 - This tool only reads local JSONL files generated by Claude Code. If you use Claude Code with multiple devices, you need to ensure the JSONL files are synchronized across devices.
+- API usage for tools like Web Search, Code Execution, and Image Analysis are not included in the token usage reports. The tool only tracks language model token usage.
 
 ## Installation
 
@@ -151,15 +153,15 @@ All commands support the following options:
 │                                          │
 ╰──────────────────────────────────────────╯
 
-┌──────────────────┬──────────────┬───────────────┬──────────────┬────────────┐
-│ Date             │ Input Tokens │ Output Tokens │ Total Tokens │ Cost (USD) │
-├──────────────────┼──────────────┼───────────────┼──────────────┼────────────┤
-│ 2025-05-30       │          277 │        31,456 │       31,733 │     $17.45 │
-│ 2025-05-29       │          959 │        39,662 │       40,621 │     $16.37 │
-│ 2025-05-28       │          155 │        21,693 │       21,848 │      $8.33 │
-├──────────────────┼──────────────┼───────────────┼──────────────┼────────────┤
-│ Total            │       11,174 │       720,366 │      731,540 │    $336.17 │
-└──────────────────┴──────────────┴───────────────┴──────────────┴────────────┘
+┌──────────────┬────────┬─────────┬──────────────┬────────────┬──────────────┬────────────┐
+│ Date         │ Input  │ Output  │ Cache Create │ Cache Read │ Total Tokens │ Cost (USD) │
+├──────────────┼────────┼─────────┼──────────────┼────────────┼──────────────┼────────────┤
+│ 2025-05-30   │    277 │  31,456 │          512 │      1,024 │       33,269 │     $17.58 │
+│ 2025-05-29   │    959 │  39,662 │          256 │        768 │       41,645 │     $16.42 │
+│ 2025-05-28   │    155 │  21,693 │          128 │        512 │       22,488 │      $8.36 │
+├──────────────┼────────┼─────────┼──────────────┼────────────┼──────────────┼────────────┤
+│ Total        │ 11,174 │ 720,366 │          896 │      2,304 │      734,740 │    $336.47 │
+└──────────────┴────────┴─────────┴──────────────┴────────────┴──────────────┴────────────┘
 ```
 
 ### Session Report
@@ -170,53 +172,20 @@ All commands support the following options:
 │                                               │
 ╰───────────────────────────────────────────────╯
 
-┌──────────────────────────────┬──────────────┬───────────────┬──────────────┬────────────┬───────────────┐
-│ Project / Session            │ Input Tokens │ Output Tokens │ Total Tokens │ Cost (USD) │ Last Activity │
-├──────────────────────────────┼──────────────┼───────────────┼──────────────┼────────────┼───────────────┤
-│ my-project                   │        2,775 │       186,645 │      189,420 │     $98.40 │ 2025-05-26    │
-│   └─ session-abc123...       │              │               │              │            │               │
-│ another-project              │        1,063 │        41,421 │       42,484 │     $20.08 │ 2025-05-29    │
-│   └─ session-def456...       │              │               │              │            │               │
-├──────────────────────────────┼──────────────┼───────────────┼──────────────┼────────────┼───────────────┤
-│ Total                        │       11,174 │       720,445 │      731,619 │    $336.38 │               │
-└──────────────────────────────┴──────────────┴───────────────┴──────────────┴────────────┴───────────────┘
+┌─────────────┬────────────┬────────┬─────────┬──────────────┬────────────┬──────────────┬────────────┬───────────────┐
+│ Project     │ Session    │ Input  │ Output  │ Cache Create │ Cache Read │ Total Tokens │ Cost (USD) │ Last Activity │
+├─────────────┼────────────┼────────┼─────────┼──────────────┼────────────┼──────────────┼────────────┼───────────────┤
+│ myproject   │ session-1  │  4,512 │ 350,846 │          512 │      1,024 │      356,894 │    $156.40 │ 2025-05-24    │
+├─────────────┼────────────┼────────┼─────────┼──────────────┼────────────┼──────────────┼────────────┼───────────────┤
+│ myproject   │ session-2  │  2,775 │ 186,645 │          256 │        768 │      190,444 │     $98.45 │ 2025-05-25    │
+├─────────────┼────────────┼────────┼─────────┼──────────────┼────────────┼──────────────┼────────────┼───────────────┤
+│ Total       │            │ 11,174 │ 720,445 │          768 │      1,792 │      734,179 │    $336.68 │               │
+└─────────────┴────────────┴────────┴─────────┴──────────────┴────────────┴──────────────┴────────────┴───────────────┘
 ```
 
 ## Requirements
-
-- [Bun](https://bun.sh) runtime
 - Claude Code usage history files (`~/.claude/projects/**/*.jsonl`)
 
-## Development
-
-```bash
-# Run tests
-bun test
-
-# Type check
-bun run typecheck
-
-# Lint
-bun run lint
-
-# Format code
-bun run format
-```
-
-## Project Structure
-
-```
-ccusage/
-├── commands/
-│   ├── daily.ts      # Daily report command
-│   └── session.ts    # Session report command
-├── data-loader.ts    # JSONL data loading logic
-├── index.ts          # CLI entry point
-├── logger.ts         # Logger configuration
-├── utils.ts          # Shared utilities
-└── package.json
-```
-
 ## License
 
 MIT

package/dist/index.js

@@ -2901,6 +2901,37 @@ var require_picocolors = __commonJS({ "node_modules/picocolors/picocolors.js"(ex
 	module.exports.createColors = createColors$1;
 } });
 
+//#endregion
+//#region calculate-cost.ts
+function calculateTotals(data) {
+	return data.reduce((acc, item) => ({
+		inputTokens: acc.inputTokens + item.inputTokens,
+		outputTokens: acc.outputTokens + item.outputTokens,
+		cacheCreationTokens: acc.cacheCreationTokens + item.cacheCreationTokens,
+		cacheReadTokens: acc.cacheReadTokens + item.cacheReadTokens,
+		totalCost: acc.totalCost + item.totalCost
+	}), {
+		inputTokens: 0,
+		outputTokens: 0,
+		cacheCreationTokens: 0,
+		cacheReadTokens: 0,
+		totalCost: 0
+	});
+}
+function getTotalTokens(tokens) {
+	return tokens.inputTokens + tokens.outputTokens + tokens.cacheCreationTokens + tokens.cacheReadTokens;
+}
+function createTotalsObject(totals) {
+	return {
+		inputTokens: totals.inputTokens,
+		outputTokens: totals.outputTokens,
+		cacheCreationTokens: totals.cacheCreationTokens,
+		cacheReadTokens: totals.cacheReadTokens,
+		totalTokens: getTotalTokens(totals),
+		totalCost: totals.totalCost
+	};
+}
+
 //#endregion
 //#region node_modules/fdir/dist/utils.js
 var require_utils$1 = __commonJS({ "node_modules/fdir/dist/utils.js"(exports) {
@@ -5939,7 +5970,9 @@ const UsageDataSchema = object({
 	timestamp: string(),
 	message: object({ usage: object({
 		input_tokens: number(),
-		output_tokens: number()
+		output_tokens: number(),
+		cache_creation_input_tokens: optional(number()),
+		cache_read_input_tokens: optional(number())
 	}) }),
 	costUSD: number()
 });
@@ -5947,6 +5980,8 @@ const DailyUsageSchema = object({
 	date: string(),
 	inputTokens: number(),
 	outputTokens: number(),
+	cacheCreationTokens: number(),
+	cacheReadTokens: number(),
 	totalCost: number()
 });
 const SessionUsageSchema = object({
@@ -5954,6 +5989,8 @@ const SessionUsageSchema = object({
 	projectPath: string(),
 	inputTokens: number(),
 	outputTokens: number(),
+	cacheCreationTokens: number(),
+	cacheReadTokens: number(),
 	totalCost: number(),
 	lastActivity: string()
 });
@@ -5986,10 +6023,14 @@ async function loadUsageData(options) {
 				date,
 				inputTokens: 0,
 				outputTokens: 0,
+				cacheCreationTokens: 0,
+				cacheReadTokens: 0,
 				totalCost: 0
 			};
 			existing.inputTokens += data.message.usage.input_tokens || 0;
 			existing.outputTokens += data.message.usage.output_tokens || 0;
+			existing.cacheCreationTokens += data.message.usage.cache_creation_input_tokens || 0;
+			existing.cacheReadTokens += data.message.usage.cache_read_input_tokens || 0;
 			existing.totalCost += data.costUSD || 0;
 			dailyMap.set(date, existing);
 		} catch (e) {}
@@ -6035,11 +6076,15 @@ async function loadSessionData(options) {
 				projectPath: projectPath || "Unknown Project",
 				inputTokens: 0,
 				outputTokens: 0,
+				cacheCreationTokens: 0,
+				cacheReadTokens: 0,
 				totalCost: 0,
 				lastActivity: ""
 			};
 			existing.inputTokens += data.message.usage.input_tokens || 0;
 			existing.outputTokens += data.message.usage.output_tokens || 0;
+			existing.cacheCreationTokens += data.message.usage.cache_creation_input_tokens || 0;
+			existing.cacheReadTokens += data.message.usage.cache_read_input_tokens || 0;
 			existing.totalCost += data.costUSD || 0;
 			if (data.timestamp > lastTimestamp) {
 				lastTimestamp = data.timestamp;
@@ -7023,7 +7068,7 @@ const consola = createConsola();
 //#endregion
 //#region package.json
 var name = "ccusage";
-var version = "0.1.12";
+var version = "0.2.1";
 var description = "Usage analysis tool for Claude Code";
 
 //#endregion
@@ -7040,6 +7085,8 @@ const ModelSpecSchema = object({
 	input_cost_per_token: optional(number()),
 	output_cost_per_token: optional(number()),
 	output_cost_per_reasoning_token: optional(number()),
+	cache_creation_input_token_cost: optional(number()),
+	cache_read_input_token_cost: optional(number()),
 	litellm_provider: optional(string()),
 	mode: optional(string()),
 	supports_function_calling: optional(boolean()),
@@ -7125,30 +7172,19 @@ const dailyCommand = define({
 			else logger.warn("No Claude usage data found.");
 			process$1.exit(0);
 		}
-		const totals = dailyData.reduce((acc, data) => ({
-			inputTokens: acc.inputTokens + data.inputTokens,
-			outputTokens: acc.outputTokens + data.outputTokens,
-			totalCost: acc.totalCost + data.totalCost
-		}), {
-			inputTokens: 0,
-			outputTokens: 0,
-			totalCost: 0
-		});
+		const totals = calculateTotals(dailyData);
 		if (ctx.values.json) {
 			const jsonOutput = {
 				daily: dailyData.map((data) => ({
 					date: data.date,
 					inputTokens: data.inputTokens,
 					outputTokens: data.outputTokens,
-					totalTokens: data.inputTokens + data.outputTokens,
+					cacheCreationTokens: data.cacheCreationTokens,
+					cacheReadTokens: data.cacheReadTokens,
+					totalTokens: getTotalTokens(data),
 					totalCost: data.totalCost
 				})),
-				totals: {
-					inputTokens: totals.inputTokens,
-					outputTokens: totals.outputTokens,
-					totalTokens: totals.inputTokens + totals.outputTokens,
-					totalCost: totals.totalCost
-				}
+				totals: createTotalsObject(totals)
 			};
 			log(JSON.stringify(jsonOutput, null, 2));
 		} else {
@@ -7156,8 +7192,10 @@ const dailyCommand = define({
 			const table = new import_cli_table3$1.default({
 				head: [
 					"Date",
-					"Input Tokens",
-					"Output Tokens",
+					"Input",
+					"Output",
+					"Cache Create",
+					"Cache Read",
 					"Total Tokens",
 					"Cost (USD)"
 				],
@@ -7167,6 +7205,8 @@ const dailyCommand = define({
 					"right",
 					"right",
 					"right",
+					"right",
+					"right",
 					"right"
 				]
 			});
@@ -7174,7 +7214,9 @@ const dailyCommand = define({
 				data.date,
 				formatNumber(data.inputTokens),
 				formatNumber(data.outputTokens),
-				formatNumber(data.inputTokens + data.outputTokens),
+				formatNumber(data.cacheCreationTokens),
+				formatNumber(data.cacheReadTokens),
+				formatNumber(getTotalTokens(data)),
 				formatCurrency(data.totalCost)
 			]);
 			table.push([
@@ -7182,13 +7224,17 @@ const dailyCommand = define({
 				"─".repeat(12),
 				"─".repeat(12),
 				"─".repeat(12),
+				"─".repeat(12),
+				"─".repeat(12),
 				"─".repeat(10)
 			]);
 			table.push([
 				import_picocolors$1.default.yellow("Total"),
 				import_picocolors$1.default.yellow(formatNumber(totals.inputTokens)),
 				import_picocolors$1.default.yellow(formatNumber(totals.outputTokens)),
-				import_picocolors$1.default.yellow(formatNumber(totals.inputTokens + totals.outputTokens)),
+				import_picocolors$1.default.yellow(formatNumber(totals.cacheCreationTokens)),
+				import_picocolors$1.default.yellow(formatNumber(totals.cacheReadTokens)),
+				import_picocolors$1.default.yellow(formatNumber(getTotalTokens(totals))),
 				import_picocolors$1.default.yellow(formatCurrency(totals.totalCost))
 			]);
 			console.log(table.toString());
@@ -7216,15 +7262,7 @@ const sessionCommand = define({
 			else logger.warn("No Claude usage data found.");
 			process$1.exit(0);
 		}
-		const totals = sessionData.reduce((acc, data) => ({
-			inputTokens: acc.inputTokens + data.inputTokens,
-			outputTokens: acc.outputTokens + data.outputTokens,
-			totalCost: acc.totalCost + data.totalCost
-		}), {
-			inputTokens: 0,
-			outputTokens: 0,
-			totalCost: 0
-		});
+		const totals = calculateTotals(sessionData);
 		if (ctx.values.json) {
 			const jsonOutput = {
 				sessions: sessionData.map((data) => ({
@@ -7232,16 +7270,13 @@ const sessionCommand = define({
 					sessionId: data.sessionId,
 					inputTokens: data.inputTokens,
 					outputTokens: data.outputTokens,
-					totalTokens: data.inputTokens + data.outputTokens,
+					cacheCreationTokens: data.cacheCreationTokens,
+					cacheReadTokens: data.cacheReadTokens,
+					totalTokens: getTotalTokens(data),
 					totalCost: data.totalCost,
 					lastActivity: data.lastActivity
 				})),
-				totals: {
-					inputTokens: totals.inputTokens,
-					outputTokens: totals.outputTokens,
-					totalTokens: totals.inputTokens + totals.outputTokens,
-					totalCost: totals.totalCost
-				}
+				totals: createTotalsObject(totals)
 			};
 			log(JSON.stringify(jsonOutput, null, 2));
 		} else {
@@ -7250,8 +7285,10 @@ const sessionCommand = define({
 				head: [
 					"Project",
 					"Session",
-					"Input Tokens",
-					"Output Tokens",
+					"Input",
+					"Output",
+					"Cache Create",
+					"Cache Read",
 					"Total Tokens",
 					"Cost (USD)",
 					"Last Activity"
@@ -7264,6 +7301,8 @@ const sessionCommand = define({
 					"right",
 					"right",
 					"right",
+					"right",
+					"right",
 					"left"
 				]
 			});
@@ -7279,7 +7318,9 @@ const sessionCommand = define({
 					sessionDisplay,
 					formatNumber(data.inputTokens),
 					formatNumber(data.outputTokens),
-					formatNumber(data.inputTokens + data.outputTokens),
+					formatNumber(data.cacheCreationTokens),
+					formatNumber(data.cacheReadTokens),
+					formatNumber(getTotalTokens(data)),
 					formatCurrency(data.totalCost),
 					data.lastActivity
 				]);
@@ -7290,6 +7331,8 @@ const sessionCommand = define({
 				"─".repeat(12),
 				"─".repeat(12),
 				"─".repeat(12),
+				"─".repeat(12),
+				"─".repeat(12),
 				"─".repeat(10),
 				"─".repeat(12)
 			]);
@@ -7298,7 +7341,9 @@ const sessionCommand = define({
 				"",
 				import_picocolors.default.yellow(formatNumber(totals.inputTokens)),
 				import_picocolors.default.yellow(formatNumber(totals.outputTokens)),
-				import_picocolors.default.yellow(formatNumber(totals.inputTokens + totals.outputTokens)),
+				import_picocolors.default.yellow(formatNumber(totals.cacheCreationTokens)),
+				import_picocolors.default.yellow(formatNumber(totals.cacheReadTokens)),
+				import_picocolors.default.yellow(formatNumber(getTotalTokens(totals))),
 				import_picocolors.default.yellow(formatCurrency(totals.totalCost)),
 				""
 			]);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccusage",
-  "version": "0.1.12",
+  "version": "0.2.1",
   "description": "Usage analysis tool for Claude Code",
   "homepage": "https://github.com/ryoppippi/ccusage#readme",
   "bugs": {