fix: address PR review feedback

a-c-m · a-c-m · commit f2b808e0a072 · 2025-06-16T20:11:44.000+01:00
- Extract repeated token limit parsing logic into parseTokenLimit helper function - Add debug logging for skipped invalid JSON lines in data loader - Update FiveHourBlock type documentation to clarify gap block endTime semantics - Add blocks-specific options documentation to README Addresses feedback from code review bots on PR #23
diff --git a/README.md b/README.md
@@ -257,7 +257,12 @@ The blocks report helps you understand Claude Code's 5-hour rolling session wind
 - Sessions start with your first message and last for 5 hours
 - Shows active blocks with time remaining and burn rate projections
 - Helps track if you're approaching token limits within a session
-- The `-t max` option automatically uses your highest previous session as the limit
+- The `-t max` option automatically uses your highest previous block as the limit
+
+#### Blocks-specific options:
+- `-t, --token-limit <number|max>`: Set token limit for quota warnings (use "max" for highest previous block)
+- `-a, --active`: Show only active block with detailed projections
+- `-r, --recent`: Show blocks from last 3 days (including active)
 
 ### Options
 
diff --git a/src/commands/blocks.ts b/src/commands/blocks.ts
@@ -50,6 +50,15 @@ function formatModels(models: string[]): string {
 	return `${models[0]} +${models.length - 1}`;
 }
 
+function parseTokenLimit(value: string | undefined, maxFromAll: number): number | undefined {
+	if (!value) { return undefined; }
+	if (value === 'max') {
+		return maxFromAll > 0 ? maxFromAll : undefined;
+	}
+	const limit = Number.parseInt(value, 10);
+	return Number.isNaN(limit) ? undefined : limit;
+}
+
 export const blocksCommand = define({
 	name: 'blocks',
 	description: 'Show usage report grouped by 5-hour billing blocks',
@@ -156,18 +165,7 @@ export const blocksCommand = define({
 						projection,
 						tokenLimitStatus: projection && ctx.values.tokenLimit
 							? (() => {
-									let limit: number | undefined;
-									if (ctx.values.tokenLimit === 'max') {
-										// Use the max calculated from ALL blocks before filtering
-										limit = maxTokensFromAll > 0 ? maxTokensFromAll : undefined;
-									}
-									else {
-										limit = Number.parseInt(ctx.values.tokenLimit, 10);
-										if (isNaN(limit)) {
-											limit = undefined;
-										}
-									}
-
+									const limit = parseTokenLimit(ctx.values.tokenLimit, maxTokensFromAll);
 									return limit
 										? {
 												limit,
@@ -229,18 +227,7 @@ export const blocksCommand = define({
 
 					if (ctx.values.tokenLimit) {
 						// Parse token limit
-						let limit: number | undefined;
-						if (ctx.values.tokenLimit === 'max') {
-							// Use the max calculated from ALL blocks before filtering
-							limit = maxTokensFromAll > 0 ? maxTokensFromAll : undefined;
-						}
-						else {
-							limit = Number.parseInt(ctx.values.tokenLimit, 10);
-							if (isNaN(limit)) {
-								limit = undefined;
-							}
-						}
-
+						const limit = parseTokenLimit(ctx.values.tokenLimit, maxTokensFromAll);
 						if (limit) {
 							const currentTokens = block.tokenCounts.inputTokens + block.tokenCounts.outputTokens;
 							const remainingTokens = Math.max(0, limit - currentTokens);
@@ -265,19 +252,7 @@ export const blocksCommand = define({
 				logger.box('Claude Code Token Usage Report - 5-Hour Blocks');
 
 				// Calculate token limit if "max" is specified
-				let actualTokenLimit: number | undefined;
-				if (ctx.values.tokenLimit) {
-					if (ctx.values.tokenLimit === 'max') {
-						// Use the max calculated from ALL blocks before filtering
-						actualTokenLimit = maxTokensFromAll > 0 ? maxTokensFromAll : undefined;
-					}
-					else {
-						actualTokenLimit = Number.parseInt(ctx.values.tokenLimit, 10);
-						if (isNaN(actualTokenLimit)) {
-							actualTokenLimit = undefined;
-						}
-					}
-				}
+				const actualTokenLimit = parseTokenLimit(ctx.values.tokenLimit, maxTokensFromAll);
 
 				const tableHeaders = ['Block Start', 'Duration/Status', 'Models', 'Tokens'];
 				const tableAligns: ('left' | 'right')[] = ['left', 'left', 'left', 'right'];
diff --git a/src/data-loader.ts b/src/data-loader.ts
@@ -883,8 +883,9 @@ export async function loadFiveHourBlockData(
 					version: data.version,
 				});
 			}
-			catch {
-				// Skip invalid JSON lines
+			catch (error) {
+				// Skip invalid JSON lines but log for debugging purposes
+				logger.debug(`Skipping invalid JSON line in 5-hour blocks: ${error instanceof Error ? error.message : String(error)}`);
 			}
 		}
 	}
diff --git a/src/utils/five-hour-blocks.ts b/src/utils/five-hour-blocks.ts
@@ -23,7 +23,7 @@ export type TokenCounts = {
 export type FiveHourBlock = {
 	id: string; // ISO string of block start time
 	startTime: Date;
-	endTime: Date; // startTime + 5 hours
+	endTime: Date; // startTime + 5 hours (for normal blocks) or gap end time (for gap blocks)
 	actualEndTime?: Date; // Last activity in block
 	isActive: boolean;
 	isGap?: boolean; // True if this is a gap block

Original file line number	Diff line number	Diff line change
`@@ -883,8 +883,9 @@ export async function loadFiveHourBlockData(`
`883`	`883`	`version: data.version,`
`884`	`884`	`});`
`885`	`885`	`}`
`886`		`- catch {`
`887`		`- // Skip invalid JSON lines`
	`886`	`+ catch (error) {`
	`887`	`+ // Skip invalid JSON lines but log for debugging purposes`
	`888`	+ logger.debug(`Skipping invalid JSON line in 5-hour blocks: ${error instanceof Error ? error.message : String(error)}`);
`888`	`889`	`}`
`889`	`890`	`}`
`890`	`891`	`}`