ccusage 16.2.0 → 16.2.2

package/dist/index.js

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
-import { BLOCKS_COMPACT_WIDTH_THRESHOLD, BLOCKS_DEFAULT_TERMINAL_WIDTH, BLOCKS_WARNING_THRESHOLD, BURN_RATE_THRESHOLDS, CONFIG_FILE_NAME, DEFAULT_CONTEXT_USAGE_THRESHOLDS, DEFAULT_RECENT_DAYS, DEFAULT_REFRESH_INTERVAL_SECONDS, MAX_REFRESH_INTERVAL_SECONDS, MCP_DEFAULT_PORT, MIN_REFRESH_INTERVAL_SECONDS, MIN_RENDER_INTERVAL_MS, PricingFetcher, WEEK_DAYS, __commonJSMin, __require, __toESM, andThen, fail, inspect, inspectError, isFailure, isSuccess, map, pipe, require_usingCtx, succeed, try_ } from "./pricing-fetcher-CoBMgxFA.js";
+import { BLOCKS_COMPACT_WIDTH_THRESHOLD, BLOCKS_DEFAULT_TERMINAL_WIDTH, BLOCKS_WARNING_THRESHOLD, BURN_RATE_THRESHOLDS, CONFIG_FILE_NAME, DEFAULT_CONTEXT_USAGE_THRESHOLDS, DEFAULT_LOCALE, DEFAULT_RECENT_DAYS, DEFAULT_REFRESH_INTERVAL_SECONDS, MAX_REFRESH_INTERVAL_SECONDS, MCP_DEFAULT_PORT, MIN_REFRESH_INTERVAL_SECONDS, MIN_RENDER_INTERVAL_MS, PricingFetcher, WEEK_DAYS, __commonJSMin, __require, __toESM, andThen, fail, inspect, inspectError, isFailure, isSuccess, map, pipe, require_usingCtx, succeed, try_ } from "./pricing-fetcher-DPt1jOSj.js";
 import { getTotalTokens } from "./_token-utils-WjkbrjKv.js";
 import { CostModes, SortOrders, coerce, filterDateSchema, statuslineHookJsonSchema } from "./_types-DIdtMJ6V.js";
 import { calculateTotals, createTotalsObject } from "./calculate-cost-BDqO4yWA.js";
-import { DEFAULT_SESSION_DURATION_HOURS, calculateBurnRate, calculateContextTokens, calculateCostForEntry, createUniqueHash, filterRecentBlocks, formatDateCompact, getClaudePaths, getEarliestTimestamp, getUsageLimitResetTime, globUsageFiles, identifySessionBlocks, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, loadSessionUsageById, loadWeeklyUsageData, projectBlockUsage, sortFilesByTimestamp, toArray, uniq, unwrap, usageDataSchema } from "./data-loader-C7KK9Yu0.js";
-import { description, log, logger, name, version } from "./logger-DKCIi_ai.js";
-import { detectMismatches, printMismatchReport } from "./debug-BOv8jTQu.js";
-import { createMcpHttpApp, createMcpServer, startMcpServerStdio } from "./mcp-DDHqWuGb.js";
+import { DEFAULT_SESSION_DURATION_HOURS, calculateBurnRate, calculateContextTokens, calculateCostForEntry, createUniqueHash, filterRecentBlocks, formatDateCompact, getClaudePaths, getEarliestTimestamp, getFileModifiedTime, getUsageLimitResetTime, globUsageFiles, identifySessionBlocks, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, loadSessionUsageById, loadWeeklyUsageData, projectBlockUsage, sortFilesByTimestamp, toArray, uniq, unreachable, unwrap, usageDataSchema } from "./data-loader-DGbft8qX.js";
+import { description, log, logger, name, version } from "./logger-CCzV_6Z4.js";
+import { detectMismatches, printMismatchReport } from "./debug-CBbNSr0C.js";
+import { createMcpHttpApp, createMcpServer, startMcpServerStdio } from "./mcp-CdsxcdNL.js";
 import a, { readFile, stat } from "node:fs/promises";
 import path, { join } from "node:path";
 import process$1 from "node:process";
@@ -22,7 +22,7 @@ import { createServer } from "node:http";
 import { Http2ServerRequest } from "node:http2";
 import { Readable } from "node:stream";
 import crypto from "node:crypto";
