ccusage 15.3.1 → 15.4.0

package/dist/calculate-cost.d.ts

@@ -1,4 +1,4 @@
-import { DailyUsage, MonthlyUsage, SessionUsage } from "./data-loader-a9CiVyT5.js";
+import { DailyUsage, MonthlyUsage, SessionUsage } from "./data-loader-7c4yXbqG.js";
 import "./pricing-fetcher-B3SvKOod.js";
 
 //#region src/_token-utils.d.ts

package/dist/{data-loader-a9CiVyT5.d.ts → data-loader-7c4yXbqG.d.ts}

@@ -446,6 +446,19 @@ declare function calculateCostForEntry(data: UsageData, mode: CostMode, fetcher:
  * @returns Usage limit expiration date
  */
 declare function getUsageLimitResetTime(data: UsageData): Date | null;
+/**
+ * Result of glob operation with base directory information
+ */
+type GlobResult = {
+  file: string;
+  baseDir: string;
+};
+/**
+ * Glob files from multiple Claude paths in parallel
+ * @param claudePaths - Array of Claude base paths
+ * @returns Array of file paths with their base directories
+ */
+declare function globUsageFiles(claudePaths: string[]): Promise<GlobResult[]>;
 /**
  * Date range filter for limiting usage data by date
  */
@@ -492,4 +505,4 @@ declare function loadMonthlyUsageData(options?: LoadOptions): Promise<MonthlyUsa
  */
 declare function loadSessionBlockData(options?: LoadOptions): Promise<SessionBlock[]>;
 //#endregion
-export { DailyUsage, DateFilter, LoadOptions, ModelBreakdown, MonthlyUsage, SessionUsage, UsageData, calculateCostForEntry, createUniqueHash, dailyUsageSchema, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, sessionUsageSchema, sortFilesByTimestamp, usageDataSchema };
+export { DailyUsage, DateFilter, GlobResult, LoadOptions, ModelBreakdown, MonthlyUsage, SessionUsage, UsageData, calculateCostForEntry, createUniqueHash, dailyUsageSchema, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, globUsageFiles, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, sessionUsageSchema, sortFilesByTimestamp, usageDataSchema };

package/dist/{data-loader-DqK3z1AK.js → data-loader-BNrxyvc9.js}

@@ -1,7 +1,7 @@
-import { CLAUDE_CONFIG_DIR_ENV, CLAUDE_PROJECTS_DIR_NAME, DEFAULT_CLAUDE_CODE_PATH, DEFAULT_CLAUDE_CONFIG_PATH, DEFAULT_RECENT_DAYS, PricingFetcher, USAGE_DATA_GLOB_PATTERN, USER_HOME_DIR, __commonJSMin, __require, __toESM, isFailure, isPromise, require_usingCtx } from "./pricing-fetcher-DpoTR8Md.js";
+import { CLAUDE_CONFIG_DIR_ENV, CLAUDE_PROJECTS_DIR_NAME, DEFAULT_CLAUDE_CODE_PATH, DEFAULT_CLAUDE_CONFIG_PATH, DEFAULT_RECENT_DAYS, PricingFetcher, USAGE_DATA_GLOB_PATTERN, USER_HOME_DIR, __commonJSMin, __require, __toESM, isFailure, isPromise, require_usingCtx } from "./pricing-fetcher-KIIpXo8L.js";
 import { getTotalTokens } from "./_token-utils-WjkbrjKv.js";
 import { activityDateSchema, arrayType, booleanType, createDailyDate, createMonthlyDate, createProjectPath, createSessionId, dailyDateSchema, isoTimestampSchema, messageIdSchema, modelNameSchema, monthlyDateSchema, numberType, objectType, projectPathSchema, requestIdSchema, sessionIdSchema, stringType, versionSchema } from "./_types-BHFM59hI.js";
-import { logger } from "./logger-D7tlrIfv.js";
+import { logger } from "./logger-mXUMXvyg.js";
 import a, { readFile } from "node:fs/promises";
 import path, { posix } from "node:path";
 import process$1 from "node:process";
@@ -251,7 +251,7 @@ const unwrap = (...args) => {
 		const apply = (r) => {
 			if (isFailure(r)) {
 				if (hasDefault$1) return defaultValue$1;
-				throw new Error(String(r.error));
+				throw r.error;
 			}
 			return r.value;
 		};
@@ -263,7 +263,7 @@ const unwrap = (...args) => {
 		const apply = (r) => {
 			if (isFailure(r)) {
 				if (hasDefault) return defaultValue;
-				throw new Error(String(r.error));
+				throw r.error;
 			}
 			return r.value;
 		};
@@ -3518,16 +3518,26 @@ function extractUniqueModels(entries, getModel) {
 	return uniq(entries.map(getModel).filter((m$1) => m$1 != null && m$1 !== "<synthetic>"));
 }
 /**
+* Shared method for formatting dates with proper timezone handling
+* @param dateStr - Input date string
+* @param twoLine - Whether to format as two lines (true) or single line (false)
+* @returns Formatted date string
+*/
+function formatDateInternal(dateStr, twoLine) {
+	const date = new Date(dateStr);
+	const hasTimezone = /Z|[+-]\d{2}:\d{2}/.test(dateStr);
+	const year = hasTimezone ? date.getUTCFullYear() : date.getFullYear();
+	const month = String(hasTimezone ? date.getUTCMonth() + 1 : date.getMonth() + 1).padStart(2, "0");
+	const day = String(hasTimezone ? date.getUTCDate() : date.getDate()).padStart(2, "0");
+	return twoLine ? `${year}\n${month}-${day}` : `${year}-${month}-${day}`;
+}
+/**
 * Formats a date string to YYYY-MM-DD format
 * @param dateStr - Input date string
 * @returns Formatted date string in YYYY-MM-DD format
 */
 function formatDate(dateStr) {
-	const date = new Date(dateStr);
-	const year = date.getFullYear();
-	const month = String(date.getMonth() + 1).padStart(2, "0");
-	const day = String(date.getDate()).padStart(2, "0");
-	return `${year}-${month}-${day}`;
+	return formatDateInternal(dateStr, false);
 }
 /**
 * Formats a date string to compact format with year on first line and month-day on second
@@ -3535,11 +3545,7 @@ function formatDate(dateStr) {
 * @returns Formatted date string with newline separator (YYYY\nMM-DD)
 */
 function formatDateCompact(dateStr) {
-	const date = new Date(dateStr);
-	const year = date.getFullYear();
-	const month = String(date.getMonth() + 1).padStart(2, "0");
-	const day = String(date.getDate()).padStart(2, "0");
-	return `${year}\n${month}-${day}`;
+	return formatDateInternal(dateStr, true);
 }
 /**
 * Generic function to sort items by date based on sort order
@@ -3647,6 +3653,25 @@ function getUsageLimitResetTime(data) {
 	return resetTime;
 }
 /**
+* Glob files from multiple Claude paths in parallel
+* @param claudePaths - Array of Claude base paths
+* @returns Array of file paths with their base directories
+*/
+async function globUsageFiles(claudePaths) {
+	const filePromises = claudePaths.map(async (claudePath) => {
+		const claudeDir = path.join(claudePath, CLAUDE_PROJECTS_DIR_NAME);
+		const files = await glob([USAGE_DATA_GLOB_PATTERN], {
+			cwd: claudeDir,
+			absolute: true
+		}).catch(() => []);
+		return files.map((file) => ({
+			file,
+			baseDir: claudeDir
+		}));
+	});
+	return (await Promise.all(filePromises)).flat();
+}
+/**
 * Loads and aggregates Claude usage data by day
 * Processes all JSONL files in the Claude projects directory and groups usage by date
 * @param options - Optional configuration for loading and filtering data
@@ -3656,17 +3681,10 @@ async function loadDailyUsageData(options) {
 	try {
 		var _usingCtx = (0, import_usingCtx.default)();
 		const claudePaths = toArray(options?.claudePath ?? getClaudePaths());
-		const allFiles = [];
-		for (const claudePath of claudePaths) {
-			const claudeDir = path.join(claudePath, CLAUDE_PROJECTS_DIR_NAME);
-			const files = await glob([USAGE_DATA_GLOB_PATTERN], {
-				cwd: claudeDir,
-				absolute: true
-			});
-			allFiles.push(...files);
-		}
-		if (allFiles.length === 0) return [];
-		const sortedFiles = await sortFilesByTimestamp(allFiles);
+		const allFiles = await globUsageFiles(claudePaths);
+		const fileList = allFiles.map((f$1) => f$1.file);
+		if (fileList.length === 0) return [];
+		const sortedFiles = await sortFilesByTimestamp(fileList);
 		const mode = options?.mode ?? "auto";
 		const fetcher = _usingCtx.u(mode === "display" ? null : new PricingFetcher(options?.offline));
 		const processedHashes = /* @__PURE__ */ new Set();
@@ -3724,18 +3742,7 @@ async function loadSessionData(options) {
 	try {
 		var _usingCtx3 = (0, import_usingCtx.default)();
 		const claudePaths = toArray(options?.claudePath ?? getClaudePaths());
-		const filesWithBase = [];
-		for (const claudePath of claudePaths) {
-			const claudeDir = path.join(claudePath, CLAUDE_PROJECTS_DIR_NAME);
-			const files = await glob([USAGE_DATA_GLOB_PATTERN], {
-				cwd: claudeDir,
-				absolute: true
-			});
-			for (const file of files) filesWithBase.push({
-				file,
-				baseDir: claudeDir
-			});
-		}
+		const filesWithBase = await globUsageFiles(claudePaths);
 		if (filesWithBase.length === 0) return [];
 		const fileToBaseMap = new Map(filesWithBase.map((f$1) => [f$1.file, f$1.baseDir]));
 		const sortedFilesWithBase = await sortFilesByTimestamp(filesWithBase.map((f$1) => f$1.file)).then((sortedFiles) => sortedFiles.map((file) => ({
@@ -3915,4 +3922,4 @@ async function loadSessionBlockData(options) {
 		_usingCtx4.d();
 	}
 }
-export { DEFAULT_SESSION_DURATION_HOURS, calculateBurnRate, calculateCostForEntry, createUniqueHash, dailyUsageSchema, filterRecentBlocks, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, glob, identifySessionBlocks, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, projectBlockUsage, sessionUsageSchema, sortFilesByTimestamp, uniq, unwrap, usageDataSchema };
+export { DEFAULT_SESSION_DURATION_HOURS, calculateBurnRate, calculateCostForEntry, createUniqueHash, dailyUsageSchema, filterRecentBlocks, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, glob, globUsageFiles, identifySessionBlocks, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, projectBlockUsage, sessionUsageSchema, sortFilesByTimestamp, uniq, unwrap, usageDataSchema };

package/dist/data-loader.d.ts

@@ -1,3 +1,3 @@
-import { DailyUsage, DateFilter, LoadOptions, ModelBreakdown, MonthlyUsage, SessionUsage, UsageData, calculateCostForEntry, createUniqueHash, dailyUsageSchema, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, sessionUsageSchema, sortFilesByTimestamp, usageDataSchema } from "./data-loader-a9CiVyT5.js";
+import { DailyUsage, DateFilter, GlobResult, LoadOptions, ModelBreakdown, MonthlyUsage, SessionUsage, UsageData, calculateCostForEntry, createUniqueHash, dailyUsageSchema, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, globUsageFiles, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, sessionUsageSchema, sortFilesByTimestamp, usageDataSchema } from "./data-loader-7c4yXbqG.js";
 import "./pricing-fetcher-B3SvKOod.js";
-export { DailyUsage, DateFilter, LoadOptions, ModelBreakdown, MonthlyUsage, SessionUsage, UsageData, calculateCostForEntry, createUniqueHash, dailyUsageSchema, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, sessionUsageSchema, sortFilesByTimestamp, usageDataSchema };
+export { DailyUsage, DateFilter, GlobResult, LoadOptions, ModelBreakdown, MonthlyUsage, SessionUsage, UsageData, calculateCostForEntry, createUniqueHash, dailyUsageSchema, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, globUsageFiles, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, sessionUsageSchema, sortFilesByTimestamp, usageDataSchema };

package/dist/data-loader.js

@@ -1,6 +1,6 @@
-import "./pricing-fetcher-DpoTR8Md.js";
+import "./pricing-fetcher-KIIpXo8L.js";
 import "./_token-utils-WjkbrjKv.js";
 import "./_types-BHFM59hI.js";
-import { calculateCostForEntry, createUniqueHash, dailyUsageSchema, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, sessionUsageSchema, sortFilesByTimestamp, usageDataSchema } from "./data-loader-DqK3z1AK.js";
-import "./logger-D7tlrIfv.js";
-export { calculateCostForEntry, createUniqueHash, dailyUsageSchema, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, sessionUsageSchema, sortFilesByTimestamp, usageDataSchema };
+import { calculateCostForEntry, createUniqueHash, dailyUsageSchema, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, globUsageFiles, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, sessionUsageSchema, sortFilesByTimestamp, usageDataSchema } from "./data-loader-BNrxyvc9.js";
+import "./logger-mXUMXvyg.js";
+export { calculateCostForEntry, createUniqueHash, dailyUsageSchema, formatDate, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, globUsageFiles, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, modelBreakdownSchema, monthlyUsageSchema, sessionUsageSchema, sortFilesByTimestamp, usageDataSchema };

package/dist/{debug-Cby_QhQQ.js → debug-Brn3ODNf.js}

@@ -1,6 +1,6 @@
-import { CLAUDE_PROJECTS_DIR_NAME, DEBUG_MATCH_THRESHOLD_PERCENT, PricingFetcher, USAGE_DATA_GLOB_PATTERN, __toESM, isFailure, require_usingCtx, try_ } from "./pricing-fetcher-DpoTR8Md.js";
-import { getClaudePaths, glob, unwrap, usageDataSchema } from "./data-loader-DqK3z1AK.js";
-import { logger } from "./logger-D7tlrIfv.js";
+import { CLAUDE_PROJECTS_DIR_NAME, DEBUG_MATCH_THRESHOLD_PERCENT, PricingFetcher, USAGE_DATA_GLOB_PATTERN, __toESM, isFailure, require_usingCtx, try_ } from "./pricing-fetcher-KIIpXo8L.js";
+import { getClaudePaths, glob, unwrap, usageDataSchema } from "./data-loader-BNrxyvc9.js";
+import { logger } from "./logger-mXUMXvyg.js";
 import { readFile } from "node:fs/promises";
 import path from "node:path";
 var import_usingCtx = __toESM(require_usingCtx(), 1);

package/dist/debug.js

@@ -1,7 +1,7 @@
-import "./pricing-fetcher-DpoTR8Md.js";
+import "./pricing-fetcher-KIIpXo8L.js";
 import "./_token-utils-WjkbrjKv.js";
 import "./_types-BHFM59hI.js";
-import "./data-loader-DqK3z1AK.js";
-import "./logger-D7tlrIfv.js";
-import { detectMismatches, printMismatchReport } from "./debug-Cby_QhQQ.js";
+import "./data-loader-BNrxyvc9.js";
+import "./logger-mXUMXvyg.js";
+import { detectMismatches, printMismatchReport } from "./debug-Brn3ODNf.js";
 export { detectMismatches, printMismatchReport };

package/dist/index.js

@@ -1,14 +1,13 @@
 #!/usr/bin/env node
-import { BLOCKS_COMPACT_WIDTH_THRESHOLD, BLOCKS_DEFAULT_TERMINAL_WIDTH, BLOCKS_WARNING_THRESHOLD, BURN_RATE_THRESHOLDS, CLAUDE_PROJECTS_DIR_NAME, 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, __commonJSMin, __require, __toESM, isFailure, require_usingCtx, try_ } from "./pricing-fetcher-DpoTR8Md.js";
+import { BLOCKS_COMPACT_WIDTH_THRESHOLD, BLOCKS_DEFAULT_TERMINAL_WIDTH, BLOCKS_WARNING_THRESHOLD, BURN_RATE_THRESHOLDS, DEFAULT_RECENT_DAYS, DEFAULT_REFRESH_INTERVAL_SECONDS, MAX_REFRESH_INTERVAL_SECONDS, MCP_DEFAULT_PORT, MIN_REFRESH_INTERVAL_SECONDS, MIN_RENDER_INTERVAL_MS, PricingFetcher, __commonJSMin, __require, __toESM, isFailure, require_usingCtx, try_ } from "./pricing-fetcher-KIIpXo8L.js";
 import { getTotalTokens } from "./_token-utils-WjkbrjKv.js";
 import { CostModes, SortOrders, filterDateSchema } from "./_types-BHFM59hI.js";
 import { calculateTotals, createTotalsObject } from "./calculate-cost-BDqO4yWA.js";
-import { DEFAULT_SESSION_DURATION_HOURS, calculateBurnRate, calculateCostForEntry, createUniqueHash, filterRecentBlocks, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, glob, identifySessionBlocks, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, projectBlockUsage, sortFilesByTimestamp, uniq, usageDataSchema } from "./data-loader-DqK3z1AK.js";
-import { description, log, logger, name, version } from "./logger-D7tlrIfv.js";
-import { detectMismatches, printMismatchReport } from "./debug-Cby_QhQQ.js";
-import { createMcpHttpApp, createMcpServer, startMcpServerStdio } from "./mcp-CFT0dcvs.js";
+import { DEFAULT_SESSION_DURATION_HOURS, calculateBurnRate, calculateCostForEntry, createUniqueHash, filterRecentBlocks, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, globUsageFiles, identifySessionBlocks, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, projectBlockUsage, sortFilesByTimestamp, uniq, usageDataSchema } from "./data-loader-BNrxyvc9.js";
+import { description, log, logger, name, version } from "./logger-mXUMXvyg.js";
+import { detectMismatches, printMismatchReport } from "./debug-Brn3ODNf.js";
+import { createMcpHttpApp, createMcpServer, startMcpServerStdio } from "./mcp-CQw7snVU.js";
 import { readFile } from "node:fs/promises";
-import path from "node:path";
 import process$1 from "node:process";
 import { createServer } from "node:http";
 import { Http2ServerRequest } from "node:http2";
@@ -3205,14 +3204,11 @@ var LiveMonitor = class {
 	* Only reads new or modified files since last check
 	*/
 	async getActiveBlock() {
-		const claudeDir = path.join(this.config.claudePath, CLAUDE_PROJECTS_DIR_NAME);
-		const files = await glob([USAGE_DATA_GLOB_PATTERN], {
-			cwd: claudeDir,
-			absolute: true
-		});
-		if (files.length === 0) return null;
+		const results = await globUsageFiles(this.config.claudePaths);
+		const allFiles = results.map((r) => r.file);
+		if (allFiles.length === 0) return null;
 		const filesToRead = [];
-		for (const file of files) {
+		for (const file of allFiles) {
 			const timestamp = await getEarliestTimestamp(file);
 			const lastTimestamp = this.lastFileTimestamps.get(file);
 			if (timestamp != null && (lastTimestamp == null || timestamp.getTime() > lastTimestamp)) {
@@ -3745,7 +3741,7 @@ const DETAIL_COLUMN_WIDTHS = {
 function renderLiveDisplay(terminal, block, config) {
 	const width = terminal.width;
 	const now = /* @__PURE__ */ new Date();
-	const totalTokens = block.tokenCounts.inputTokens + block.tokenCounts.outputTokens;
+	const totalTokens = getTotalTokens(block.tokenCounts);
 	const elapsed = (now.getTime() - block.startTime.getTime()) / (1e3 * 60);
 	const remaining = (block.endTime.getTime() - now.getTime()) / (1e3 * 60);
 	if (width < 60) {
@@ -3952,7 +3948,7 @@ async function startLiveMonitoring(config) {
 		terminal.clearScreen();
 		terminal.hideCursor();
 		const monitor = _usingCtx.u(new LiveMonitor({
-			claudePath: config.claudePath,
+			claudePaths: config.claudePaths,
 			sessionDurationHours: config.sessionDurationHours,
 			mode: config.mode,
 			order: config.order
@@ -4052,8 +4048,7 @@ function formatModels(models) {
 * @returns Parsed token limit or undefined if invalid
 */
 function parseTokenLimit(value, maxFromAll) {
-	if (value == null || value === "") return void 0;
-	if (value === "max") return maxFromAll > 0 ? maxFromAll : void 0;
+	if (value == null || value === "" || value === "max") return maxFromAll > 0 ? maxFromAll : void 0;
 	const limit = Number.parseInt(value, 10);
 	return Number.isNaN(limit) ? void 0 : limit;
 }
@@ -4117,7 +4112,7 @@ const blocksCommand = define({
 			process$1.exit(0);
 		}
 		let maxTokensFromAll = 0;
-		if (ctx.values.tokenLimit === "max") {
+		if (ctx.values.tokenLimit === "max" || ctx.values.tokenLimit == null || ctx.values.tokenLimit === "") {
 			for (const block of blocks) if (!(block.isGap ?? false) && !block.isActive) {
 				const blockTokens = getTotalTokens(block.tokenCounts);
 				if (blockTokens > maxTokensFromAll) maxTokensFromAll = blockTokens;
@@ -4151,7 +4146,7 @@ const blocksCommand = define({
 				throw new Error("No valid Claude data directory found");
 			}
 			await startLiveMonitoring({
-				claudePath: paths[0],
+				claudePaths: paths,
 				tokenLimit: parseTokenLimit(tokenLimitValue, maxTokensFromAll),
 				refreshInterval: refreshInterval * 1e3,
 				sessionDurationHours: ctx.values.sessionLength,
@@ -4173,7 +4168,7 @@ const blocksCommand = define({
 					isGap: block.isGap ?? false,
 					entries: block.entries.length,
 					tokenCounts: block.tokenCounts,
-					totalTokens: block.tokenCounts.inputTokens + block.tokenCounts.outputTokens,
+					totalTokens: getTotalTokens(block.tokenCounts),
 					costUSD: block.costUSD,
 					models: block.models,
 					burnRate,
@@ -4474,6 +4469,7 @@ var Request = class extends GlobalRequest {
 		super(input, options);
 	}
 };
+var wrapBodyStream = Symbol("wrapBodyStream");
 var newRequestFromIncoming = (method, url, incoming, abortController) => {
 	const headerRecord = [];
 	const rawHeaders = incoming.rawHeaders;
@@ -4498,7 +4494,19 @@ var newRequestFromIncoming = (method, url, incoming, abortController) => {
 		controller.enqueue(incoming.rawBody);
 		controller.close();
 	} });
-	else init$1.body = Readable.toWeb(incoming);
+	else if (incoming[wrapBodyStream]) {
+		let reader;
+		init$1.body = new ReadableStream({ async pull(controller) {
+			try {
+				reader ||= Readable.toWeb(incoming).getReader();
+				const { done, value } = await reader.read();
+				if (done) controller.close();
+				else controller.enqueue(value);
+			} catch (error) {
+				controller.error(error);
+			}
+		} });
+	} else init$1.body = Readable.toWeb(incoming);
 	return new Request(url, init$1);
 };
 var getRequestCache = Symbol("getRequestCache");
@@ -4709,6 +4717,7 @@ global.fetch = (info$1, init$1) => {
 	};
 	return webFetch(info$1, init$1);
 };
+var outgoingEnded = Symbol("outgoingEnded");
 var regBuffer = /^no$/i;
 var regContentType = /^(application\/json\b|text\/(?!event-stream\b))/i;
 var handleRequestError = () => new Response(null, { status: 400 });
@@ -4737,8 +4746,9 @@ var responseViaCache = async (res, outgoing) => {
 	else if (body instanceof Blob) outgoing.end(new Uint8Array(await body.arrayBuffer()));
 	else {
 		flushHeaders(outgoing);
-		return writeFromReadableStream(body, outgoing)?.catch((e) => handleResponseError(e, outgoing));
+		await writeFromReadableStream(body, outgoing)?.catch((e) => handleResponseError(e, outgoing));
 	}
+	outgoing[outgoingEnded]?.();
 };
 var responseViaResponseObject = async (res, outgoing, options = {}) => {
 	if (res instanceof Promise) if (options.errorHandler) try {
@@ -4767,8 +4777,10 @@ var responseViaResponseObject = async (res, outgoing, options = {}) => {
 		outgoing.writeHead(res.status, resHeaderRecord);
 		outgoing.end();
 	}
+	outgoing[outgoingEnded]?.();
 };
 var getRequestListener = (fetchCallback, options = {}) => {
+	const autoCleanupIncoming = options.autoCleanupIncoming ?? true;
 	if (options.overrideGlobalObjects !== false && global.Request !== Request) {
 		Object.defineProperty(global, "Request", { value: Request });
 		Object.defineProperty(global, "Response", { value: Response2 });
@@ -4777,11 +4789,32 @@ var getRequestListener = (fetchCallback, options = {}) => {
 		let res, req;
 		try {
 			req = newRequest(incoming, options.hostname);
+			let incomingEnded = !autoCleanupIncoming || incoming.method === "GET" || incoming.method === "HEAD";
+			if (!incomingEnded) {
+				incoming[wrapBodyStream] = true;
+				incoming.on("end", () => {
+					incomingEnded = true;
+				});
+				if (incoming instanceof Http2ServerRequest) outgoing[outgoingEnded] = () => {
+					if (!incomingEnded) setTimeout(() => {
+						if (!incomingEnded) setTimeout(() => {
+							incoming.destroy();
+							outgoing.destroy();
+						});
+					});
+				};
+			}
 			outgoing.on("close", () => {
 				const abortController = req[abortControllerKey];
-				if (!abortController) return;
-				if (incoming.errored) req[abortControllerKey].abort(incoming.errored.toString());
-				else if (!outgoing.writableFinished) req[abortControllerKey].abort("Client connection prematurely closed.");
+				if (abortController) {
+					if (incoming.errored) req[abortControllerKey].abort(incoming.errored.toString());
+					else if (!outgoing.writableFinished) req[abortControllerKey].abort("Client connection prematurely closed.");
+				}
+				if (!incomingEnded) setTimeout(() => {
+					if (!incomingEnded) setTimeout(() => {
+						incoming.destroy();
+					});
+				});
 			});
 			res = fetchCallback(req, {
 				incoming,
@@ -4807,7 +4840,8 @@ var createAdaptorServer = (options) => {
 	const fetchCallback = options.fetch;
 	const requestListener = getRequestListener(fetchCallback, {
 		hostname: options.hostname,
-		overrideGlobalObjects: options.overrideGlobalObjects
+		overrideGlobalObjects: options.overrideGlobalObjects,
+		autoCleanupIncoming: options.autoCleanupIncoming
 	});
 	const createServer$1 = options.createServer || createServer;
 	const server = createServer$1(options.serverOptions || {}, requestListener);

package/dist/{logger-D7tlrIfv.js → logger-mXUMXvyg.js}

@@ -951,7 +951,7 @@ function _getDefaultLogLevel() {
 }
 const consola = createConsola$1();
 var name = "ccusage";
-var version = "15.3.1";
+var version = "15.4.0";
 var description = "Usage analysis tool for Claude Code";
 /**
 * Application logger instance with package name tag

package/dist/logger.js

@@ -1,2 +1,2 @@
-import { log, logger } from "./logger-D7tlrIfv.js";
+import { log, logger } from "./logger-mXUMXvyg.js";
 export { log, logger };

package/dist/{mcp-CFT0dcvs.js → mcp-CQw7snVU.js}

@@ -1,9 +1,9 @@
-import { __commonJSMin, __toESM, require_usingCtx } from "./pricing-fetcher-DpoTR8Md.js";
+import { __commonJSMin, __toESM, require_usingCtx } from "./pricing-fetcher-KIIpXo8L.js";
 import { getTotalTokens } from "./_token-utils-WjkbrjKv.js";
 import { ZodFirstPartyTypeKind, ZodOptional, ZodType, arrayType, booleanType, discriminatedUnionType, enumType, filterDateSchema, literalType, numberType, objectType, optionalType, recordType, stringType, unionType, unknownType } from "./_types-BHFM59hI.js";
 import { calculateTotals, createTotalsObject } from "./calculate-cost-BDqO4yWA.js";
-import { getClaudePaths, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData } from "./data-loader-DqK3z1AK.js";
-import { name, version } from "./logger-D7tlrIfv.js";
+import { getClaudePaths, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData } from "./data-loader-BNrxyvc9.js";
+import { name, version } from "./logger-mXUMXvyg.js";
 import process from "node:process";
 const LATEST_PROTOCOL_VERSION = "2025-06-18";
 const SUPPORTED_PROTOCOL_VERSIONS = [
@@ -606,7 +606,7 @@ const ElicitRequestSchema = RequestSchema.extend({
 const ElicitResultSchema = ResultSchema.extend({
 	action: enumType([
 		"accept",
-		"reject",
+		"decline",
 		"cancel"
 	]),
 	content: optionalType(recordType(stringType(), unknownType()))
@@ -1054,7 +1054,7 @@ var HonoRequest = class {
 		return bodyCache[key] = raw$1[key]();
 	};
 	json() {
-		return this.#cachedBody("json");
+		return this.#cachedBody("text").then((text) => JSON.parse(text));
 	}
 	text() {
 		return this.#cachedBody("text");
@@ -8561,10 +8561,6 @@ var McpServer = class {
 			return registeredResourceTemplate;
 		}
 	}
-	/**
-	* Registers a resource with a config object and callback.
-	* For static resources, use a URI string. For dynamic resources, use a ResourceTemplate.
-	*/
 	registerResource(name$1, uriOrTemplate, config, readCallback) {
 		if (typeof uriOrTemplate === "string") {
 			if (this._registeredResources[uriOrTemplate]) throw new Error(`Resource ${uriOrTemplate} is already registered`);
@@ -8766,7 +8762,10 @@ var McpServer = class {
 		if (this.isConnected()) this.server.sendPromptListChanged();
 	}
 };
-const EMPTY_OBJECT_JSON_SCHEMA = { type: "object" };
+const EMPTY_OBJECT_JSON_SCHEMA = {
+	type: "object",
+	properties: {}
+};
 function isZodRawShape(obj) {
 	if (typeof obj !== "object" || obj === null) return false;
 	const isEmptyObject = Object.keys(obj).length === 0;

package/dist/mcp.d.ts

@@ -1,4 +1,4 @@
-import { LoadOptions } from "./data-loader-a9CiVyT5.js";
+import { LoadOptions } from "./data-loader-7c4yXbqG.js";
 import "./pricing-fetcher-B3SvKOod.js";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { Hono } from "hono/tiny";

package/dist/mcp.js

@@ -1,8 +1,8 @@
-import "./pricing-fetcher-DpoTR8Md.js";
+import "./pricing-fetcher-KIIpXo8L.js";
 import "./_token-utils-WjkbrjKv.js";
 import "./_types-BHFM59hI.js";
 import "./calculate-cost-BDqO4yWA.js";
-import "./data-loader-DqK3z1AK.js";
-import "./logger-D7tlrIfv.js";
-import { createMcpHttpApp, createMcpServer, startMcpServerStdio } from "./mcp-CFT0dcvs.js";
+import "./data-loader-BNrxyvc9.js";
+import "./logger-mXUMXvyg.js";
+import { createMcpHttpApp, createMcpServer, startMcpServerStdio } from "./mcp-CQw7snVU.js";
 export { createMcpHttpApp, createMcpServer, startMcpServerStdio };

package/dist/{pricing-fetcher-DpoTR8Md.js → pricing-fetcher-KIIpXo8L.js}

@@ -1,5 +1,5 @@
 import { modelPricingSchema } from "./_types-BHFM59hI.js";
-import { logger } from "./logger-D7tlrIfv.js";
+import { logger } from "./logger-mXUMXvyg.js";
 import { createRequire } from "node:module";
 import path from "node:path";
 import F, { homedir } from "node:os";
@@ -47,6 +47,7 @@ const andThrough = (fn) => (result) => {
 	};
 	return isPromise(result) ? result.then(apply) : apply(result);
 };
+const isSuccess = (result) => "Success" === result.type;
 const succeed = (...args) => {
 	const value = args[0];
 	if (void 0 === value) return { type: "Success" };
@@ -71,7 +72,6 @@ const fail = (...args) => {
 		error
 	};
 };
-const isSuccess = (result) => "Success" === result.type;
 const inspect = (fn) => (result) => {
 	const apply = (r) => {
 		if (isSuccess(r)) fn(r.value);
@@ -324,14 +324,6 @@ var PricingFetcher = class {
 	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

package/dist/pricing-fetcher.js

@@ -1,4 +1,4 @@
-import { PricingFetcher } from "./pricing-fetcher-DpoTR8Md.js";
+import { PricingFetcher } from "./pricing-fetcher-KIIpXo8L.js";
 import "./_types-BHFM59hI.js";
-import "./logger-D7tlrIfv.js";
+import "./logger-mXUMXvyg.js";
 export { PricingFetcher };

package/package.json

@@ -1,19 +1,19 @@
 {
   "name": "ccusage",
-  "type": "module",
-  "version": "15.3.1",
+  "version": "15.4.0",
   "description": "Usage analysis tool for Claude Code",
-  "author": "ryoppippi",
-  "license": "MIT",
-  "funding": "https://github.com/ryoppippi/ccusage?sponsor=1",
   "homepage": "https://github.com/ryoppippi/ccusage#readme",
+  "bugs": {
+    "url": "https://github.com/ryoppippi/ccusage/issues"
+  },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/ryoppippi/ccusage.git"
   },
-  "bugs": {
-    "url": "https://github.com/ryoppippi/ccusage/issues"
-  },
+  "funding": "https://github.com/ryoppippi/ccusage?sponsor=1",
+  "license": "MIT",
+  "author": "ryoppippi",
+  "type": "module",
   "exports": {
     ".": "./dist/index.js",
     "./calculate-cost": "./dist/calculate-cost.js",
@@ -32,6 +32,6 @@
     "dist"
   ],
   "engines": {
-    "node": ">=20.19.3"
+    "node": ">=20.19.4"
   }
 }