ccusage 15.1.0 → 15.3.0

package/dist/index.js

@@ -1,11 +1,12 @@
 #!/usr/bin/env node
-import { BLOCKS_COMPACT_WIDTH_THRESHOLD, BLOCKS_DEFAULT_TERMINAL_WIDTH, BLOCKS_WARNING_THRESHOLD, CLAUDE_PROJECTS_DIR_NAME, DEFAULT_RECENT_DAYS, DEFAULT_REFRESH_INTERVAL_SECONDS, MAX_REFRESH_INTERVAL_SECONDS, MCP_DEFAULT_PORT, MIN_REFRESH_INTERVAL_SECONDS, PricingFetcher, USAGE_DATA_GLOB_PATTERN, __commonJSMin, __require, __toESM, require_usingCtx } from "./pricing-fetcher-Dm8hcn_h.js";
-import { CostModes, SortOrders, dateSchema } from "./_types-Cr2YEzKm.js";
-import { calculateTotals, createTotalsObject, getTotalTokens } from "./calculate-cost-CoS7we68.js";
-import { DEFAULT_SESSION_DURATION_HOURS, calculateBurnRate, calculateCostForEntry, createUniqueHash, filterRecentBlocks, formatDateCompact, getDefaultClaudePath, getEarliestTimestamp, glob, identifySessionBlocks, loadDailyUsageData, loadMonthlyUsageData, loadSessionBlockData, loadSessionData, projectBlockUsage, sortFilesByTimestamp, uniq, usageDataSchema } from "./data-loader-BeaFK_sH.js";
-import { description, log, logger, name, version } from "./logger-Cke8hliP.js";
-import { detectMismatches, printMismatchReport } from "./debug-BmJuGBXC.js";
-import { createMcpHttpApp, createMcpServer, startMcpServerStdio } from "./mcp-DKqp_F9c.js";
+import { BLOCKS_COMPACT_WIDTH_THRESHOLD, BLOCKS_DEFAULT_TERMINAL_WIDTH, BLOCKS_WARNING_THRESHOLD, 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-DaK2jizg.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-R9pMvoQp.js";
+import { description, log, logger, name, version } from "./logger-DeTONwj8.js";
+import { detectMismatches, printMismatchReport } from "./debug-Cyr1LS0T.js";
+import { createMcpHttpApp, createMcpServer, startMcpServerStdio } from "./mcp-Kff7A2dF.js";
 import { readFile } from "node:fs/promises";
 import path from "node:path";
 import process$1 from "node:process";
@@ -1194,7 +1195,7 @@ var require_picocolors = __commonJSMin((exports, module) => {
 * @throws TypeError if date format is invalid
 */
 function parseDateArg(value) {
-	const result = dateSchema.safeParse(value);
+	const result = filterDateSchema.safeParse(value);
 	if (!result.success) throw new TypeError(result.error.issues[0]?.message ?? "Invalid date format");
 	return result.data;
 }
@@ -1257,6 +1258,14 @@ const sharedArgs = {
 		short: "O",
 		description: "Use cached pricing data for Claude models instead of fetching from API",
 		default: false
+	},
+	color: {
+		type: "boolean",
+		description: "Enable colored output (default: auto). FORCE_COLOR=1 has the same effect."
+	},
+	noColor: {
+		type: "boolean",
+		description: "Disable colored output (default: auto). NO_COLOR=1 has the same effect."
 	}
 };
 /**
@@ -2149,7 +2158,7 @@ var require_colors = __commonJSMin((exports, module) => {
 	var util = __require("node:util");
 	var ansiStyles = colors$1.styles = require_styles();
 	var defineProps = Object.defineProperties;
-	var newLineRegex = new RegExp(/[\r\n]+/g);
+	var newLineRegex = /* @__PURE__ */ new RegExp(/[\r\n]+/g);
 	colors$1.supportsColor = require_supports_colors().supportsColor;
 	if (typeof colors$1.enabled === "undefined") colors$1.enabled = colors$1.supportsColor() !== false;
 	colors$1.enable = function() {
@@ -2931,7 +2940,7 @@ function stringWidth(string, options = {}) {
 	return width;
 }
 var import_cli_table3 = __toESM(require_cli_table3(), 1);
-var import_picocolors$5 = __toESM(require_picocolors(), 1);
+var import_picocolors$6 = __toESM(require_picocolors(), 1);
 /**
 * Responsive table class that adapts column widths based on terminal size
 * Automatically adjusts formatting and layout for different screen sizes
@@ -3167,11 +3176,96 @@ 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$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)));
+		row.push(import_picocolors$6.default.gray(formatNumber(breakdown.inputTokens)), import_picocolors$6.default.gray(formatNumber(breakdown.outputTokens)), import_picocolors$6.default.gray(formatNumber(breakdown.cacheCreationTokens)), import_picocolors$6.default.gray(formatNumber(breakdown.cacheReadTokens)), import_picocolors$6.default.gray(formatNumber(totalTokens)), import_picocolors$6.default.gray(formatCurrency(breakdown.cost)));
 		for (let i = 0; i < trailingColumns; i++) row.push("");
 		table.push(row);
 	}
 }
+/**
+* Manages live monitoring of Claude usage with efficient data reloading
+*/
+var LiveMonitor = class {
+	config;
+	fetcher = null;
+	lastFileTimestamps = /* @__PURE__ */ new Map();
+	processedHashes = /* @__PURE__ */ new Set();
+	allEntries = [];
+	constructor(config) {
+		this.config = config;
+		if (config.mode !== "display") this.fetcher = new PricingFetcher();
+	}
+	/**
+	* Implements Disposable interface
+	*/
+	[Symbol.dispose]() {
+		this.fetcher?.[Symbol.dispose]();
+	}
+	/**
+	* Gets the current active session block with minimal file reading
+	* 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 filesToRead = [];
+		for (const file of files) {
+			const timestamp = await getEarliestTimestamp(file);
+			const lastTimestamp = this.lastFileTimestamps.get(file);
+			if (timestamp != null && (lastTimestamp == null || timestamp.getTime() > lastTimestamp)) {
+				filesToRead.push(file);
+				this.lastFileTimestamps.set(file, timestamp.getTime());
+			}
+		}
+		if (filesToRead.length > 0) {
+			const sortedFiles = await sortFilesByTimestamp(filesToRead);
+			for (const file of sortedFiles) {
+				const content = await readFile(file, "utf-8").catch(() => {
+					return "";
+				});
+				const lines = content.trim().split("\n").filter((line) => line.length > 0);
+				for (const line of lines) try {
+					const parsed = JSON.parse(line);
+					const result = usageDataSchema.safeParse(parsed);
+					if (!result.success) continue;
+					const data = result.data;
+					const uniqueHash = createUniqueHash(data);
+					if (uniqueHash != null && this.processedHashes.has(uniqueHash)) continue;
+					if (uniqueHash != null) this.processedHashes.add(uniqueHash);
+					const costUSD = await (this.config.mode === "display" ? Promise.resolve(data.costUSD ?? 0) : calculateCostForEntry(data, this.config.mode, this.fetcher));
+					const usageLimitResetTime = getUsageLimitResetTime(data);
+					this.allEntries.push({
+						timestamp: new Date(data.timestamp),
+						usage: {
+							inputTokens: data.message.usage.input_tokens ?? 0,
+							outputTokens: data.message.usage.output_tokens ?? 0,
+							cacheCreationInputTokens: data.message.usage.cache_creation_input_tokens ?? 0,
+							cacheReadInputTokens: data.message.usage.cache_read_input_tokens ?? 0
+						},
+						costUSD,
+						model: data.message.model ?? "<synthetic>",
+						version: data.version,
+						usageLimitResetTime: usageLimitResetTime ?? void 0
+					});
+				} catch {}
+			}
+		}
+		const blocks = identifySessionBlocks(this.allEntries, this.config.sessionDurationHours);
+		const sortedBlocks = this.config.order === "asc" ? blocks : blocks.reverse();
+		return sortedBlocks.find((block) => block.isActive) ?? null;
+	}
+	/**
+	* Clears all cached data to force a full reload
+	*/
+	clearCache() {
+		this.lastFileTimestamps.clear();
+		this.processedHashes.clear();
+		this.allEntries = [];
+	}
+};
 /** Options for {@linkcode delay}. */
 /**
 * Resolve a {@linkcode Promise} after a given amount of milliseconds.
@@ -3225,6 +3319,54 @@ function pushBreakdownRows(table, breakdowns, extraColumns = 1, trailingColumns
 		}
 	});
 }
+const isBrowser = globalThis.window?.document !== void 0;
+const isNode = globalThis.process?.versions?.node !== void 0;
+const isBun = globalThis.process?.versions?.bun !== void 0;
+const isDeno = globalThis.Deno?.version?.deno !== void 0;
+const isElectron = globalThis.process?.versions?.electron !== void 0;
+const isJsDom = globalThis.navigator?.userAgent?.includes("jsdom") === true;
+const isWebWorker = typeof WorkerGlobalScope !== "undefined" && globalThis instanceof WorkerGlobalScope;
+const isDedicatedWorker = typeof DedicatedWorkerGlobalScope !== "undefined" && globalThis instanceof DedicatedWorkerGlobalScope;
+const isSharedWorker = typeof SharedWorkerGlobalScope !== "undefined" && globalThis instanceof SharedWorkerGlobalScope;
+const isServiceWorker = typeof ServiceWorkerGlobalScope !== "undefined" && globalThis instanceof ServiceWorkerGlobalScope;
+const platform = globalThis.navigator?.userAgentData?.platform;
+const isMacOs = platform === "macOS" || globalThis.navigator?.platform === "MacIntel" || globalThis.navigator?.userAgent?.includes(" Mac ") === true || globalThis.process?.platform === "darwin";
+const isWindows$1 = platform === "Windows" || globalThis.navigator?.platform === "Win32" || globalThis.process?.platform === "win32";
+const isLinux = platform === "Linux" || globalThis.navigator?.platform?.startsWith("Linux") === true || globalThis.navigator?.userAgent?.includes(" Linux ") === true || globalThis.process?.platform === "linux";
+const isIos = platform === "iOS" || globalThis.navigator?.platform === "MacIntel" && globalThis.navigator?.maxTouchPoints > 1 || /iPad|iPhone|iPod/.test(globalThis.navigator?.platform);
+const isAndroid = platform === "Android" || globalThis.navigator?.platform === "Android" || globalThis.navigator?.userAgent?.includes(" Android ") === true || globalThis.process?.platform === "android";
+const ESC = "\x1B[";
+const SEP = ";";
+const isTerminalApp = !isBrowser && process$1.env.TERM_PROGRAM === "Apple_Terminal";
+const isWindows = !isBrowser && process$1.platform === "win32";
+const cwdFunction = isBrowser ? () => {
+	throw new Error("`process.cwd()` only works in Node.js, not the browser.");
+} : process$1.cwd;
+const cursorTo = (x, y) => {
+	if (typeof x !== "number") throw new TypeError("The `x` argument is required");
+	if (typeof y !== "number") return ESC + (x + 1) + "G";
+	return ESC + (y + 1) + SEP + (x + 1) + "H";
+};
+const cursorLeft = ESC + "G";
+const cursorSavePosition = isTerminalApp ? "\x1B7" : ESC + "s";
+const cursorRestorePosition = isTerminalApp ? "\x1B8" : ESC + "u";
+const cursorGetPosition = ESC + "6n";
+const cursorNextLine = ESC + "E";
+const cursorPrevLine = ESC + "F";
+const cursorHide = ESC + "?25l";
+const cursorShow = ESC + "?25h";
+const eraseEndLine = ESC + "K";
+const eraseStartLine = ESC + "1K";
+const eraseLine = ESC + "2K";
+const eraseDown = ESC + "J";
+const eraseUp = ESC + "1J";
+const eraseScreen = ESC + "2J";
+const scrollUp = ESC + "S";
+const scrollDown = ESC + "T";
+const clearScreen = "\x1Bc";
+const clearTerminal = isWindows ? `${eraseScreen}${ESC}0f` : `${eraseScreen}${ESC}3J${ESC}H`;
+const enterAlternativeScreen = ESC + "?1049h";
+const exitAlternativeScreen = ESC + "?1049l";
 const toZeroIfInfinity = (value) => Number.isFinite(value) ? value : 0;
 function parseNumber(milliseconds) {
 	return {
@@ -3336,255 +3478,170 @@ function prettyMilliseconds(milliseconds, options) {
 	if (typeof options.unitCount === "number") result = result.slice(0, Math.max(options.unitCount, 1));
 	return sign + result.join(separator);
 }
-/**
-* Manages live monitoring of Claude usage with efficient data reloading
-*/
-var LiveMonitor = class {
-	config;
-	fetcher = null;
-	lastFileTimestamps = /* @__PURE__ */ new Map();
-	processedHashes = /* @__PURE__ */ new Set();
-	allEntries = [];
-	constructor(config) {
-		this.config = config;
-		if (config.mode !== "display") this.fetcher = new PricingFetcher();
-	}
-	/**
-	* Implements Disposable interface
-	*/
-	[Symbol.dispose]() {
-		this.fetcher?.[Symbol.dispose]();
-	}
-	/**
-	* Gets the current active session block with minimal file reading
-	* 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 filesToRead = [];
-		for (const file of files) {
-			const timestamp = await getEarliestTimestamp(file);
-			const lastTimestamp = this.lastFileTimestamps.get(file);
-			if (timestamp != null && (lastTimestamp == null || timestamp.getTime() > lastTimestamp)) {
-				filesToRead.push(file);
-				this.lastFileTimestamps.set(file, timestamp.getTime());
-			}
-		}
-		if (filesToRead.length > 0) {
-			const sortedFiles = await sortFilesByTimestamp(filesToRead);
-			for (const file of sortedFiles) {
-				const content = await readFile(file, "utf-8");
-				const lines = content.trim().split("\n").filter((line) => line.length > 0);
-				for (const line of lines) try {
-					const parsed = JSON.parse(line);
-					const result = usageDataSchema.safeParse(parsed);
-					if (!result.success) continue;
-					const data = result.data;
-					const uniqueHash = createUniqueHash(data);
-					if (uniqueHash != null && this.processedHashes.has(uniqueHash)) continue;
-					if (uniqueHash != null) this.processedHashes.add(uniqueHash);
-					const costUSD = await (this.config.mode === "display" ? Promise.resolve(data.costUSD ?? 0) : calculateCostForEntry(data, this.config.mode, this.fetcher));
-					this.allEntries.push({
-						timestamp: new Date(data.timestamp),
-						usage: {
-							inputTokens: data.message.usage.input_tokens ?? 0,
-							outputTokens: data.message.usage.output_tokens ?? 0,
-							cacheCreationInputTokens: data.message.usage.cache_creation_input_tokens ?? 0,
-							cacheReadInputTokens: data.message.usage.cache_read_input_tokens ?? 0
-						},
-						costUSD,
-						model: data.message.model ?? "<synthetic>",
-						version: data.version
-					});
-				} catch {}
-			}
-		}
-		const blocks = identifySessionBlocks(this.allEntries, this.config.sessionDurationHours);
-		const sortedBlocks = this.config.order === "asc" ? blocks : blocks.reverse();
-		return sortedBlocks.find((block) => block.isActive) ?? null;
-	}
-	/**
-	* Clears all cached data to force a full reload
-	*/
-	clearCache() {
-		this.lastFileTimestamps.clear();
-		this.processedHashes.clear();
-		this.allEntries = [];
-	}
-};
-const isBrowser = globalThis.window?.document !== void 0;
-const isNode = globalThis.process?.versions?.node !== void 0;
-const isBun = globalThis.process?.versions?.bun !== void 0;
-const isDeno = globalThis.Deno?.version?.deno !== void 0;
-const isElectron = globalThis.process?.versions?.electron !== void 0;
-const isJsDom = globalThis.navigator?.userAgent?.includes("jsdom") === true;
-const isWebWorker = typeof WorkerGlobalScope !== "undefined" && globalThis instanceof WorkerGlobalScope;
-const isDedicatedWorker = typeof DedicatedWorkerGlobalScope !== "undefined" && globalThis instanceof DedicatedWorkerGlobalScope;
-const isSharedWorker = typeof SharedWorkerGlobalScope !== "undefined" && globalThis instanceof SharedWorkerGlobalScope;
-const isServiceWorker = typeof ServiceWorkerGlobalScope !== "undefined" && globalThis instanceof ServiceWorkerGlobalScope;
-const platform = globalThis.navigator?.userAgentData?.platform;
-const isMacOs = platform === "macOS" || globalThis.navigator?.platform === "MacIntel" || globalThis.navigator?.userAgent?.includes(" Mac ") === true || globalThis.process?.platform === "darwin";
-const isWindows$1 = platform === "Windows" || globalThis.navigator?.platform === "Win32" || globalThis.process?.platform === "win32";
-const isLinux = platform === "Linux" || globalThis.navigator?.platform?.startsWith("Linux") === true || globalThis.navigator?.userAgent?.includes(" Linux ") === true || globalThis.process?.platform === "linux";
-const isIos = platform === "iOS" || globalThis.navigator?.platform === "MacIntel" && globalThis.navigator?.maxTouchPoints > 1 || /iPad|iPhone|iPod/.test(globalThis.navigator?.platform);
-const isAndroid = platform === "Android" || globalThis.navigator?.platform === "Android" || globalThis.navigator?.userAgent?.includes(" Android ") === true || globalThis.process?.platform === "android";
-const ESC = "\x1B[";
-const SEP = ";";
-const isTerminalApp = !isBrowser && process$1.env.TERM_PROGRAM === "Apple_Terminal";
-const isWindows = !isBrowser && process$1.platform === "win32";
-const cwdFunction = isBrowser ? () => {
-	throw new Error("`process.cwd()` only works in Node.js, not the browser.");
-} : process$1.cwd;
-const cursorTo = (x, y) => {
-	if (typeof x !== "number") throw new TypeError("The `x` argument is required");
-	if (typeof y !== "number") return ESC + (x + 1) + "G";
-	return ESC + (y + 1) + SEP + (x + 1) + "H";
-};
-const cursorUp = (count = 1) => ESC + count + "A";
-const cursorDown = (count = 1) => ESC + count + "B";
-const cursorLeft = ESC + "G";
-const cursorSavePosition = isTerminalApp ? "\x1B7" : ESC + "s";
-const cursorRestorePosition = isTerminalApp ? "\x1B8" : ESC + "u";
-const cursorGetPosition = ESC + "6n";
-const cursorNextLine = ESC + "E";
-const cursorPrevLine = ESC + "F";
-const cursorHide = ESC + "?25l";
-const cursorShow = ESC + "?25h";
-const eraseEndLine = ESC + "K";
-const eraseStartLine = ESC + "1K";
-const eraseLine = ESC + "2K";
-const eraseDown = ESC + "J";
-const eraseUp = ESC + "1J";
-const eraseScreen = ESC + "2J";
-const scrollUp = ESC + "S";
-const scrollDown = ESC + "T";
-const clearScreen = "\x1Bc";
-const clearTerminal = isWindows ? `${eraseScreen}${ESC}0f` : `${eraseScreen}${ESC}3J${ESC}H`;
-const enterAlternativeScreen = ESC + "?1049h";
-const exitAlternativeScreen = ESC + "?1049l";
-/**
-* Terminal control sequences for live display updates
-*/
-const TERMINAL_CONTROL = {
-	HIDE_CURSOR: cursorHide,
-	SHOW_CURSOR: cursorShow,
-	CLEAR_SCREEN: clearScreen,
-	CLEAR_LINE: eraseLine,
-	MOVE_TO_TOP: cursorTo(0, 0),
-	MOVE_UP: (n) => cursorUp(n),
-	MOVE_DOWN: (n) => cursorDown(n),
-	MOVE_TO_COLUMN: (n) => cursorTo(n - 1, void 0)
-};
+const SYNC_START = "\x1B[?2026h";
+const SYNC_END = "\x1B[?2026l";
+const DISABLE_LINE_WRAP = "\x1B[?7l";
+const ENABLE_LINE_WRAP = "\x1B[?7h";
+const ANSI_RESET = "\x1B[0m";
 /**
 * Manages terminal state for live updates
+* Provides a clean interface for terminal operations with automatic TTY checking
+* and cursor state management for live monitoring displays
 */
 var TerminalManager = class {
 	stream;
 	cursorHidden = false;
-	originalWrite;
+	buffer = [];
+	useBuffering = false;
+	alternateScreenActive = false;
+	syncMode = false;
 	constructor(stream = process$1.stdout) {
 		this.stream = stream;
-		this.originalWrite = stream.write.bind(stream);
 	}
 	/**
-	* Hides the terminal cursor
+	* Hides the terminal cursor for cleaner live updates
+	* Only works in TTY environments (real terminals)
 	*/
 	hideCursor() {
 		if (!this.cursorHidden && this.stream.isTTY) {
-			this.stream.write(TERMINAL_CONTROL.HIDE_CURSOR);
+			this.stream.write(cursorHide);
 			this.cursorHidden = true;
 		}
 	}
 	/**
 	* Shows the terminal cursor
+	* Should be called during cleanup to restore normal terminal behavior
 	*/
 	showCursor() {
 		if (this.cursorHidden && this.stream.isTTY) {
-			this.stream.write(TERMINAL_CONTROL.SHOW_CURSOR);
+			this.stream.write(cursorShow);
 			this.cursorHidden = false;
 		}
 	}
 	/**
-	* Clears the entire screen and moves cursor to top
+	* Clears the entire screen and moves cursor to top-left corner
+	* Essential for live monitoring displays that need to refresh completely
 	*/
 	clearScreen() {
 		if (this.stream.isTTY) {
-			this.stream.write(TERMINAL_CONTROL.CLEAR_SCREEN);
-			this.stream.write(TERMINAL_CONTROL.MOVE_TO_TOP);
+			this.stream.write(clearScreen);
+			this.stream.write(cursorTo(0, 0));
+		}
+	}
+	/**
+	* Writes text to the terminal stream
+	* Supports buffering mode for performance optimization
+	*/
+	write(text) {
+		if (this.useBuffering) this.buffer.push(text);
+		else this.stream.write(text);
+	}
+	/**
+	* Enables buffering mode - collects all writes in memory instead of sending immediately
+	* This prevents flickering when doing many rapid updates
+	*/
+	startBuffering() {
+		this.useBuffering = true;
+		this.buffer = [];
+	}
+	/**
+	* Sends all buffered content to terminal at once
+	* This creates smooth, atomic updates without flickering
+	*/
+	flush() {
+		if (this.useBuffering && this.buffer.length > 0) {
+			if (this.syncMode && this.stream.isTTY) this.stream.write(SYNC_START + this.buffer.join("") + SYNC_END);
+			else this.stream.write(this.buffer.join(""));
+			this.buffer = [];
 		}
+		this.useBuffering = false;
 	}
 	/**
-	* Clears the current line
+	* Switches to alternate screen buffer (like vim/less does)
+	* This preserves what was on screen before and allows full-screen apps
 	*/
-	clearLine() {
-		if (this.stream.isTTY) this.stream.write(TERMINAL_CONTROL.CLEAR_LINE);
+	enterAlternateScreen() {
+		if (!this.alternateScreenActive && this.stream.isTTY) {
+			this.stream.write(enterAlternativeScreen);
+			this.stream.write(DISABLE_LINE_WRAP);
+			this.alternateScreenActive = true;
+		}
 	}
 	/**
-	* Moves cursor up by n lines
+	* Returns to normal screen, restoring what was there before
 	*/
-	moveUp(lines) {
-		if (this.stream.isTTY && lines > 0) this.stream.write(TERMINAL_CONTROL.MOVE_UP(lines));
+	exitAlternateScreen() {
+		if (this.alternateScreenActive && this.stream.isTTY) {
+			this.stream.write(ENABLE_LINE_WRAP);
+			this.stream.write(exitAlternativeScreen);
+			this.alternateScreenActive = false;
+		}
 	}
 	/**
-	* Moves cursor to beginning of line
+	* Enables sync mode - terminal will wait for END signal before showing updates
+	* Prevents the user from seeing partial/torn screen updates
 	*/
-	moveToLineStart() {
-		if (this.stream.isTTY) this.stream.write(TERMINAL_CONTROL.MOVE_TO_COLUMN(1));
+	enableSyncMode() {
+		this.syncMode = true;
 	}
 	/**
-	* Writes text to the stream
+	* Disables synchronized output mode
 	*/
-	write(text) {
-		this.stream.write(text);
+	disableSyncMode() {
+		this.syncMode = false;
 	}
 	/**
-	* Gets terminal width
+	* Gets terminal width in columns
+	* Falls back to 80 columns if detection fails
 	*/
 	get width() {
 		return this.stream.columns || 80;
 	}
 	/**
-	* Gets terminal height
+	* Gets terminal height in rows
+	* Falls back to 24 rows if detection fails
 	*/
 	get height() {
 		return this.stream.rows || 24;
 	}
 	/**
-	* Checks if the stream is a TTY
+	* Returns true if output goes to a real terminal (not a file or pipe)
+	* We only send fancy ANSI codes to real terminals
 	*/
 	get isTTY() {
 		return this.stream.isTTY ?? false;
 	}
 	/**
-	* Ensures cursor is shown on cleanup
+	* Restores terminal to normal state - MUST call before program exits
+	* Otherwise user's terminal might be left in a broken state
 	*/
 	cleanup() {
 		this.showCursor();
+		this.exitAlternateScreen();
+		this.disableSyncMode();
 	}
 };
 /**
-* Creates a progress bar string
-* @param value - Current value
-* @param max - Maximum value
-* @param width - Width of the progress bar
-* @param options - Display options
-* @param options.showPercentage - Whether to show percentage
+* Creates a progress bar string with customizable appearance
+*
+* Example: createProgressBar(75, 100, 20) -> "[████████████████░░░░] 75.0%"
+*
+* @param value - Current progress value
+* @param max - Maximum value (100% point)
+* @param width - Character width of the progress bar (excluding brackets and text)
+* @param options - Customization options for appearance and display
+* @param options.showPercentage - Whether to show percentage after the bar
 * @param options.showValues - Whether to show current/max values
-* @param options.fillChar - Character for filled portion
-* @param options.emptyChar - Character for empty portion
-* @param options.leftBracket - Left bracket character
-* @param options.rightBracket - Right bracket character
-* @param options.colors - Color configuration
-* @param options.colors.low - Color for low percentage
-* @param options.colors.medium - Color for medium percentage
-* @param options.colors.high - Color for high percentage
-* @param options.colors.critical - Color for critical percentage
-* @returns Formatted progress bar string
+* @param options.fillChar - Character for filled portion (default: '█')
+* @param options.emptyChar - Character for empty portion (default: '░')
+* @param options.leftBracket - Left bracket character (default: '[')
+* @param options.rightBracket - Right bracket character (default: ']')
+* @param options.colors - Color configuration for different thresholds
+* @param options.colors.low - Color for low percentage values
+* @param options.colors.medium - Color for medium percentage values
+* @param options.colors.high - Color for high percentage values
+* @param options.colors.critical - Color for critical percentage values
+* @returns Formatted progress bar string with optional percentage/values
 */
 function createProgressBar(value, max, width, options = {}) {
 	const { showPercentage = true, showValues = false, fillChar = "█", emptyChar = "░", leftBracket = "[", rightBracket = "]", colors: colors$2 = {} } = options;
@@ -3600,17 +3657,23 @@ function createProgressBar(value, max, width, options = {}) {
 	if (color !== "") bar += color;
 	bar += fillChar.repeat(fillWidth);
 	bar += emptyChar.repeat(emptyWidth);
-	if (color !== "") bar += "\x1B[0m";
+	if (color !== "") bar += ANSI_RESET;
 	bar += rightBracket;
 	if (showPercentage) bar += ` ${percentage.toFixed(1)}%`;
 	if (showValues) bar += ` (${value}/${max})`;
 	return bar;
 }
 /**
-* Centers text within a given width
-* @param text - Text to center
-* @param width - Total width
-* @returns Centered text with padding
+* Centers text within a specified width using spaces for padding
+*
+* Uses string-width to handle Unicode characters and ANSI escape codes properly.
+* If text is longer than width, returns original text without truncation.
+*
+* Example: centerText("Hello", 10) -> "  Hello   "
+*
+* @param text - Text to center (may contain ANSI color codes)
+* @param width - Total character width including padding
+* @returns Text with spaces added for centering
 */
 function centerText(text, width) {
 	const textLength = stringWidth(text);
@@ -3619,12 +3682,40 @@ function centerText(text, width) {
 	const rightPadding = width - textLength - leftPadding;
 	return " ".repeat(leftPadding) + text + " ".repeat(rightPadding);
 }
-var import_picocolors$4 = __toESM(require_picocolors(), 1);
-var import_usingCtx = __toESM(require_usingCtx(), 1);
+var import_picocolors$5 = __toESM(require_picocolors(), 1);
+/**
+* Delay with AbortSignal support and graceful error handling
+*/
+async function delayWithAbort(ms, signal) {
+	await delay(ms, { signal });
+}
+/**
+* Shows waiting message when no Claude session is active
+* Uses efficient cursor positioning instead of full screen clear
+*/
+async function renderWaitingState(terminal, config, signal) {
+	terminal.startBuffering();
+	terminal.write(cursorTo(0, 0));
+	terminal.write(eraseDown);
+	terminal.write(import_picocolors$5.default.yellow("No active session block found. Waiting...\n"));
+	terminal.write(cursorHide);
+	terminal.flush();
+	await delayWithAbort(config.refreshInterval, signal);
+}
+/**
+* Displays the live monitoring dashboard for active Claude session
+* Uses buffering and sync mode to prevent screen flickering
+*/
+function renderActiveBlock(terminal, activeBlock, config) {
+	terminal.startBuffering();
+	terminal.write(cursorTo(0, 0));
+	terminal.write(eraseDown);
+	renderLiveDisplay(terminal, activeBlock, config);
+	terminal.write(cursorHide);
+	terminal.flush();
+}
 /**
 * Format token counts with K suffix for display
-* @param num - Number of tokens
-* @returns Formatted string like "12.3k" or "999"
 */
 function formatTokensShort(num) {
 	if (num >= 1e3) return `${(num / 1e3).toFixed(1)}k`;
@@ -3638,69 +3729,6 @@ const DETAIL_COLUMN_WIDTHS = {
 	col2: 37
 };
 /**
-* Starts live monitoring of the active session block
-*/
-async function startLiveMonitoring(config) {
-	try {
-		var _usingCtx = (0, import_usingCtx.default)();
-		const terminal = new TerminalManager();
-		const abortController = new AbortController();
-		const cleanup = () => {
-			abortController.abort();
-			terminal.cleanup();
-			terminal.clearScreen();
-			logger.info("Live monitoring stopped.");
-			if (process$1.exitCode == null) process$1.exit(0);
-		};
-		process$1.on("SIGINT", cleanup);
-		process$1.on("SIGTERM", cleanup);
-		terminal.hideCursor();
-		const monitor = _usingCtx.u(new LiveMonitor({
-			claudePath: config.claudePath,
-			sessionDurationHours: config.sessionDurationHours,
-			mode: config.mode,
-			order: config.order
-		}));
-		try {
-			while (!abortController.signal.aborted) {
-				const activeBlock = await monitor.getActiveBlock();
-				if (activeBlock == null) {
-					terminal.clearScreen();
-					terminal.write(import_picocolors$4.default.yellow("No active session block found. Waiting...\n"));
-					try {
-						await delay(config.refreshInterval, { signal: abortController.signal });
-					} catch (error) {
-						if ((error instanceof DOMException || error instanceof Error) && error.name === "AbortError") break;
-						throw error;
-					}
-					continue;
-				}
-				terminal.clearScreen();
-				renderLiveDisplay(terminal, activeBlock, config);
-				try {
-					await delay(config.refreshInterval, { signal: abortController.signal });
-				} catch (error) {
-					if ((error instanceof DOMException || error instanceof Error) && error.name === "AbortError") break;
-					throw error;
-				}
-			}
-		} catch (error) {
-			if ((error instanceof DOMException || error instanceof Error) && error.name === "AbortError") return;
-			terminal.clearScreen();
-			const errorMessage = error instanceof Error ? error.message : String(error);
-			terminal.write(import_picocolors$4.default.red(`Error: ${errorMessage}\n`));
-			logger.error(`Live monitoring error: ${errorMessage}`);
-			try {
-				await delay(config.refreshInterval, { signal: abortController.signal });
-			} catch {}
-		}
-	} catch (_) {
-		_usingCtx.e = _;
-	} finally {
-		_usingCtx.d();
-	}
-}
-/**
 * Renders the live display for an active session block
 */
 function renderLiveDisplay(terminal, block, config) {
@@ -3713,7 +3741,6 @@ function renderLiveDisplay(terminal, block, config) {
 		renderCompactLiveDisplay(terminal, block, config, totalTokens, elapsed, remaining);
 		return;
 	}
-	terminal.clearScreen();
 	const boxWidth = Math.min(120, width - 2);
 	const boxMargin = Math.floor((width - boxWidth) / 2);
 	const marginStr = " ".repeat(boxMargin);
@@ -3725,8 +3752,8 @@ function renderLiveDisplay(terminal, block, config) {
 	const sessionPercent = elapsed / sessionDuration * 100;
 	const sessionProgressBar = createProgressBar(elapsed, sessionDuration, barWidth, {
 		showPercentage: false,
-		fillChar: import_picocolors$4.default.cyan("█"),
-		emptyChar: import_picocolors$4.default.gray("░"),
+		fillChar: import_picocolors$5.default.cyan("█"),
+		emptyChar: import_picocolors$5.default.gray("░"),
 		leftBracket: "[",
 		rightBracket: "]"
 	});
@@ -3743,96 +3770,100 @@ function renderLiveDisplay(terminal, block, config) {
 		hour12: true
 	});
 	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}│${import_picocolors$5.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 = import_picocolors$4.default.bold("⏱️ SESSION");
+	const sessionLabel = import_picocolors$5.default.bold("⏱️ SESSION");
 	const sessionLabelWidth = stringWidth(sessionLabel);
 	const sessionBarStr = `${sessionLabel}${"".padEnd(Math.max(0, labelWidth - sessionLabelWidth))} ${sessionProgressBar} ${sessionPercent.toFixed(1).padStart(6)}%`;
 	const sessionBarPadded = sessionBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(sessionBarStr)));
 	terminal.write(`${marginStr}│ ${sessionBarPadded}│\n`);
-	const col1 = `${import_picocolors$4.default.gray("Started:")} ${startTime}`;
-	const col2 = `${import_picocolors$4.default.gray("Elapsed:")} ${prettyMilliseconds(elapsed * 60 * 1e3, { compact: true })}`;
-	const col3 = `${import_picocolors$4.default.gray("Remaining:")} ${prettyMilliseconds(remaining * 60 * 1e3, { compact: true })} (${endTime})`;
+	const col1 = `${import_picocolors$5.default.gray("Started:")} ${startTime}`;
+	const col2 = `${import_picocolors$5.default.gray("Elapsed:")} ${prettyMilliseconds(elapsed * 60 * 1e3, { compact: true })}`;
+	const col3 = `${import_picocolors$5.default.gray("Remaining:")} ${prettyMilliseconds(remaining * 60 * 1e3, { compact: true })} (${endTime})`;
 	const col1Visible = stringWidth(col1);
 	const col2Visible = stringWidth(col2);
 	const pad1 = " ".repeat(Math.max(0, DETAIL_COLUMN_WIDTHS.col1 - col1Visible));
 	const pad2 = " ".repeat(Math.max(0, DETAIL_COLUMN_WIDTHS.col2 - col2Visible));
-	const sessionDetails = `   ${col1}${pad1}${col2}${pad2}${col3}`;
+	const sessionDetails = `   ${col1}${pad1}${pad2}${col3}`;
 	const sessionDetailsPadded = sessionDetails + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(sessionDetails)));
+	let usageLimitResetTimePadded = null;
+	if (block.usageLimitResetTime !== void 0 && now < block.usageLimitResetTime) {
+		const resetTime = block.usageLimitResetTime?.toLocaleTimeString(void 0, {
+			hour: "2-digit",
+			minute: "2-digit",
+			hour12: true
+		}) ?? null;
+		const usageLimitResetTime = resetTime !== null ? import_picocolors$5.default.red(`❌ USAGE LIMIT. RESET AT ${resetTime}`) : "";
+		usageLimitResetTimePadded = resetTime !== null ? usageLimitResetTime + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(usageLimitResetTime))) : null;
+	}
 	terminal.write(`${marginStr}│ ${sessionDetailsPadded}│\n`);
+	if (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`);
 	const tokenPercent = config.tokenLimit != null && config.tokenLimit > 0 ? totalTokens / config.tokenLimit * 100 : 0;
-	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;
+	let barColor = import_picocolors$5.default.green;
+	if (tokenPercent > 100) barColor = import_picocolors$5.default.red;
+	else if (tokenPercent > 80) barColor = import_picocolors$5.default.yellow;
 	const usageBar = config.tokenLimit != null && config.tokenLimit > 0 ? createProgressBar(totalTokens, config.tokenLimit, barWidth, {
 		showPercentage: false,
 		fillChar: barColor("█"),
-		emptyChar: import_picocolors$4.default.gray("░"),
+		emptyChar: import_picocolors$5.default.gray("░"),
 		leftBracket: "[",
 		rightBracket: "]"
-	}) : `[${import_picocolors$4.default.green("█".repeat(Math.floor(barWidth * .1)))}${import_picocolors$4.default.gray("░".repeat(barWidth - Math.floor(barWidth * .1)))}]`;
+	}) : `[${import_picocolors$5.default.green("█".repeat(Math.floor(barWidth * .1)))}${import_picocolors$5.default.gray("░".repeat(barWidth - Math.floor(barWidth * .1)))}]`;
 	const burnRate = calculateBurnRate(block);
-	const rateIndicator = burnRate != null ? burnRate.tokensPerMinute > 1e3 ? import_picocolors$4.default.red("⚡ HIGH") : burnRate.tokensPerMinute > 500 ? import_picocolors$4.default.yellow("⚡ MODERATE") : import_picocolors$4.default.green("✓ NORMAL") : "";
-	const rateDisplay = burnRate != null ? `${import_picocolors$4.default.bold("Burn Rate:")} ${Math.round(burnRate.tokensPerMinute)} token/min ${rateIndicator}` : `${import_picocolors$4.default.bold("Burn Rate:")} N/A`;
-	const usageLabel = import_picocolors$4.default.bold("🔥 USAGE");
+	const rateIndicator = burnRate != null ? burnRate.tokensPerMinute > 1e3 ? import_picocolors$5.default.red("⚡ HIGH") : burnRate.tokensPerMinute > 500 ? import_picocolors$5.default.yellow("⚡ MODERATE") : import_picocolors$5.default.green("✓ NORMAL") : "";
+	const rateDisplay = burnRate != null ? `${import_picocolors$5.default.bold("Burn Rate:")} ${Math.round(burnRate.tokensPerMinute)} token/min ${rateIndicator}` : `${import_picocolors$5.default.bold("Burn Rate:")} N/A`;
+	const usageLabel = import_picocolors$5.default.bold("🔥 USAGE");
 	const usageLabelWidth = stringWidth(usageLabel);
-	if (config.tokenLimit != null && config.tokenLimit > 0) {
-		const usageBarStr = `${usageLabel}${"".padEnd(Math.max(0, labelWidth - usageLabelWidth))} ${usageBar} ${tokenPercent.toFixed(1).padStart(6)}% (${formatTokensShort(totalTokens)}/${formatTokensShort(config.tokenLimit)})`;
-		const usageBarPadded = usageBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(usageBarStr)));
-		terminal.write(`${marginStr}│ ${usageBarPadded}│\n`);
-		const col1$1 = `${import_picocolors$4.default.gray("Tokens:")} ${formatNumber(totalTokens)} (${rateDisplay})`;
-		const col2$1 = `${import_picocolors$4.default.gray("Limit:")} ${formatNumber(config.tokenLimit)} tokens`;
-		const col3$1 = `${import_picocolors$4.default.gray("Cost:")} ${formatCurrency(block.costUSD)}`;
-		const col1Visible$1 = stringWidth(col1$1);
-		const col2Visible$1 = stringWidth(col2$1);
-		const pad1$1 = " ".repeat(Math.max(0, DETAIL_COLUMN_WIDTHS.col1 - col1Visible$1));
-		const pad2$1 = " ".repeat(Math.max(0, DETAIL_COLUMN_WIDTHS.col2 - col2Visible$1));
-		const usageDetails = `   ${col1$1}${pad1$1}${col2$1}${pad2$1}${col3$1}`;
-		const usageDetailsPadded = usageDetails + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(usageDetails)));
-		terminal.write(`${marginStr}│ ${usageDetailsPadded}│\n`);
-	} else {
-		const usageBarStr = `${usageLabel}${"".padEnd(Math.max(0, labelWidth - usageLabelWidth))} ${usageBar} (${formatTokensShort(totalTokens)} tokens)`;
-		const usageBarPadded = usageBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(usageBarStr)));
-		terminal.write(`${marginStr}│ ${usageBarPadded}│\n`);
-		const col1$1 = `${import_picocolors$4.default.gray("Tokens:")} ${formatNumber(totalTokens)} (${rateDisplay})`;
-		const col3$1 = `${import_picocolors$4.default.gray("Cost:")} ${formatCurrency(block.costUSD)}`;
-		const col1Visible$1 = stringWidth(col1$1);
-		const pad1$1 = " ".repeat(Math.max(0, DETAIL_COLUMN_WIDTHS.col1 - col1Visible$1));
-		const pad2$1 = " ".repeat(DETAIL_COLUMN_WIDTHS.col2);
-		const usageDetails = `   ${col1$1}${pad1$1}${pad2$1}${col3$1}`;
-		const usageDetailsPadded = usageDetails + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(usageDetails)));
-		terminal.write(`${marginStr}│ ${usageDetailsPadded}│\n`);
-	}
+	const { usageBarStr, usageCol1, usageCol2, usageCol3 } = config.tokenLimit != null && config.tokenLimit > 0 ? {
+		usageBarStr: `${usageLabel}${"".padEnd(Math.max(0, labelWidth - usageLabelWidth))} ${usageBar} ${tokenPercent.toFixed(1).padStart(6)}% (${formatTokensShort(totalTokens)}/${formatTokensShort(config.tokenLimit)})`,
+		usageCol1: `${import_picocolors$5.default.gray("Tokens:")} ${formatNumber(totalTokens)} (${rateDisplay})`,
+		usageCol2: `${import_picocolors$5.default.gray("Limit:")} ${formatNumber(config.tokenLimit)} tokens`,
+		usageCol3: `${import_picocolors$5.default.gray("Cost:")} ${formatCurrency(block.costUSD)}`
+	} : {
+		usageBarStr: `${usageLabel}${"".padEnd(Math.max(0, labelWidth - usageLabelWidth))} ${usageBar} (${formatTokensShort(totalTokens)} tokens)`,
+		usageCol1: `${import_picocolors$5.default.gray("Tokens:")} ${formatNumber(totalTokens)} (${rateDisplay})`,
+		usageCol2: "",
+		usageCol3: `${import_picocolors$5.default.gray("Cost:")} ${formatCurrency(block.costUSD)}`
+	};
+	const usageBarPadded = usageBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(usageBarStr)));
+	terminal.write(`${marginStr}│ ${usageBarPadded}│\n`);
+	const usageCol1Visible = stringWidth(usageCol1);
+	const usageCol2Visible = stringWidth(usageCol2);
+	const usagePad1 = " ".repeat(Math.max(0, DETAIL_COLUMN_WIDTHS.col1 - usageCol1Visible));
+	const usagePad2 = usageCol2.length > 0 ? " ".repeat(Math.max(0, DETAIL_COLUMN_WIDTHS.col2 - usageCol2Visible)) : " ".repeat(DETAIL_COLUMN_WIDTHS.col2);
+	const usageDetails = `   ${usageCol1}${usagePad1}${usageCol2}${usagePad2}${usageCol3}`;
+	const usageDetailsPadded = usageDetails + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(usageDetails)));
+	terminal.write(`${marginStr}│ ${usageDetailsPadded}│\n`);
 	terminal.write(`${marginStr}│${" ".repeat(boxWidth - 2)}│\n`);
 	terminal.write(`${marginStr}├${"─".repeat(boxWidth - 2)}┤\n`);
 	terminal.write(`${marginStr}│${" ".repeat(boxWidth - 2)}│\n`);
 	const projection = projectBlockUsage(block);
 	if (projection != null) {
 		const projectedPercent = config.tokenLimit != null && config.tokenLimit > 0 ? projection.totalTokens / config.tokenLimit * 100 : 0;
-		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;
+		let projBarColor = import_picocolors$5.default.green;
+		if (projectedPercent > 100) projBarColor = import_picocolors$5.default.red;
+		else if (projectedPercent > 80) projBarColor = import_picocolors$5.default.yellow;
 		const projectionBar = config.tokenLimit != null && config.tokenLimit > 0 ? createProgressBar(projection.totalTokens, config.tokenLimit, barWidth, {
 			showPercentage: false,
 			fillChar: projBarColor("█"),
-			emptyChar: import_picocolors$4.default.gray("░"),
+			emptyChar: import_picocolors$5.default.gray("░"),
 			leftBracket: "[",
 			rightBracket: "]"
-		}) : `[${import_picocolors$4.default.green("█".repeat(Math.floor(barWidth * .15)))}${import_picocolors$4.default.gray("░".repeat(barWidth - Math.floor(barWidth * .15)))}]`;
-		const limitStatus = config.tokenLimit != null && config.tokenLimit > 0 ? projectedPercent > 100 ? import_picocolors$4.default.red("❌ WILL EXCEED LIMIT") : projectedPercent > 80 ? import_picocolors$4.default.yellow("⚠️  APPROACHING LIMIT") : import_picocolors$4.default.green("✓ WITHIN LIMIT") : import_picocolors$4.default.green("✓ ON TRACK");
-		const projLabel = import_picocolors$4.default.bold("📈 PROJECTION");
+		}) : `[${import_picocolors$5.default.green("█".repeat(Math.floor(barWidth * .15)))}${import_picocolors$5.default.gray("░".repeat(barWidth - Math.floor(barWidth * .15)))}]`;
+		const limitStatus = config.tokenLimit != null && config.tokenLimit > 0 ? projectedPercent > 100 ? import_picocolors$5.default.red("❌ WILL EXCEED LIMIT") : projectedPercent > 80 ? import_picocolors$5.default.yellow("⚠️  APPROACHING LIMIT") : import_picocolors$5.default.green("✓ WITHIN LIMIT") : import_picocolors$5.default.green("✓ ON TRACK");
+		const projLabel = import_picocolors$5.default.bold("📈 PROJECTION");
 		const projLabelWidth = stringWidth(projLabel);
 		if (config.tokenLimit != null && config.tokenLimit > 0) {
 			const projBarStr = `${projLabel}${"".padEnd(Math.max(0, labelWidth - projLabelWidth))} ${projectionBar} ${projectedPercent.toFixed(1).padStart(6)}% (${formatTokensShort(projection.totalTokens)}/${formatTokensShort(config.tokenLimit)})`;
 			const projBarPadded = projBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(projBarStr)));
 			terminal.write(`${marginStr}│ ${projBarPadded}│\n`);
-			const col1$1 = `${import_picocolors$4.default.gray("Status:")} ${limitStatus}`;
-			const col2$1 = `${import_picocolors$4.default.gray("Tokens:")} ${formatNumber(projection.totalTokens)}`;
-			const col3$1 = `${import_picocolors$4.default.gray("Cost:")} ${formatCurrency(projection.totalCost)}`;
+			const col1$1 = `${import_picocolors$5.default.gray("Status:")} ${limitStatus}`;
+			const col2$1 = `${import_picocolors$5.default.gray("Tokens:")} ${formatNumber(projection.totalTokens)}`;
+			const col3$1 = `${import_picocolors$5.default.gray("Cost:")} ${formatCurrency(projection.totalCost)}`;
 			const col1Visible$1 = stringWidth(col1$1);
 			const col2Visible$1 = stringWidth(col2$1);
 			const pad1$1 = " ".repeat(Math.max(0, DETAIL_COLUMN_WIDTHS.col1 - col1Visible$1));
@@ -3844,9 +3875,9 @@ function renderLiveDisplay(terminal, block, config) {
 			const projBarStr = `${projLabel}${"".padEnd(Math.max(0, labelWidth - projLabelWidth))} ${projectionBar} (${formatTokensShort(projection.totalTokens)} tokens)`;
 			const projBarPadded = projBarStr + " ".repeat(Math.max(0, boxWidth - 3 - stringWidth(projBarStr)));
 			terminal.write(`${marginStr}│ ${projBarPadded}│\n`);
-			const col1$1 = `${import_picocolors$4.default.gray("Status:")} ${limitStatus}`;
-			const col2$1 = `${import_picocolors$4.default.gray("Tokens:")} ${formatNumber(projection.totalTokens)}`;
-			const col3$1 = `${import_picocolors$4.default.gray("Cost:")} ${formatCurrency(projection.totalCost)}`;
+			const col1$1 = `${import_picocolors$5.default.gray("Status:")} ${limitStatus}`;
+			const col2$1 = `${import_picocolors$5.default.gray("Tokens:")} ${formatNumber(projection.totalTokens)}`;
+			const col3$1 = `${import_picocolors$5.default.gray("Cost:")} ${formatCurrency(projection.totalCost)}`;
 			const col1Visible$1 = stringWidth(col1$1);
 			const col2Visible$1 = stringWidth(col2$1);
 			const pad1$1 = " ".repeat(Math.max(0, DETAIL_COLUMN_WIDTHS.col1 - col1Visible$1));
@@ -3865,7 +3896,7 @@ function renderLiveDisplay(terminal, block, config) {
 	}
 	terminal.write(`${marginStr}├${"─".repeat(boxWidth - 2)}┤\n`);
 	const refreshText = `↻ Refreshing every ${config.refreshInterval / 1e3}s  •  Press Ctrl+C to stop`;
-	terminal.write(`${marginStr}│${import_picocolors$4.default.gray(centerText(refreshText, boxWidth - 2))}│\n`);
+	terminal.write(`${marginStr}│${import_picocolors$5.default.gray(centerText(refreshText, boxWidth - 2))}│\n`);
 	terminal.write(`${marginStr}└${"─".repeat(boxWidth - 2)}┘\n`);
 }
 /**
@@ -3873,20 +3904,86 @@ function renderLiveDisplay(terminal, block, config) {
 */
 function renderCompactLiveDisplay(terminal, block, config, totalTokens, elapsed, remaining) {
 	const width = terminal.width;
-	terminal.write(`${import_picocolors$4.default.bold(centerText("LIVE MONITOR", width))}\n`);
+	terminal.write(`${import_picocolors$5.default.bold(centerText("LIVE MONITOR", width))}\n`);
 	terminal.write(`${"─".repeat(width)}\n`);
 	const sessionPercent = elapsed / (elapsed + remaining) * 100;
 	terminal.write(`Session: ${sessionPercent.toFixed(1)}% (${Math.floor(elapsed / 60)}h ${Math.floor(elapsed % 60)}m)\n`);
 	if (config.tokenLimit != null && config.tokenLimit > 0) {
 		const tokenPercent = totalTokens / config.tokenLimit * 100;
-		const status = tokenPercent > 100 ? import_picocolors$4.default.red("OVER") : tokenPercent > 80 ? import_picocolors$4.default.yellow("WARN") : import_picocolors$4.default.green("OK");
+		const status = tokenPercent > 100 ? import_picocolors$5.default.red("OVER") : tokenPercent > 80 ? import_picocolors$5.default.yellow("WARN") : import_picocolors$5.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$4.default.gray(`Refresh: ${config.refreshInterval / 1e3}s | Ctrl+C: stop\n`));
+	terminal.write(import_picocolors$5.default.gray(`Refresh: ${config.refreshInterval / 1e3}s | Ctrl+C: stop\n`));
+}
+var import_picocolors$4 = __toESM(require_picocolors(), 1);
+var import_usingCtx = __toESM(require_usingCtx(), 1);
+async function startLiveMonitoring(config) {
+	try {
+		var _usingCtx = (0, import_usingCtx.default)();
+		const terminal = new TerminalManager();
+		const abortController = new AbortController();
+		let lastRenderTime = 0;
+		const cleanup = () => {
+			abortController.abort();
+			terminal.cleanup();
+			terminal.clearScreen();
+			logger.info("Live monitoring stopped.");
+			if (process$1.exitCode == null) process$1.exit(0);
+		};
+		process$1.on("SIGINT", cleanup);
+		process$1.on("SIGTERM", cleanup);
+		terminal.enterAlternateScreen();
+		terminal.enableSyncMode();
+		terminal.clearScreen();
+		terminal.hideCursor();
+		const monitor = _usingCtx.u(new LiveMonitor({
+			claudePath: config.claudePath,
+			sessionDurationHours: config.sessionDurationHours,
+			mode: config.mode,
+			order: config.order
+		}));
+		const monitoringResult = await try_({
+			try: async () => {
+				while (!abortController.signal.aborted) {
+					const now = Date.now();
+					const timeSinceLastRender = now - lastRenderTime;
+					if (timeSinceLastRender < MIN_RENDER_INTERVAL_MS) {
+						await delayWithAbort(MIN_RENDER_INTERVAL_MS - timeSinceLastRender, abortController.signal);
+						continue;
+					}
+					const activeBlock = await monitor.getActiveBlock();
+					monitor.clearCache();
+					if (activeBlock == null) {
+						await renderWaitingState(terminal, config, abortController.signal);
+						continue;
+					}
+					renderActiveBlock(terminal, activeBlock, config);
+					lastRenderTime = Date.now();
+					await delayWithAbort(config.refreshInterval, abortController.signal);
+				}
+			},
+			catch: (error) => error
+		})();
+		if (isFailure(monitoringResult)) {
+			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$4.default.red(`Error: ${errorMessage}\n`));
+			terminal.flush();
+			logger.error(`Live monitoring error: ${errorMessage}`);
+			await delayWithAbort(config.refreshInterval, abortController.signal).catch(() => {});
+		}
+	} catch (_) {
+		_usingCtx.e = _;
+	} finally {
+		_usingCtx.d();
+	}
 }
 var import_picocolors$3 = __toESM(require_picocolors(), 1);
 /**
@@ -4011,7 +4108,7 @@ const blocksCommand = define({
 		let maxTokensFromAll = 0;
 		if (ctx.values.tokenLimit === "max") {
 			for (const block of blocks) if (!(block.isGap ?? false) && !block.isActive) {
-				const blockTokens = block.tokenCounts.inputTokens + block.tokenCounts.outputTokens;
+				const blockTokens = getTotalTokens(block.tokenCounts);
 				if (blockTokens > maxTokensFromAll) maxTokensFromAll = blockTokens;
 			}
 			if (!ctx.values.json && maxTokensFromAll > 0) logger.info(`Using max tokens from previous sessions: ${formatNumber(maxTokensFromAll)}`);
@@ -4037,8 +4134,13 @@ const blocksCommand = define({
 			}
 			const refreshInterval = Math.max(MIN_REFRESH_INTERVAL_SECONDS, Math.min(MAX_REFRESH_INTERVAL_SECONDS, ctx.values.refreshInterval));
 			if (refreshInterval !== ctx.values.refreshInterval) logger.warn(`Refresh interval adjusted to ${refreshInterval} seconds (valid range: ${MIN_REFRESH_INTERVAL_SECONDS}-${MAX_REFRESH_INTERVAL_SECONDS})`);
+			const paths = getClaudePaths();
+			if (paths.length === 0) {
+				logger.error("No valid Claude data directory found");
+				throw new Error("No valid Claude data directory found");
+			}
 			await startLiveMonitoring({
-				claudePath: getDefaultClaudePath(),
+				claudePath: paths[0],
 				tokenLimit: parseTokenLimit(tokenLimitValue, maxTokensFromAll),
 				refreshInterval: refreshInterval * 1e3,
 				sessionDurationHours: ctx.values.sessionLength,
@@ -4073,7 +4175,8 @@ const blocksCommand = define({
 							percentUsed: projection.totalTokens / limit * 100,
 							status: projection.totalTokens > limit ? "exceeds" : projection.totalTokens > limit * BLOCKS_WARNING_THRESHOLD ? "warning" : "ok"
 						} : void 0;
-					})() : void 0
+					})() : void 0,
+					usageLimitResetTime: block.usageLimitResetTime
 				};
 			}) };
 			log(JSON.stringify(jsonOutput, null, 2));
@@ -4107,7 +4210,7 @@ const blocksCommand = define({
 				if (ctx.values.tokenLimit != null) {
 					const limit = parseTokenLimit(ctx.values.tokenLimit, maxTokensFromAll);
 					if (limit != null && limit > 0) {
-						const currentTokens = block.tokenCounts.inputTokens + block.tokenCounts.outputTokens;
+						const currentTokens = getTotalTokens(block.tokenCounts);
 						const remainingTokens = Math.max(0, limit - currentTokens);
 						const percentUsed = projection.totalTokens / limit * 100;
 						const status = percentUsed > 100 ? import_picocolors$3.default.red("EXCEEDS LIMIT") : percentUsed > BLOCKS_WARNING_THRESHOLD * 100 ? import_picocolors$3.default.yellow("WARNING") : import_picocolors$3.default.green("OK");
@@ -4158,7 +4261,7 @@ const blocksCommand = define({
 				gapRow.push(import_picocolors$3.default.gray("-"));
 				table.push(gapRow);
 			} else {
-				const totalTokens = block.tokenCounts.inputTokens + block.tokenCounts.outputTokens;
+				const totalTokens = getTotalTokens(block.tokenCounts);
 				const status = block.isActive ? import_picocolors$3.default.green("ACTIVE") : "";
 				const row = [
 					formatBlockTime(block, useCompactFormat),
@@ -4175,7 +4278,7 @@ const blocksCommand = define({
 				table.push(row);
 				if (block.isActive) {
 					if (actualTokenLimit != null && actualTokenLimit > 0) {
-						const currentTokens = block.tokenCounts.inputTokens + block.tokenCounts.outputTokens;
+						const currentTokens = getTotalTokens(block.tokenCounts);
 						const remainingTokens = Math.max(0, actualTokenLimit - currentTokens);
 						const remainingText = remainingTokens > 0 ? formatNumber(remainingTokens) : import_picocolors$3.default.red("0");
 						const remainingPercent = (actualTokenLimit - currentTokens) / actualTokenLimit * 100;
@@ -4732,8 +4835,13 @@ const mcpCommand = define({
 	async run(ctx) {
 		const { type, mode, port } = ctx.values;
 		if (type === "stdio") logger.level = 0;
+		const paths = getClaudePaths();
+		if (paths.length === 0) {
+			logger.error("No valid Claude data directory found");
+			throw new Error("No valid Claude data directory found");
+		}
 		const options = {
-			claudePath: getDefaultClaudePath(),
+			claudePath: paths[0],
 			mode
 		};
 		if (type === "stdio") {