-const DEFAULT_LOCALE = "en-US", BUILT_IN_PREFIX = "_", ARG_PREFIX = "arg", BUILT_IN_KEY_SEPARATOR = ":", ANONYMOUS_COMMAND_NAME = "(anonymous)", NOOP = () => {}, COMMON_ARGS = {
+const DEFAULT_LOCALE$1 = "en-US", BUILT_IN_PREFIX = "_", ARG_PREFIX = "arg", BUILT_IN_KEY_SEPARATOR = ":", ANONYMOUS_COMMAND_NAME = "(anonymous)", NOOP = () => {}, COMMON_ARGS = {
 	help: {
 		type: "boolean",
 		short: "h",
@@ -138,7 +138,7 @@ var DefaultTranslation = class {
 	translate(locale, key, values = create()) {
 		let message = this.getMessage(locale, key);
 		if (message === void 0 && locale !== this.#options.fallbackLocale) message = this.getMessage(this.#options.fallbackLocale, key);
-		if (message !== void 0) return message.replaceAll(/\{\{(\w+)\}\}/g, (_, name$1) => {
+		if (message !== void 0) return message.replaceAll(/\{\{(\w+)\}\}/g, (_$1, name$1) => {
 			return values[name$1] == null ? "" : values[name$1].toString();
 		});
 	}
@@ -149,16 +149,16 @@ async function createCommandContext({ args, values, positionals, rest, argv: arg
 		return acc[key] = Object.assign(create(), value$1), acc;
 	}, create()), env$2 = Object.assign(create(), COMMAND_OPTIONS_DEFAULT, cliOptions), locale = resolveLocale(cliOptions.locale), localeStr = locale.toString(), translationAdapterFactory = cliOptions.translationAdapterFactory || createTranslationAdapter, adapter = translationAdapterFactory({
 		locale: localeStr,
-		fallbackLocale: DEFAULT_LOCALE
+		fallbackLocale: DEFAULT_LOCALE$1
 	}), localeResources = /* @__PURE__ */ new Map();
 	let builtInLoadedResources;
-	if (localeResources.set(DEFAULT_LOCALE, mapResourceWithBuiltinKey(en_US_default)), DEFAULT_LOCALE !== localeStr) try {
+	if (localeResources.set(DEFAULT_LOCALE$1, mapResourceWithBuiltinKey(en_US_default)), DEFAULT_LOCALE$1 !== localeStr) try {
 		builtInLoadedResources = (await import(`./locales/${localeStr}.json`, { with: { type: "json" } })).default, localeResources.set(localeStr, mapResourceWithBuiltinKey(builtInLoadedResources));
 	} catch {}
 	function translate(key, values$1 = create()) {
 		const strKey = key;
 		if (strKey.codePointAt(0) === BUILT_IN_PREFIX_CODE) {
-			const resource = localeResources.get(localeStr) || localeResources.get(DEFAULT_LOCALE);
+			const resource = localeResources.get(localeStr) || localeResources.get(DEFAULT_LOCALE$1);
 			return resource[strKey] || strKey;
 		} else return adapter.translate(locale.toString(), strKey, values$1) || "";
 	}
@@ -191,7 +191,7 @@ async function createCommandContext({ args, values, positionals, rest, argv: arg
 	}), defaultCommandResource = loadedOptionsResources.reduce((res, [key, value$1]) => {
 		return res[resolveArgKey(key)] = value$1, res;
 	}, create());
-	defaultCommandResource.description = command.description || "", defaultCommandResource.examples = await resolveExamples(ctx, command.examples), adapter.setResource(DEFAULT_LOCALE, defaultCommandResource);
+	defaultCommandResource.description = command.description || "", defaultCommandResource.examples = await resolveExamples(ctx, command.examples), adapter.setResource(DEFAULT_LOCALE$1, defaultCommandResource);
 	const originalResource = await loadCommandResource(ctx, command);
 	if (originalResource) {
 		const resource = Object.assign(create(), originalResource, { examples: await resolveExamples(ctx, originalResource.examples) });
@@ -204,7 +204,7 @@ function getCommandName(cmd) {
 	return isLazyCommand(cmd) ? cmd.commandName || cmd.name || ANONYMOUS_COMMAND_NAME : typeof cmd === "object" && cmd.name || ANONYMOUS_COMMAND_NAME;
 }
 function resolveLocale(locale) {
-	return locale instanceof Intl.Locale ? locale : typeof locale === "string" ? new Intl.Locale(locale) : new Intl.Locale(DEFAULT_LOCALE);
+	return locale instanceof Intl.Locale ? locale : typeof locale === "string" ? new Intl.Locale(locale) : new Intl.Locale(DEFAULT_LOCALE$1);
 }
 async function loadCommandResource(ctx, command) {
 	let resource;
@@ -351,7 +351,7 @@ function resolveDisplayValue(ctx, key) {
 	return "";
 }
 async function generateOptionalArgsUsage(ctx, optionsPairs) {
-	const optionsMaxLength = Math.max(...Object.entries(optionsPairs).map(([_, value$1]) => value$1.length)), optionSchemaMaxLength = ctx.env.usageOptionType ? Math.max(...Object.entries(optionsPairs).map(([key]) => resolveNegatableType(key, ctx).length)) : 0, usages = await Promise.all(Object.entries(optionsPairs).map(([key, value$1]) => {
+	const optionsMaxLength = Math.max(...Object.entries(optionsPairs).map(([_$1, value$1]) => value$1.length)), optionSchemaMaxLength = ctx.env.usageOptionType ? Math.max(...Object.entries(optionsPairs).map(([key]) => resolveNegatableType(key, ctx).length)) : 0, usages = await Promise.all(Object.entries(optionsPairs).map(([key, value$1]) => {
 		let rawDesc = ctx.translate(resolveArgKey(key));
 		if (!rawDesc && key.startsWith("no-")) {
 			const name$1 = resolveNegatableKey(key), schema = ctx.args[name$1], optionKey = makeShortLongOptionPair(schema, name$1, ctx.toKebab);
@@ -363,7 +363,7 @@ async function generateOptionalArgsUsage(ctx, optionsPairs) {
 	return usages.join("\n");
 }
 function getPositionalArgs(ctx) {
-	return Object.entries(ctx.args).filter(([_, schema]) => schema.type === "positional");
+	return Object.entries(ctx.args).filter(([_$1, schema]) => schema.type === "positional");
 }
 async function generatePositionalArgsUsage(ctx) {
 	const positionals = getPositionalArgs(ctx), argsMaxLength = Math.max(...positionals.map(([name$1]) => name$1.length)), usages = await Promise.all(positionals.map(([name$1]) => {
@@ -817,7 +817,7 @@ var require_picocolors = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		};
 	};
 	module.exports = createColors(), module.exports.createColors = createColors;
-})), import_picocolors$8 = /* @__PURE__ */ __toESM(require_picocolors(), 1), import_usingCtx$4 = /* @__PURE__ */ __toESM(require_usingCtx(), 1);
+})), import_picocolors$5 = /* @__PURE__ */ __toESM(require_picocolors(), 1), import_usingCtx$3 = /* @__PURE__ */ __toESM(require_usingCtx(), 1);
 function extractExplicitArgs(tokens) {
 	const explicit = {};
 	for (const token of tokens) if (typeof token === "object" && token !== null) {
@@ -1157,7 +1157,7 @@ const sharedArgs = {
 		type: "string",
 		short: "l",
 		description: "Locale for date/time formatting (e.g., en-US, ja-JP, de-DE)",
-		default: "en-CA"
+		default: DEFAULT_LOCALE
 	},
 	jq: {
 		type: "string",
@@ -2467,7 +2467,7 @@ function stringWidth(string, options = {}) {
 	}
 	return width;
 }
-var import_usingCtx$3 = /* @__PURE__ */ __toESM(require_usingCtx(), 1), ResponsiveTable = class {
+var ResponsiveTable = class {
 	head;
 	rows = [];
 	colAligns;
@@ -2497,9 +2497,9 @@ var import_usingCtx$3 = /* @__PURE__ */ __toESM(require_usingCtx(), 1), Responsi
 		};
 	}
 	getCompactIndices() {
-		return this.compactHead == null || !this.compactMode ? Array.from({ length: this.head.length }, (_, i) => i) : this.compactHead.map((compactHeader) => {
+		return this.compactHead == null || !this.compactMode ? Array.from({ length: this.head.length }, (_$1, i) => i) : this.compactHead.map((compactHeader) => {
 			const index = this.head.indexOf(compactHeader);
-			return index < 0 ? (console.warn(`Warning: Compact header "${compactHeader}" not found in table headers [${this.head.join(", ")}]. Using first column as fallback.`), 0) : index;
+			return index < 0 ? (logger.warn(`Warning: Compact header "${compactHeader}" not found in table headers [${this.head.join(", ")}]. Using first column as fallback.`), 0) : index;
 		});
 	}
 	isCompactMode() {
@@ -2510,7 +2510,7 @@ var import_usingCtx$3 = /* @__PURE__ */ __toESM(require_usingCtx(), 1), Responsi
 		this.compactMode = this.forceCompact || terminalWidth < this.compactThreshold && this.compactHead != null;
 		const { head, colAligns } = this.getCurrentTableConfig(), compactIndices = this.getCompactIndices(), dataRows = this.rows.filter((row) => !this.isSeparatorRow(row)), processedDataRows = this.compactMode ? dataRows.map((row) => this.filterRowToCompact(row, compactIndices)) : dataRows, allRows = [head.map(String), ...processedDataRows.map((row) => row.map((cell) => {
 			return typeof cell === "object" && cell != null && "content" in cell ? String(cell.content) : String(cell ?? "");
-		}))], contentWidths = head.map((_, colIndex) => {
+		}))], contentWidths = head.map((_$1, colIndex) => {
 			const maxLength = Math.max(...allRows.map((row) => stringWidth(String(row[colIndex] ?? ""))));
 			return maxLength;
 		}), numColumns = head.length, tableOverhead = 3 * numColumns + 1, availableWidth = terminalWidth - tableOverhead, columnWidths = contentWidths.map((width, index) => {
@@ -2592,16 +2592,86 @@ function pushBreakdownRows(table, breakdowns, extraColumns = 1, trailingColumns
 		const row = [`  └─ ${formatModelName(breakdown.modelName)}`];
 		for (let i = 0; i < extraColumns; i++) row.push("");
 		const totalTokens = breakdown.inputTokens + breakdown.outputTokens + breakdown.cacheCreationTokens + breakdown.cacheReadTokens;
-		row.push(import_picocolors$8.default.gray(formatNumber(breakdown.inputTokens)), import_picocolors$8.default.gray(formatNumber(breakdown.outputTokens)), import_picocolors$8.default.gray(formatNumber(breakdown.cacheCreationTokens)), import_picocolors$8.default.gray(formatNumber(breakdown.cacheReadTokens)), import_picocolors$8.default.gray(formatNumber(totalTokens)), import_picocolors$8.default.gray(formatCurrency(breakdown.cost)));
+		row.push(import_picocolors$5.default.gray(formatNumber(breakdown.inputTokens)), import_picocolors$5.default.gray(formatNumber(breakdown.outputTokens)), import_picocolors$5.default.gray(formatNumber(breakdown.cacheCreationTokens)), import_picocolors$5.default.gray(formatNumber(breakdown.cacheReadTokens)), import_picocolors$5.default.gray(formatNumber(totalTokens)), import_picocolors$5.default.gray(formatCurrency(breakdown.cost)));
 		for (let i = 0; i < trailingColumns; i++) row.push("");
 		table.push(row);
 	}
 }
-async function getFileModifiedTime(filePath) {
-	return pipe(try_({
-		try: stat(filePath),
-		catch: (error) => error
-	}), map((stats) => stats.mtime.getTime()), unwrap(0));
+function createUsageReportTable(config) {
+	const baseHeaders = [
+		config.firstColumnName,
+		"Models",
+		"Input",
+		"Output",
+		"Cache Create",
+		"Cache Read",
+		"Total Tokens",
+		"Cost (USD)"
+	], baseAligns = [
+		"left",
+		"left",
+		"right",
+		"right",
+		"right",
+		"right",
+		"right",
+		"right"
+	], compactHeaders = [
+		config.firstColumnName,
+		"Models",
+		"Input",
+		"Output",
+		"Cost (USD)"
+	], compactAligns = [
+		"left",
+		"left",
+		"right",
+		"right",
+		"right"
+	];
+	if (config.includeLastActivity ?? false) baseHeaders.push("Last Activity"), baseAligns.push("left"), compactHeaders.push("Last Activity"), compactAligns.push("left");
+	return new ResponsiveTable({
+		head: baseHeaders,
+		style: { head: ["cyan"] },
+		colAligns: baseAligns,
+		dateFormatter: config.dateFormatter,
+		compactHead: compactHeaders,
+		compactColAligns: compactAligns,
+		compactThreshold: 100,
+		forceCompact: config.forceCompact
+	});
+}
+function formatUsageDataRow(firstColumnValue, data, lastActivity) {
+	const totalTokens = data.inputTokens + data.outputTokens + data.cacheCreationTokens + data.cacheReadTokens, row = [
+		firstColumnValue,
+		data.modelsUsed != null ? formatModelsDisplayMultiline(data.modelsUsed) : "",
+		formatNumber(data.inputTokens),
+		formatNumber(data.outputTokens),
+		formatNumber(data.cacheCreationTokens),
+		formatNumber(data.cacheReadTokens),
+		formatNumber(totalTokens),
+		formatCurrency(data.totalCost)
+	];
+	if (lastActivity !== void 0) row.push(lastActivity);
+	return row;
+}
+function formatTotalsRow(totals, includeLastActivity = false) {
+	const totalTokens = totals.inputTokens + totals.outputTokens + totals.cacheCreationTokens + totals.cacheReadTokens, row = [
+		import_picocolors$5.default.yellow("Total"),
+		"",
+		import_picocolors$5.default.yellow(formatNumber(totals.inputTokens)),
+		import_picocolors$5.default.yellow(formatNumber(totals.outputTokens)),
+		import_picocolors$5.default.yellow(formatNumber(totals.cacheCreationTokens)),
+		import_picocolors$5.default.yellow(formatNumber(totals.cacheReadTokens)),
+		import_picocolors$5.default.yellow(formatNumber(totalTokens)),
+		import_picocolors$5.default.yellow(formatCurrency(totals.totalCost))
+	];
+	if (includeLastActivity) row.push("");
+	return row;
+}
+function addEmptySeparatorRow(table, columnCount) {
+	const emptyRow = Array.from({ length: columnCount }, () => "");
+	table.push(emptyRow);
 }
 var Node = class {
 	value;
@@ -2995,20 +3065,20 @@ const SAVE_CURSOR = "\x1B7", RESTORE_CURSOR = "\x1B8";
 function drawEmoji(emoji) {
 	return `${SAVE_CURSOR}${emoji}${RESTORE_CURSOR}${cursorForward(stringWidth(emoji))}`;
 }
-var import_picocolors$7 = /* @__PURE__ */ __toESM(require_picocolors(), 1);
+var import_picocolors$4 = /* @__PURE__ */ __toESM(require_picocolors(), 1);
 function getRateIndicator(burnRate) {
 	if (burnRate == null) return "";
 	switch (true) {
-		case burnRate.tokensPerMinuteForIndicator > BURN_RATE_THRESHOLDS.HIGH: return import_picocolors$7.default.red(`${drawEmoji("⚡")} HIGH`);
-		case burnRate.tokensPerMinuteForIndicator > BURN_RATE_THRESHOLDS.MODERATE: return import_picocolors$7.default.yellow(`${drawEmoji("⚡")} MODERATE`);
-		default: return import_picocolors$7.default.green(`${drawEmoji("✓")} NORMAL`);
+		case burnRate.tokensPerMinuteForIndicator > BURN_RATE_THRESHOLDS.HIGH: return import_picocolors$4.default.red(`${drawEmoji("⚡")} HIGH`);
+		case burnRate.tokensPerMinuteForIndicator > BURN_RATE_THRESHOLDS.MODERATE: return import_picocolors$4.default.yellow(`${drawEmoji("⚡")} MODERATE`);
+		default: return import_picocolors$4.default.green(`${drawEmoji("✓")} NORMAL`);
 	}
 }
 async function delayWithAbort(ms, signal) {
 	await delay(ms, { signal });
 }
 async function renderWaitingState(terminal, config, signal) {
-	terminal.startBuffering(), terminal.write(cursorTo(0, 0)), terminal.write(eraseDown), terminal.write(import_picocolors$7.default.yellow("No active session block found. Waiting...\n")), terminal.write(cursorHide), terminal.flush(), await delayWithAbort(config.refreshInterval, signal);
+	terminal.startBuffering(), terminal.write(cursorTo(0, 0)), terminal.write(eraseDown), terminal.write(import_picocolors$4.default.yellow("No active session block found. Waiting...\n")), terminal.write(cursorHide), terminal.flush(), await delayWithAbort(config.refreshInterval, signal);
 }
 function renderActiveBlock(terminal, activeBlock, config) {
 	terminal.startBuffering(), terminal.write(cursorTo(0, 0)), terminal.write(eraseDown), renderLiveDisplay(terminal, activeBlock, config), terminal.write(cursorHide), terminal.flush();
@@ -3026,8 +3096,8 @@ function renderLiveDisplay(terminal, block, config) {
 	}
 	const boxWidth = Math.min(120, width - 2), boxMargin = Math.floor((width - boxWidth) / 2), marginStr = " ".repeat(boxMargin), sessionDuration = elapsed + remaining, sessionPercent = elapsed / sessionDuration * 100, sessionRightText = `${sessionPercent.toFixed(1).padStart(6)}%`, tokenPercent = config.tokenLimit != null && config.tokenLimit > 0 ? totalTokens / config.tokenLimit * 100 : 0, usageRightText = config.tokenLimit != null && config.tokenLimit > 0 ? `${tokenPercent.toFixed(1).padStart(6)}% (${formatTokensShort(totalTokens)}/${formatTokensShort(config.tokenLimit)})` : `(${formatTokensShort(totalTokens)} tokens)`, projection = projectBlockUsage(block), projectedPercent = projection != null && config.tokenLimit != null && config.tokenLimit > 0 ? projection.totalTokens / config.tokenLimit * 100 : 0, projectionRightText = projection != null ? config.tokenLimit != null && config.tokenLimit > 0 ? `${projectedPercent.toFixed(1).padStart(6)}% (${formatTokensShort(projection.totalTokens)}/${formatTokensShort(config.tokenLimit)})` : `(${formatTokensShort(projection.totalTokens)} tokens)` : "", maxRightTextWidth = Math.max(stringWidth(sessionRightText), stringWidth(usageRightText), projection != null ? stringWidth(projectionRightText) : 0), labelWidth = 14, spacing = 4, boxPadding = 4, barWidth = boxWidth - labelWidth - maxRightTextWidth - spacing - boxPadding, sessionProgressBar = createProgressBar(elapsed, sessionDuration, barWidth, {
 		showPercentage: false,
-		fillChar: import_picocolors$7.default.cyan("█"),
-		emptyChar: import_picocolors$7.default.gray("░"),
+		fillChar: import_picocolors$4.default.cyan("█"),
+		emptyChar: import_picocolors$4.default.gray("░"),
 		leftBracket: "[",
 		rightBracket: "]"
 	}), startTime = block.startTime.toLocaleTimeString(void 0, {
@@ -3041,10 +3111,10 @@ function renderLiveDisplay(terminal, block, config) {
 		second: "2-digit",
 		hour12: true
 	}), detailsIndent = 3, detailsSpacing = 2, detailsAvailableWidth = boxWidth - 3 - detailsIndent;
-	terminal.write(`${marginStr}┌${"─".repeat(boxWidth - 2)}┐\n`), terminal.write(`${marginStr}│${import_picocolors$7.default.bold(centerText("CLAUDE CODE - LIVE TOKEN USAGE MONITOR", boxWidth - 2))}│\n`), terminal.write(`${marginStr}├${"─".repeat(boxWidth - 2)}┤\n`), terminal.write(`${marginStr}│${" ".repeat(boxWidth - 2)}│\n`);
-	const sessionLabel = `${drawEmoji("⏱️")}${import_picocolors$7.default.bold(" SESSION")}`, sessionLabelWidth = stringWidth(sessionLabel), sessionBarStr = `${sessionLabel}${"".padEnd(Math.max(0, labelWidth - sessionLabelWidth))} ${sessionProgressBar} ${sessionRightText}`, sessionBarPadded = sessionBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(sessionBarStr)));
+	terminal.write(`${marginStr}┌${"─".repeat(boxWidth - 2)}┐\n`), terminal.write(`${marginStr}│${import_picocolors$4.default.bold(centerText("CLAUDE CODE - LIVE TOKEN USAGE MONITOR", boxWidth - 2))}│\n`), terminal.write(`${marginStr}├${"─".repeat(boxWidth - 2)}┤\n`), terminal.write(`${marginStr}│${" ".repeat(boxWidth - 2)}│\n`);
+	const sessionLabel = `${drawEmoji("⏱️")}${import_picocolors$4.default.bold(" SESSION")}`, sessionLabelWidth = stringWidth(sessionLabel), sessionBarStr = `${sessionLabel}${"".padEnd(Math.max(0, labelWidth - sessionLabelWidth))} ${sessionProgressBar} ${sessionRightText}`, sessionBarPadded = sessionBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(sessionBarStr)));
 	terminal.write(`${marginStr}│ ${sessionBarPadded}│\n`);
-	const sessionCol1 = `${import_picocolors$7.default.gray("Started:")} ${startTime}`, sessionCol2 = `${import_picocolors$7.default.gray("Elapsed:")} ${prettyMilliseconds(elapsed * 60 * 1e3, { compact: true })}`, sessionCol3 = `${import_picocolors$7.default.gray("Remaining:")} ${prettyMilliseconds(remaining * 60 * 1e3, { compact: true })} (${endTime})`;
+	const sessionCol1 = `${import_picocolors$4.default.gray("Started:")} ${startTime}`, sessionCol2 = `${import_picocolors$4.default.gray("Elapsed:")} ${prettyMilliseconds(elapsed * 60 * 1e3, { compact: true })}`, sessionCol3 = `${import_picocolors$4.default.gray("Remaining:")} ${prettyMilliseconds(remaining * 60 * 1e3, { compact: true })} (${endTime})`;
 	let sessionDetails = `${" ".repeat(detailsIndent)}${sessionCol1}${" ".repeat(detailsSpacing)}${sessionCol2}${" ".repeat(detailsSpacing)}${sessionCol3}`;
 	const sessionDetailsWidth = stringWidth(sessionCol1) + stringWidth(sessionCol2) + stringWidth(sessionCol3) + detailsSpacing * 2;
 	if (sessionDetailsWidth > detailsAvailableWidth) sessionDetails = `${" ".repeat(detailsIndent)}${sessionCol1}${" ".repeat(detailsSpacing)}${sessionCol3}`;
@@ -3055,33 +3125,33 @@ function renderLiveDisplay(terminal, block, config) {
 			hour: "2-digit",
 			minute: "2-digit",
 			hour12: true
-		}) ?? null, usageLimitResetTime = resetTime !== null ? import_picocolors$7.default.red(`${drawEmoji("❌")} USAGE LIMIT. RESET AT ${resetTime}`) : "";
+		}) ?? null, usageLimitResetTime = resetTime !== null ? import_picocolors$4.default.red(`${drawEmoji("❌")} USAGE LIMIT. RESET AT ${resetTime}`) : "";
 		usageLimitResetTimePadded = resetTime !== null ? usageLimitResetTime + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(usageLimitResetTime))) : null;
 	}
 	if (terminal.write(`${marginStr}│ ${sessionDetailsPadded}│\n`), usageLimitResetTimePadded !== null) terminal.write(`${marginStr}│ ${usageLimitResetTimePadded}│\n`);
 	terminal.write(`${marginStr}│${" ".repeat(boxWidth - 2)}│\n`), terminal.write(`${marginStr}├${"─".repeat(boxWidth - 2)}┤\n`), terminal.write(`${marginStr}│${" ".repeat(boxWidth - 2)}│\n`);
-	let barColor = import_picocolors$7.default.green;
-	if (tokenPercent > 100) barColor = import_picocolors$7.default.red;
-	else if (tokenPercent > 80) barColor = import_picocolors$7.default.yellow;
+	let barColor = import_picocolors$4.default.green;
+	if (tokenPercent > 100) barColor = import_picocolors$4.default.red;
+	else if (tokenPercent > 80) barColor = import_picocolors$4.default.yellow;
 	const usageBar = config.tokenLimit != null && config.tokenLimit > 0 ? createProgressBar(totalTokens, config.tokenLimit, barWidth, {
 		showPercentage: false,
 		fillChar: barColor("█"),
-		emptyChar: import_picocolors$7.default.gray("░"),
+		emptyChar: import_picocolors$4.default.gray("░"),
 		leftBracket: "[",
 		rightBracket: "]"
-	}) : `[${import_picocolors$7.default.green("█".repeat(Math.floor(barWidth * .1)))}${import_picocolors$7.default.gray("░".repeat(barWidth - Math.floor(barWidth * .1)))}]`, burnRate = calculateBurnRate(block), rateIndicator = getRateIndicator(burnRate), buildRateDisplay = (useShort) => {
-		if (burnRate == null) return `${import_picocolors$7.default.bold("Burn Rate:")} N/A`;
+	}) : `[${import_picocolors$4.default.green("█".repeat(Math.floor(barWidth * .1)))}${import_picocolors$4.default.gray("░".repeat(barWidth - Math.floor(barWidth * .1)))}]`, burnRate = calculateBurnRate(block), rateIndicator = getRateIndicator(burnRate), buildRateDisplay = (useShort) => {
+		if (burnRate == null) return `${import_picocolors$4.default.bold("Burn Rate:")} N/A`;
 		const rateValue = Math.round(burnRate.tokensPerMinute), formattedRate = useShort ? formatTokensShort(rateValue) : formatNumber(rateValue);
-		return `${import_picocolors$7.default.bold("Burn Rate:")} ${formattedRate} token/min ${rateIndicator}`;
-	}, usageLabel = `${drawEmoji("🔥")}${import_picocolors$7.default.bold(" USAGE")}`, usageLabelWidth = stringWidth(usageLabel), usageBarStr = `${usageLabel}${"".padEnd(Math.max(0, labelWidth - usageLabelWidth))} ${usageBar} ${usageRightText}`;
-	let rateDisplay = buildRateDisplay(false), usageCol1 = `${import_picocolors$7.default.gray("Tokens:")} ${formatTokenDisplay(totalTokens, false)} (${rateDisplay})`, usageCol2 = config.tokenLimit != null && config.tokenLimit > 0 ? `${import_picocolors$7.default.gray("Limit:")} ${formatTokenDisplay(config.tokenLimit, false)} tokens` : "";
-	const usageCol3 = `${import_picocolors$7.default.gray("Cost:")} ${formatCurrency(block.costUSD)}`;
+		return `${import_picocolors$4.default.bold("Burn Rate:")} ${formattedRate} token/min ${rateIndicator}`;
+	}, usageLabel = `${drawEmoji("🔥")}${import_picocolors$4.default.bold(" USAGE")}`, usageLabelWidth = stringWidth(usageLabel), usageBarStr = `${usageLabel}${"".padEnd(Math.max(0, labelWidth - usageLabelWidth))} ${usageBar} ${usageRightText}`;
+	let rateDisplay = buildRateDisplay(false), usageCol1 = `${import_picocolors$4.default.gray("Tokens:")} ${formatTokenDisplay(totalTokens, false)} (${rateDisplay})`, usageCol2 = config.tokenLimit != null && config.tokenLimit > 0 ? `${import_picocolors$4.default.gray("Limit:")} ${formatTokenDisplay(config.tokenLimit, false)} tokens` : "";
+	const usageCol3 = `${import_picocolors$4.default.gray("Cost:")} ${formatCurrency(block.costUSD)}`;
 	let totalWidth = stringWidth(usageCol1);
 	if (usageCol2.length > 0) totalWidth += detailsSpacing + stringWidth(usageCol2);
 	totalWidth += detailsSpacing + stringWidth(usageCol3);
 	let useTwoLineLayout = false;
 	if (totalWidth > detailsAvailableWidth) {
-		if (useTwoLineLayout = true, rateDisplay = buildRateDisplay(true), usageCol1 = `${import_picocolors$7.default.gray("Tokens:")} ${formatTokenDisplay(totalTokens, true)} (${rateDisplay})`, usageCol2.length > 0) usageCol2 = `${import_picocolors$7.default.gray("Limit:")} ${formatTokenDisplay(config.tokenLimit, true)} tokens`;
+		if (useTwoLineLayout = true, rateDisplay = buildRateDisplay(true), usageCol1 = `${import_picocolors$4.default.gray("Tokens:")} ${formatTokenDisplay(totalTokens, true)} (${rateDisplay})`, usageCol2.length > 0) usageCol2 = `${import_picocolors$4.default.gray("Limit:")} ${formatTokenDisplay(config.tokenLimit, true)} tokens`;
 	}
 	const usageBarPadded = usageBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(usageBarStr)));
 	if (terminal.write(`${marginStr}│ ${usageBarPadded}│\n`), useTwoLineLayout) {
@@ -3100,22 +3170,22 @@ function renderLiveDisplay(terminal, block, config) {
 		terminal.write(`${marginStr}│ ${usageDetailsPadded}│\n`);
 	}
 	if (terminal.write(`${marginStr}│${" ".repeat(boxWidth - 2)}│\n`), terminal.write(`${marginStr}├${"─".repeat(boxWidth - 2)}┤\n`), terminal.write(`${marginStr}│${" ".repeat(boxWidth - 2)}│\n`), projection != null) {
-		let projBarColor = import_picocolors$7.default.green;
-		if (projectedPercent > 100) projBarColor = import_picocolors$7.default.red;
-		else if (projectedPercent > 80) projBarColor = import_picocolors$7.default.yellow;
+		let projBarColor = import_picocolors$4.default.green;
+		if (projectedPercent > 100) projBarColor = import_picocolors$4.default.red;
+		else if (projectedPercent > 80) projBarColor = import_picocolors$4.default.yellow;
 		const projectionBar = config.tokenLimit != null && config.tokenLimit > 0 ? createProgressBar(projection.totalTokens, config.tokenLimit, barWidth, {
 			showPercentage: false,
 			fillChar: projBarColor("█"),
-			emptyChar: import_picocolors$7.default.gray("░"),
+			emptyChar: import_picocolors$4.default.gray("░"),
 			leftBracket: "[",
 			rightBracket: "]"
-		}) : `[${import_picocolors$7.default.green("█".repeat(Math.floor(barWidth * .15)))}${import_picocolors$7.default.gray("░".repeat(barWidth - Math.floor(barWidth * .15)))}]`, limitStatus = config.tokenLimit != null && config.tokenLimit > 0 ? projectedPercent > 100 ? import_picocolors$7.default.red(`${drawEmoji("❌")} WILL EXCEED LIMIT`) : projectedPercent > 80 ? import_picocolors$7.default.yellow(`${drawEmoji("⚠️")} APPROACHING LIMIT`) : import_picocolors$7.default.green(`${drawEmoji("✓")} WITHIN LIMIT`) : import_picocolors$7.default.green(`${drawEmoji("✓")} ON TRACK`), projLabel = `${drawEmoji("📈")}${import_picocolors$7.default.bold(" PROJECTION")}`, projLabelWidth = stringWidth(projLabel), projBarStr = `${projLabel}${"".padEnd(Math.max(0, labelWidth - projLabelWidth))} ${projectionBar} ${projectionRightText}`, projBarPadded = projBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(projBarStr)));
+		}) : `[${import_picocolors$4.default.green("█".repeat(Math.floor(barWidth * .15)))}${import_picocolors$4.default.gray("░".repeat(barWidth - Math.floor(barWidth * .15)))}]`, limitStatus = config.tokenLimit != null && config.tokenLimit > 0 ? projectedPercent > 100 ? import_picocolors$4.default.red(`${drawEmoji("❌")} WILL EXCEED LIMIT`) : projectedPercent > 80 ? import_picocolors$4.default.yellow(`${drawEmoji("⚠️")} APPROACHING LIMIT`) : import_picocolors$4.default.green(`${drawEmoji("✓")} WITHIN LIMIT`) : import_picocolors$4.default.green(`${drawEmoji("✓")} ON TRACK`), projLabel = `${drawEmoji("📈")}${import_picocolors$4.default.bold(" PROJECTION")}`, projLabelWidth = stringWidth(projLabel), projBarStr = `${projLabel}${"".padEnd(Math.max(0, labelWidth - projLabelWidth))} ${projectionBar} ${projectionRightText}`, projBarPadded = projBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(projBarStr)));
 		terminal.write(`${marginStr}│ ${projBarPadded}│\n`);
-		const projCol1 = `${import_picocolors$7.default.gray("Status:")} ${limitStatus}`;
-		let projCol2 = `${import_picocolors$7.default.gray("Tokens:")} ${formatTokenDisplay(projection.totalTokens, false)}`;
-		const projCol3 = `${import_picocolors$7.default.gray("Cost:")} ${formatCurrency(projection.totalCost)}`, projTotalWidth = stringWidth(projCol1) + stringWidth(projCol2) + stringWidth(projCol3) + detailsSpacing * 2;
+		const projCol1 = `${import_picocolors$4.default.gray("Status:")} ${limitStatus}`;
+		let projCol2 = `${import_picocolors$4.default.gray("Tokens:")} ${formatTokenDisplay(projection.totalTokens, false)}`;
+		const projCol3 = `${import_picocolors$4.default.gray("Cost:")} ${formatCurrency(projection.totalCost)}`, projTotalWidth = stringWidth(projCol1) + stringWidth(projCol2) + stringWidth(projCol3) + detailsSpacing * 2;
 		let projUseTwoLineLayout = false;
-		if (projTotalWidth > detailsAvailableWidth) projUseTwoLineLayout = true, projCol2 = `${import_picocolors$7.default.gray("Tokens:")} ${formatTokenDisplay(projection.totalTokens, true)}`;
+		if (projTotalWidth > detailsAvailableWidth) projUseTwoLineLayout = true, projCol2 = `${import_picocolors$4.default.gray("Tokens:")} ${formatTokenDisplay(projection.totalTokens, true)}`;
 		if (projUseTwoLineLayout) {
 			const projDetailsLine1 = `${" ".repeat(detailsIndent)}${projCol1}`, projDetailsLine1Padded = projDetailsLine1 + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(projDetailsLine1)));
 			terminal.write(`${marginStr}│ ${projDetailsLine1Padded}│\n`);
@@ -3134,22 +3204,22 @@ function renderLiveDisplay(terminal, block, config) {
 	}
 	terminal.write(`${marginStr}├${"─".repeat(boxWidth - 2)}┤\n`);
 	const refreshText = `${drawEmoji("↻")} Refreshing every ${config.refreshInterval / 1e3}s  •  Press Ctrl+C to stop`;
-	terminal.write(`${marginStr}│${import_picocolors$7.default.gray(centerText(refreshText, boxWidth - 2))}│\n`), terminal.write(`${marginStr}└${"─".repeat(boxWidth - 2)}┘\n`);
+	terminal.write(`${marginStr}│${import_picocolors$4.default.gray(centerText(refreshText, boxWidth - 2))}│\n`), terminal.write(`${marginStr}└${"─".repeat(boxWidth - 2)}┘\n`);
 }
 function renderCompactLiveDisplay(terminal, block, config, totalTokens, elapsed, remaining) {
 	const width = terminal.width;
-	terminal.write(`${import_picocolors$7.default.bold(centerText("LIVE MONITOR", width))}\n`), terminal.write(`${"─".repeat(width)}\n`);
+	terminal.write(`${import_picocolors$4.default.bold(centerText("LIVE MONITOR", width))}\n`), terminal.write(`${"─".repeat(width)}\n`);
 	const sessionPercent = elapsed / (elapsed + remaining) * 100;
 	if (terminal.write(`Session: ${sessionPercent.toFixed(1)}% (${Math.floor(elapsed / 60)}h ${Math.floor(elapsed % 60)}m)\n`), config.tokenLimit != null && config.tokenLimit > 0) {
-		const tokenPercent = totalTokens / config.tokenLimit * 100, status = tokenPercent > 100 ? import_picocolors$7.default.red("OVER") : tokenPercent > 80 ? import_picocolors$7.default.yellow("WARN") : import_picocolors$7.default.green("OK");
+		const tokenPercent = totalTokens / config.tokenLimit * 100, status = tokenPercent > 100 ? import_picocolors$4.default.red("OVER") : tokenPercent > 80 ? import_picocolors$4.default.yellow("WARN") : import_picocolors$4.default.green("OK");
 		terminal.write(`Tokens: ${formatNumber(totalTokens)}/${formatNumber(config.tokenLimit)} ${status}\n`);
 	} else terminal.write(`Tokens: ${formatNumber(totalTokens)}\n`);
 	terminal.write(`Cost: ${formatCurrency(block.costUSD)}\n`);
 	const burnRate = calculateBurnRate(block);
 	if (burnRate != null) terminal.write(`Rate: ${formatNumber(burnRate.tokensPerMinute)}/min\n`);
-	terminal.write(`${"─".repeat(width)}\n`), terminal.write(import_picocolors$7.default.gray(`Refresh: ${config.refreshInterval / 1e3}s | Ctrl+C: stop\n`));
+	terminal.write(`${"─".repeat(width)}\n`), terminal.write(import_picocolors$4.default.gray(`Refresh: ${config.refreshInterval / 1e3}s | Ctrl+C: stop\n`));
 }
-var import_picocolors$6 = /* @__PURE__ */ __toESM(require_picocolors(), 1), import_usingCtx$1 = /* @__PURE__ */ __toESM(require_usingCtx(), 1);
+var import_picocolors$3 = /* @__PURE__ */ __toESM(require_picocolors(), 1), import_usingCtx$1 = /* @__PURE__ */ __toESM(require_usingCtx(), 1);
 async function startLiveMonitoring(config) {
 	try {
 		var _usingCtx = (0, import_usingCtx$1.default)();
@@ -3194,15 +3264,15 @@ async function startLiveMonitoring(config) {
 			const error = monitoringResult.error;
 			if ((error instanceof DOMException || error instanceof Error) && error.name === "AbortError") return;
 			const errorMessage = error instanceof Error ? error.message : String(error);
-			terminal.startBuffering(), terminal.clearScreen(), terminal.write(import_picocolors$6.default.red(`Error: ${errorMessage}\n`)), terminal.flush(), logger.error(`Live monitoring error: ${errorMessage}`), await delayWithAbort(config.refreshInterval, abortController.signal).catch(() => {});
+			terminal.startBuffering(), terminal.clearScreen(), terminal.write(import_picocolors$3.default.red(`Error: ${errorMessage}\n`)), terminal.flush(), logger.error(`Live monitoring error: ${errorMessage}`), await delayWithAbort(config.refreshInterval, abortController.signal).catch(() => {});
 		}
-	} catch (_) {
-		_usingCtx.e = _;
+	} catch (_$1) {
+		_usingCtx.e = _$1;
 	} finally {
 		_usingCtx.d();
 	}
 }
-var import_picocolors$5 = /* @__PURE__ */ __toESM(require_picocolors(), 1);
+var import_picocolors$2 = /* @__PURE__ */ __toESM(require_picocolors(), 1);
 function formatBlockTime(block, compact = false, locale) {
 	const start = compact ? block.startTime.toLocaleString(locale, {
 		month: "2-digit",
@@ -3371,13 +3441,13 @@ const blocksCommand = define({
 			const burnRate = calculateBurnRate(block), projection = projectBlockUsage(block);
 			logger.box("Current Session Block Status");
 			const now = /* @__PURE__ */ new Date(), elapsed = Math.round((now.getTime() - block.startTime.getTime()) / (1e3 * 60)), remaining = Math.round((block.endTime.getTime() - now.getTime()) / (1e3 * 60));
-			if (log(`Block Started: ${import_picocolors$5.default.cyan(block.startTime.toLocaleString())} (${import_picocolors$5.default.yellow(`${Math.floor(elapsed / 60)}h ${elapsed % 60}m`)} ago)`), log(`Time Remaining: ${import_picocolors$5.default.green(`${Math.floor(remaining / 60)}h ${remaining % 60}m`)}\n`), log(import_picocolors$5.default.bold("Current Usage:")), log(`  Input Tokens:     ${formatNumber(block.tokenCounts.inputTokens)}`), log(`  Output Tokens:    ${formatNumber(block.tokenCounts.outputTokens)}`), log(`  Total Cost:       ${formatCurrency(block.costUSD)}\n`), burnRate != null) log(import_picocolors$5.default.bold("Burn Rate:")), log(`  Tokens/minute:    ${formatNumber(burnRate.tokensPerMinute)}`), log(`  Cost/hour:        ${formatCurrency(burnRate.costPerHour)}\n`);
+			if (log(`Block Started: ${import_picocolors$2.default.cyan(block.startTime.toLocaleString())} (${import_picocolors$2.default.yellow(`${Math.floor(elapsed / 60)}h ${elapsed % 60}m`)} ago)`), log(`Time Remaining: ${import_picocolors$2.default.green(`${Math.floor(remaining / 60)}h ${remaining % 60}m`)}\n`), log(import_picocolors$2.default.bold("Current Usage:")), log(`  Input Tokens:     ${formatNumber(block.tokenCounts.inputTokens)}`), log(`  Output Tokens:    ${formatNumber(block.tokenCounts.outputTokens)}`), log(`  Total Cost:       ${formatCurrency(block.costUSD)}\n`), burnRate != null) log(import_picocolors$2.default.bold("Burn Rate:")), log(`  Tokens/minute:    ${formatNumber(burnRate.tokensPerMinute)}`), log(`  Cost/hour:        ${formatCurrency(burnRate.costPerHour)}\n`);
 			if (projection != null) {
-				if (log(import_picocolors$5.default.bold("Projected Usage (if current rate continues):")), log(`  Total Tokens:     ${formatNumber(projection.totalTokens)}`), log(`  Total Cost:       ${formatCurrency(projection.totalCost)}\n`), ctx.values.tokenLimit != null) {
+				if (log(import_picocolors$2.default.bold("Projected Usage (if current rate continues):")), log(`  Total Tokens:     ${formatNumber(projection.totalTokens)}`), log(`  Total Cost:       ${formatCurrency(projection.totalCost)}\n`), ctx.values.tokenLimit != null) {
 					const limit = parseTokenLimit(ctx.values.tokenLimit, maxTokensFromAll);
 					if (limit != null && limit > 0) {
-						const currentTokens = getTotalTokens(block.tokenCounts), remainingTokens = Math.max(0, limit - currentTokens), percentUsed = projection.totalTokens / limit * 100, status = percentUsed > 100 ? import_picocolors$5.default.red("EXCEEDS LIMIT") : percentUsed > BLOCKS_WARNING_THRESHOLD * 100 ? import_picocolors$5.default.yellow("WARNING") : import_picocolors$5.default.green("OK");
-						log(import_picocolors$5.default.bold("Token Limit Status:")), log(`  Limit:            ${formatNumber(limit)} tokens`), log(`  Current Usage:    ${formatNumber(currentTokens)} (${(currentTokens / limit * 100).toFixed(1)}%)`), log(`  Remaining:        ${formatNumber(remainingTokens)} tokens`), log(`  Projected Usage:  ${percentUsed.toFixed(1)}% ${status}`);
+						const currentTokens = getTotalTokens(block.tokenCounts), remainingTokens = Math.max(0, limit - currentTokens), percentUsed = projection.totalTokens / limit * 100, status = percentUsed > 100 ? import_picocolors$2.default.red("EXCEEDS LIMIT") : percentUsed > BLOCKS_WARNING_THRESHOLD * 100 ? import_picocolors$2.default.yellow("WARNING") : import_picocolors$2.default.green("OK");
+						log(import_picocolors$2.default.bold("Token Limit Status:")), log(`  Limit:            ${formatNumber(limit)} tokens`), log(`  Current Usage:    ${formatNumber(currentTokens)} (${(currentTokens / limit * 100).toFixed(1)}%)`), log(`  Remaining:        ${formatNumber(remainingTokens)} tokens`), log(`  Projected Usage:  ${percentUsed.toFixed(1)}% ${status}`);
 					}
 				}
 			}
@@ -3403,15 +3473,15 @@ const blocksCommand = define({
 			}), terminalWidth = process$1.stdout.columns || BLOCKS_DEFAULT_TERMINAL_WIDTH, isNarrowTerminal = terminalWidth < BLOCKS_COMPACT_WIDTH_THRESHOLD, useCompactFormat = ctx.values.compact || isNarrowTerminal;
 			for (const block of blocks) if (block.isGap ?? false) {
 				const gapRow = [
-					import_picocolors$5.default.gray(formatBlockTime(block, useCompactFormat, ctx.values.locale)),
-					import_picocolors$5.default.gray("(inactive)"),
-					import_picocolors$5.default.gray("-"),
-					import_picocolors$5.default.gray("-")
+					import_picocolors$2.default.gray(formatBlockTime(block, useCompactFormat, ctx.values.locale)),
+					import_picocolors$2.default.gray("(inactive)"),
+					import_picocolors$2.default.gray("-"),
+					import_picocolors$2.default.gray("-")
 				];
-				if (actualTokenLimit != null && actualTokenLimit > 0) gapRow.push(import_picocolors$5.default.gray("-"));
-				gapRow.push(import_picocolors$5.default.gray("-")), table.push(gapRow);
+				if (actualTokenLimit != null && actualTokenLimit > 0) gapRow.push(import_picocolors$2.default.gray("-"));
+				gapRow.push(import_picocolors$2.default.gray("-")), table.push(gapRow);
 			} else {
-				const totalTokens = getTotalTokens(block.tokenCounts), status = block.isActive ? import_picocolors$5.default.green("ACTIVE") : "", row = [
+				const totalTokens = getTotalTokens(block.tokenCounts), status = block.isActive ? import_picocolors$2.default.green("ACTIVE") : "", row = [
 					formatBlockTime(block, useCompactFormat, ctx.values.locale),
 					status,
 					formatModels(block.models),
@@ -3419,16 +3489,16 @@ const blocksCommand = define({
 				];
 				if (actualTokenLimit != null && actualTokenLimit > 0) {
 					const percentage = totalTokens / actualTokenLimit * 100, percentText = `${percentage.toFixed(1)}%`;
-					row.push(percentage > 100 ? import_picocolors$5.default.red(percentText) : percentText);
+					row.push(percentage > 100 ? import_picocolors$2.default.red(percentText) : percentText);
 				}
 				if (row.push(formatCurrency(block.costUSD)), table.push(row), block.isActive) {
 					if (actualTokenLimit != null && actualTokenLimit > 0) {
-						const currentTokens = getTotalTokens(block.tokenCounts), remainingTokens = Math.max(0, actualTokenLimit - currentTokens), remainingText = remainingTokens > 0 ? formatNumber(remainingTokens) : import_picocolors$5.default.red("0"), remainingPercent = (actualTokenLimit - currentTokens) / actualTokenLimit * 100, remainingPercentText = remainingPercent > 0 ? `${remainingPercent.toFixed(1)}%` : import_picocolors$5.default.red("0.0%"), remainingRow = [
+						const currentTokens = getTotalTokens(block.tokenCounts), remainingTokens = Math.max(0, actualTokenLimit - currentTokens), remainingText = remainingTokens > 0 ? formatNumber(remainingTokens) : import_picocolors$2.default.red("0"), remainingPercent = (actualTokenLimit - currentTokens) / actualTokenLimit * 100, remainingPercentText = remainingPercent > 0 ? `${remainingPercent.toFixed(1)}%` : import_picocolors$2.default.red("0.0%"), remainingRow = [
 							{
-								content: import_picocolors$5.default.gray(`(assuming ${formatNumber(actualTokenLimit)} token limit)`),
+								content: import_picocolors$2.default.gray(`(assuming ${formatNumber(actualTokenLimit)} token limit)`),
 								hAlign: "right"
 							},
-							import_picocolors$5.default.blue("REMAINING"),
+							import_picocolors$2.default.blue("REMAINING"),
 							"",
 							remainingText,
 							remainingPercentText,
@@ -3438,12 +3508,12 @@ const blocksCommand = define({
 					}
 					const projection = projectBlockUsage(block);
 					if (projection != null) {
-						const projectedTokens = formatNumber(projection.totalTokens), projectedText = actualTokenLimit != null && actualTokenLimit > 0 && projection.totalTokens > actualTokenLimit ? import_picocolors$5.default.red(projectedTokens) : projectedTokens, projectedRow = [
+						const projectedTokens = formatNumber(projection.totalTokens), projectedText = actualTokenLimit != null && actualTokenLimit > 0 && projection.totalTokens > actualTokenLimit ? import_picocolors$2.default.red(projectedTokens) : projectedTokens, projectedRow = [
 							{
-								content: import_picocolors$5.default.gray("(assuming current burn rate)"),
+								content: import_picocolors$2.default.gray("(assuming current burn rate)"),
 								hAlign: "right"
 							},
-							import_picocolors$5.default.yellow("PROJECTED"),
+							import_picocolors$2.default.yellow("PROJECTED"),
 							"",
 							projectedText
 						];
@@ -3522,7 +3592,7 @@ function formatProjectName(projectName, aliases) {
 	const parsed = parseProjectName(projectName);
 	return aliases != null && aliases.has(parsed) ? aliases.get(parsed) : parsed;
 }
-var import_picocolors$4 = /* @__PURE__ */ __toESM(require_picocolors(), 1);
+var import_picocolors$1 = /* @__PURE__ */ __toESM(require_picocolors(), 1);
 const dailyCommand = define({
 	name: "daily",
 	description: "Show usage report grouped by date",
@@ -3599,46 +3669,11 @@ const dailyCommand = define({
 			} else log(JSON.stringify(jsonOutput, null, 2));
 		} else {
 			logger.box("Claude Code Token Usage Report - Daily");
-			const table = new ResponsiveTable({
-				head: [
-					"Date",
-					"Models",
-					"Input",
-					"Output",
-					"Cache Create",
-					"Cache Read",
-					"Total Tokens",
-					"Cost (USD)"
-				],
-				style: { head: ["cyan"] },
-				colAligns: [
-					"left",
-					"left",
-					"right",
-					"right",
-					"right",
-					"right",
-					"right",
-					"right"
-				],
+			const tableConfig = {
+				firstColumnName: "Date",
 				dateFormatter: (dateStr) => formatDateCompact(dateStr, mergedOptions.timezone, mergedOptions.locale ?? void 0),
-				compactHead: [
-					"Date",
-					"Models",
-					"Input",
-					"Output",
-					"Cost (USD)"
-				],
-				compactColAligns: [
-					"left",
-					"left",
-					"right",
-					"right",
-					"right"
-				],
-				compactThreshold: 100,
 				forceCompact: ctx.values.compact
-			});
+			}, table = createUsageReportTable(tableConfig);
 			if (Boolean(mergedOptions.instances) && dailyData.some((d) => d.project != null)) {
 				const projectGroups = groupDataByProject(dailyData);
 				let isFirstProject = true;
@@ -3654,7 +3689,7 @@ const dailyCommand = define({
 						""
 					]);
 					table.push([
-						import_picocolors$4.default.cyan(`Project: ${formatProjectName(projectName, projectAliases)}`),
+						import_picocolors$1.default.cyan(`Project: ${formatProjectName(projectName, projectAliases)}`),
 						"",
 						"",
 						"",
@@ -3663,47 +3698,39 @@ const dailyCommand = define({
 						"",
 						""
 					]);
-					for (const data of projectData) if (table.push([
-						data.date,
-						formatModelsDisplayMultiline(data.modelsUsed),
-						formatNumber(data.inputTokens),
-						formatNumber(data.outputTokens),
-						formatNumber(data.cacheCreationTokens),
-						formatNumber(data.cacheReadTokens),
-						formatNumber(getTotalTokens(data)),
-						formatCurrency(data.totalCost)
-					]), mergedOptions.breakdown) pushBreakdownRows(table, data.modelBreakdowns);
+					for (const data of projectData) {
+						const row = formatUsageDataRow(data.date, {
+							inputTokens: data.inputTokens,
+							outputTokens: data.outputTokens,
+							cacheCreationTokens: data.cacheCreationTokens,
+							cacheReadTokens: data.cacheReadTokens,
+							totalCost: data.totalCost,
+							modelsUsed: data.modelsUsed
+						});
+						if (table.push(row), mergedOptions.breakdown) pushBreakdownRows(table, data.modelBreakdowns);
+					}
 					isFirstProject = false;
 				}
-			} else for (const data of dailyData) if (table.push([
-				data.date,
-				formatModelsDisplayMultiline(data.modelsUsed),
-				formatNumber(data.inputTokens),
-				formatNumber(data.outputTokens),
-				formatNumber(data.cacheCreationTokens),
-				formatNumber(data.cacheReadTokens),
-				formatNumber(getTotalTokens(data)),
-				formatCurrency(data.totalCost)
-			]), mergedOptions.breakdown) pushBreakdownRows(table, data.modelBreakdowns);
-			if (table.push([
-				"",
-				"",
-				"",
-				"",
-				"",
-				"",
-				"",
-				""
-			]), table.push([
-				import_picocolors$4.default.yellow("Total"),
-				"",
-				import_picocolors$4.default.yellow(formatNumber(totals.inputTokens)),
-				import_picocolors$4.default.yellow(formatNumber(totals.outputTokens)),
-				import_picocolors$4.default.yellow(formatNumber(totals.cacheCreationTokens)),
-				import_picocolors$4.default.yellow(formatNumber(totals.cacheReadTokens)),
-				import_picocolors$4.default.yellow(formatNumber(getTotalTokens(totals))),
-				import_picocolors$4.default.yellow(formatCurrency(totals.totalCost))
-			]), log(table.toString()), table.isCompactMode()) logger.info("\nRunning in Compact Mode"), logger.info("Expand terminal width to see cache metrics and total tokens");
+			} else for (const data of dailyData) {
+				const row = formatUsageDataRow(data.date, {
+					inputTokens: data.inputTokens,
+					outputTokens: data.outputTokens,
+					cacheCreationTokens: data.cacheCreationTokens,
+					cacheReadTokens: data.cacheReadTokens,
+					totalCost: data.totalCost,
+					modelsUsed: data.modelsUsed
+				});
+				if (table.push(row), mergedOptions.breakdown) pushBreakdownRows(table, data.modelBreakdowns);
+			}
+			addEmptySeparatorRow(table, 8);
+			const totalsRow = formatTotalsRow({
+				inputTokens: totals.inputTokens,
+				outputTokens: totals.outputTokens,
+				cacheCreationTokens: totals.cacheCreationTokens,
+				cacheReadTokens: totals.cacheReadTokens,
+				totalCost: totals.totalCost
+			});
+			if (table.push(totalsRow), log(table.toString()), table.isCompactMode()) logger.info("\nRunning in Compact Mode"), logger.info("Expand terminal width to see cache metrics and total tokens");
 		}
 	}
 });
@@ -4089,9 +4116,7 @@ const mcpCommand = define({
 			}), logger.info(`MCP server is running on http://localhost:${port}`);
 		}
 	}
-});
-var import_picocolors$3 = /* @__PURE__ */ __toESM(require_picocolors(), 1);
-const monthlyCommand = define({
+}), monthlyCommand = define({
 	name: "monthly",
 	description: "Show usage report grouped by month",
 	...sharedCommandConfig,
@@ -4143,75 +4168,31 @@ const monthlyCommand = define({
 			} else log(JSON.stringify(jsonOutput, null, 2));
 		} else {
 			logger.box("Claude Code Token Usage Report - Monthly");
-			const table = new ResponsiveTable({
-				head: [
-					"Month",
-					"Models",
-					"Input",
-					"Output",
-					"Cache Create",
-					"Cache Read",
-					"Total Tokens",
-					"Cost (USD)"
-				],
-				style: { head: ["cyan"] },
-				colAligns: [
-					"left",
-					"left",
-					"right",
-					"right",
-					"right",
-					"right",
-					"right",
-					"right"
-				],
-				dateFormatter: (dateStr) => formatDateCompact(dateStr, mergedOptions.timezone, mergedOptions.locale ?? "en-CA"),
-				compactHead: [
-					"Month",
-					"Models",
-					"Input",
-					"Output",
-					"Cost (USD)"
-				],
-				compactColAligns: [
-					"left",
-					"left",
-					"right",
-					"right",
-					"right"
-				],
-				compactThreshold: 100,
+			const tableConfig = {
+				firstColumnName: "Month",
+				dateFormatter: (dateStr) => formatDateCompact(dateStr, mergedOptions.timezone, mergedOptions.locale ?? DEFAULT_LOCALE),
 				forceCompact: ctx.values.compact
+			}, table = createUsageReportTable(tableConfig);
+			for (const data of monthlyData) {
+				const row = formatUsageDataRow(data.month, {
+					inputTokens: data.inputTokens,
+					outputTokens: data.outputTokens,
+					cacheCreationTokens: data.cacheCreationTokens,
+					cacheReadTokens: data.cacheReadTokens,
+					totalCost: data.totalCost,
+					modelsUsed: data.modelsUsed
+				});
+				if (table.push(row), mergedOptions.breakdown) pushBreakdownRows(table, data.modelBreakdowns);
+			}
+			addEmptySeparatorRow(table, 8);
+			const totalsRow = formatTotalsRow({
+				inputTokens: totals.inputTokens,
+				outputTokens: totals.outputTokens,
+				cacheCreationTokens: totals.cacheCreationTokens,
+				cacheReadTokens: totals.cacheReadTokens,
+				totalCost: totals.totalCost
 			});
-			for (const data of monthlyData) if (table.push([
-				data.month,
-				formatModelsDisplayMultiline(data.modelsUsed),
-				formatNumber(data.inputTokens),
-				formatNumber(data.outputTokens),
-				formatNumber(data.cacheCreationTokens),
-				formatNumber(data.cacheReadTokens),
-				formatNumber(getTotalTokens(data)),
-				formatCurrency(data.totalCost)
-			]), mergedOptions.breakdown) pushBreakdownRows(table, data.modelBreakdowns);
-			if (table.push([
-				"",
-				"",
-				"",
-				"",
-				"",
-				"",
-				"",
-				""
-			]), table.push([
-				import_picocolors$3.default.yellow("Total"),
-				"",
-				import_picocolors$3.default.yellow(formatNumber(totals.inputTokens)),
-				import_picocolors$3.default.yellow(formatNumber(totals.outputTokens)),
-				import_picocolors$3.default.yellow(formatNumber(totals.cacheCreationTokens)),
-				import_picocolors$3.default.yellow(formatNumber(totals.cacheReadTokens)),
-				import_picocolors$3.default.yellow(formatNumber(getTotalTokens(totals))),
-				import_picocolors$3.default.yellow(formatCurrency(totals.totalCost))
-			]), log(table.toString()), table.isCompactMode()) logger.info("\nRunning in Compact Mode"), logger.info("Expand terminal width to see cache metrics and total tokens");
+			if (table.push(totalsRow), log(table.toString()), table.isCompactMode()) logger.info("\nRunning in Compact Mode"), logger.info("Expand terminal width to see cache metrics and total tokens");
 		}
 	}
 });
@@ -4289,13 +4270,12 @@ function calculateSessionTotalTokens(entries) {
 		return sum + usage.input_tokens + usage.output_tokens + (usage.cache_creation_input_tokens ?? 0) + (usage.cache_read_input_tokens ?? 0);
 	}, 0);
 }
-var import_picocolors$2 = /* @__PURE__ */ __toESM(require_picocolors(), 1);
-const sessionCommand = define({
+const { order: _,...sharedArgs$1 } = sharedCommandConfig.args, sessionCommand = define({
 	name: "session",
 	description: "Show usage report grouped by conversation session",
 	...sharedCommandConfig,
 	args: {
-		...sharedCommandConfig.args,
+		...sharedArgs$1,
 		id: {
 			type: "string",
 			short: "i",
@@ -4312,13 +4292,12 @@ const sessionCommand = define({
 			offline: mergedOptions.offline,
 			jq: mergedOptions.jq,
 			timezone: mergedOptions.timezone,
-			locale: mergedOptions.locale ?? "en-CA"
+			locale: mergedOptions.locale ?? DEFAULT_LOCALE
 		} }, useJson);
 		const sessionData = await loadSessionData({
 			since: ctx.values.since,
 			until: ctx.values.until,
 			mode: ctx.values.mode,
-			order: ctx.values.order,
 			offline: ctx.values.offline,
 			timezone: ctx.values.timezone,
 			locale: ctx.values.locale
@@ -4357,86 +4336,35 @@ const sessionCommand = define({
 			} else log(JSON.stringify(jsonOutput, null, 2));
 		} else {
 			logger.box("Claude Code Token Usage Report - By Session");
-			const table = new ResponsiveTable({
-				head: [
-					"Session",
-					"Models",
-					"Input",
-					"Output",
-					"Cache Create",
-					"Cache Read",
-					"Total Tokens",
-					"Cost (USD)",
-					"Last Activity"
-				],
-				style: { head: ["cyan"] },
-				colAligns: [
-					"left",
-					"left",
-					"right",
-					"right",
-					"right",
-					"right",
-					"right",
-					"right",
-					"left"
-				],
+			const tableConfig = {
+				firstColumnName: "Session",
+				includeLastActivity: true,
 				dateFormatter: (dateStr) => formatDateCompact(dateStr, ctx.values.timezone, ctx.values.locale),
-				compactHead: [
-					"Session",
-					"Models",
-					"Input",
-					"Output",
-					"Cost (USD)",
-					"Last Activity"
-				],
-				compactColAligns: [
-					"left",
-					"left",
-					"right",
-					"right",
-					"right",
-					"left"
-				],
-				compactThreshold: 100,
 				forceCompact: ctx.values.compact
-			});
+			}, table = createUsageReportTable(tableConfig);
 			let maxSessionLength = 0;
 			for (const data of sessionData) {
 				const sessionDisplay = data.sessionId.split("-").slice(-2).join("-");
-				if (maxSessionLength = Math.max(maxSessionLength, sessionDisplay.length), table.push([
-					sessionDisplay,
-					formatModelsDisplayMultiline(data.modelsUsed),
-					formatNumber(data.inputTokens),
-					formatNumber(data.outputTokens),
-					formatNumber(data.cacheCreationTokens),
-					formatNumber(data.cacheReadTokens),
-					formatNumber(getTotalTokens(data)),
-					formatCurrency(data.totalCost),
-					data.lastActivity
-				]), ctx.values.breakdown) pushBreakdownRows(table, data.modelBreakdowns, 1, 1);
+				maxSessionLength = Math.max(maxSessionLength, sessionDisplay.length);
+				const row = formatUsageDataRow(sessionDisplay, {
+					inputTokens: data.inputTokens,
+					outputTokens: data.outputTokens,
+					cacheCreationTokens: data.cacheCreationTokens,
+					cacheReadTokens: data.cacheReadTokens,
+					totalCost: data.totalCost,
+					modelsUsed: data.modelsUsed
+				}, data.lastActivity);
+				if (table.push(row), ctx.values.breakdown) pushBreakdownRows(table, data.modelBreakdowns, 1, 1);
 			}
-			if (table.push([
-				"",
-				"",
-				"",
-				"",
-				"",
-				"",
-				"",
-				"",
-				""
-			]), table.push([
-				import_picocolors$2.default.yellow("Total"),
-				"",
-				import_picocolors$2.default.yellow(formatNumber(totals.inputTokens)),
-				import_picocolors$2.default.yellow(formatNumber(totals.outputTokens)),
-				import_picocolors$2.default.yellow(formatNumber(totals.cacheCreationTokens)),
-				import_picocolors$2.default.yellow(formatNumber(totals.cacheReadTokens)),
-				import_picocolors$2.default.yellow(formatNumber(getTotalTokens(totals))),
-				import_picocolors$2.default.yellow(formatCurrency(totals.totalCost)),
-				""
-			]), log(table.toString()), table.isCompactMode()) logger.info("\nRunning in Compact Mode"), logger.info("Expand terminal width to see cache metrics and total tokens");
+			addEmptySeparatorRow(table, 9);
+			const totalsRow = formatTotalsRow({
+				inputTokens: totals.inputTokens,
+				outputTokens: totals.outputTokens,
+				cacheCreationTokens: totals.cacheCreationTokens,
+				cacheReadTokens: totals.cacheReadTokens,
+				totalCost: totals.totalCost
+			}, true);
+			if (table.push(totalsRow), log(table.toString()), table.isCompactMode()) logger.info("\nRunning in Compact Mode"), logger.info("Expand terminal width to see cache metrics and total tokens");
 		}
 	}
 });
@@ -5309,7 +5237,7 @@ getStdin.buffer = async () => {
 	for await (const chunk of stdin$1) result.push(chunk), length += chunk.length;
 	return Buffer.concat(result, length);
 };
-var import_picocolors$1 = /* @__PURE__ */ __toESM(require_picocolors(), 1), import_usingCtx = /* @__PURE__ */ __toESM(require_usingCtx(), 1);
+var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1), import_usingCtx = /* @__PURE__ */ __toESM(require_usingCtx(), 1);
 function formatRemainingTime(remaining) {
 	const remainingHours = Math.floor(remaining / 60), remainingMins = remaining % 60;
 	return remainingHours > 0 ? `${remainingHours}h ${remainingMins}m left` : `${remainingMins}m left`;
@@ -5428,8 +5356,8 @@ const visualBurnRateChoices = [
 					pid: currentPid
 				};
 			}
-		} catch (_) {
-			_usingCtx.e = _;
+		} catch (_$1) {
+			_usingCtx.e = _$1;
 		} finally {
 			_usingCtx.d();
 		}
@@ -5462,7 +5390,7 @@ const visualBurnRateChoices = [
 						const cost = await getCcusageCost();
 						return { sessionCost: cost };
 					}
-					return {};
+					return unreachable(costSource), {};
 				})(), today = /* @__PURE__ */ new Date(), todayStr = today.toISOString().split("T")[0]?.replace(/-/g, "") ?? "", todayCost = await pipe(try_({
 					try: async () => loadDailyUsageData({
 						since: todayStr,
@@ -5497,17 +5425,17 @@ const visualBurnRateChoices = [
 								normal: {
 									emoji: "🟢",
 									textValue: "Normal",
-									coloredString: import_picocolors$1.default.green
+									coloredString: import_picocolors.default.green
 								},
 								moderate: {
 									emoji: "⚠️",
 									textValue: "Moderate",
-									coloredString: import_picocolors$1.default.yellow
+									coloredString: import_picocolors.default.yellow
 								},
 								high: {
 									emoji: "🚨",
 									textValue: "High",
-									coloredString: import_picocolors$1.default.red
+									coloredString: import_picocolors.default.red
 								}
 							}, { emoji, textValue, coloredString } = burnStatusMappings[burnStatus], burnRateOutputSegments = [coloredString(costPerHourStr)];
 							if (renderEmojiStatus) burnRateOutputSegments.push(emoji);
@@ -5531,7 +5459,7 @@ const visualBurnRateChoices = [
 					catch: (error) => error
 				}), inspectError((error) => logger.debug(`Failed to calculate context tokens: ${error instanceof Error ? error.message : String(error)}`)), map((contextResult) => {
 					if (contextResult == null) return void 0;
-					const color = contextResult.percentage < ctx.values.contextLowThreshold ? import_picocolors$1.default.green : contextResult.percentage < ctx.values.contextMediumThreshold ? import_picocolors$1.default.yellow : import_picocolors$1.default.red, coloredPercentage = color(`${contextResult.percentage}%`), tokenDisplay = contextResult.inputTokens.toLocaleString();
+					const color = contextResult.percentage < ctx.values.contextLowThreshold ? import_picocolors.default.green : contextResult.percentage < ctx.values.contextMediumThreshold ? import_picocolors.default.yellow : import_picocolors.default.red, coloredPercentage = color(`${contextResult.percentage}%`), tokenDisplay = contextResult.inputTokens.toLocaleString();
 					return `${tokenDisplay} (${coloredPercentage})`;
 				}), unwrap(void 0)), modelName = hookData.model.display_name, sessionDisplay = (() => {
 					if (ccCost != null || ccusageCost != null) {
@@ -5559,8 +5487,8 @@ const visualBurnRateChoices = [
 				pid: void 0
 			};
 			return;
-		} catch (_) {
-			_usingCtx3.e = _;
+		} catch (_$1) {
+			_usingCtx3.e = _$1;
 		} finally {
 			_usingCtx3.d();
 		}
@@ -5571,15 +5499,13 @@ const visualBurnRateChoices = [
 			if (logger.error("Error in statusline command:", mainProcessingResult.error), !mergedOptions.cache) return;
 			const semaphore = _usingCtx4.u(getSemaphore(sessionId));
 			if (semaphore.data != null) semaphore.data.isUpdating = false, semaphore.data.pid = void 0;
-		} catch (_) {
-			_usingCtx4.e = _;
+		} catch (_$1) {
+			_usingCtx4.e = _$1;
 		} finally {
 			_usingCtx4.d();
 		}
 	}
-});
-var import_picocolors = /* @__PURE__ */ __toESM(require_picocolors(), 1);
-const weeklyCommand = define({
+}), weeklyCommand = define({
 	name: "weekly",
 	description: "Show usage report grouped by week",
 	args: {
@@ -5641,75 +5567,31 @@ const weeklyCommand = define({
 			} else log(JSON.stringify(jsonOutput, null, 2));
 		} else {
 			logger.box("Claude Code Token Usage Report - Weekly");
-			const table = new ResponsiveTable({
-				head: [
-					"Week",
-					"Models",
-					"Input",
-					"Output",
-					"Cache Create",
-					"Cache Read",
-					"Total Tokens",
-					"Cost (USD)"
-				],
-				style: { head: ["cyan"] },
-				colAligns: [
-					"left",
-					"left",
-					"right",
-					"right",
-					"right",
-					"right",
-					"right",
-					"right"
-				],
+			const tableConfig = {
+				firstColumnName: "Week",
 				dateFormatter: (dateStr) => formatDateCompact(dateStr, mergedOptions.timezone, mergedOptions.locale ?? void 0),
-				compactHead: [
-					"Week",
-					"Models",
-					"Input",
-					"Output",
-					"Cost (USD)"
-				],
-				compactColAligns: [
-					"left",
-					"left",
-					"right",
-					"right",
-					"right"
-				],
-				compactThreshold: 100,
 				forceCompact: ctx.values.compact
+			}, table = createUsageReportTable(tableConfig);
+			for (const data of weeklyData) {
+				const row = formatUsageDataRow(data.week, {
+					inputTokens: data.inputTokens,
+					outputTokens: data.outputTokens,
+					cacheCreationTokens: data.cacheCreationTokens,
+					cacheReadTokens: data.cacheReadTokens,
+					totalCost: data.totalCost,
+					modelsUsed: data.modelsUsed
+				});
+				if (table.push(row), mergedOptions.breakdown) pushBreakdownRows(table, data.modelBreakdowns);
+			}
+			addEmptySeparatorRow(table, 8);
+			const totalsRow = formatTotalsRow({
+				inputTokens: totals.inputTokens,
+				outputTokens: totals.outputTokens,
+				cacheCreationTokens: totals.cacheCreationTokens,
+				cacheReadTokens: totals.cacheReadTokens,
+				totalCost: totals.totalCost
 			});
-			for (const data of weeklyData) if (table.push([
-				data.week,
-				formatModelsDisplayMultiline(data.modelsUsed),
-				formatNumber(data.inputTokens),
-				formatNumber(data.outputTokens),
-				formatNumber(data.cacheCreationTokens),
-				formatNumber(data.cacheReadTokens),
-				formatNumber(getTotalTokens(data)),
-				formatCurrency(data.totalCost)
-			]), mergedOptions.breakdown) pushBreakdownRows(table, data.modelBreakdowns);
-			if (table.push([
-				"",
-				"",
-				"",
-				"",
-				"",
-				"",
-				"",
-				""
-			]), table.push([
-				import_picocolors.default.yellow("Total"),
-				"",
-				import_picocolors.default.yellow(formatNumber(totals.inputTokens)),
-				import_picocolors.default.yellow(formatNumber(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))
-			]), log(table.toString()), table.isCompactMode()) logger.info("\nRunning in Compact Mode"), logger.info("Expand terminal width to see cache metrics and total tokens");
+			if (table.push(totalsRow), log(table.toString()), table.isCompactMode()) logger.info("\nRunning in Compact Mode"), logger.info("Expand terminal width to see cache metrics and total tokens");
 		}
 	}
 }), subCommandUnion = [