feat!: specify claude dir with CLAUDE_CONFIG_DIR and remove -p/--path option
#70
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ import { | |
| createTotalsObject, | ||
| getTotalTokens, | ||
| } from '../calculate-cost.ts'; | ||
| import { getDefaultClaudePath, loadMonthlyUsageData } from '../data-loader.ts'; | ||
| import { detectMismatches, printMismatchReport } from '../debug.ts'; | ||
| import { log, logger } from '../logger.ts'; | ||
| import { sharedCommandConfig } from '../shared-args.internal.ts'; | ||
|
|
@@ -25,7 +25,7 @@ export const monthlyCommand = define({ | |
| const monthlyData = await loadMonthlyUsageData({ | ||
| since: ctx.values.since, | ||
| until: ctx.values.until, | ||
| claudePath: getDefaultClaudePath(), | ||
| mode: ctx.values.mode, | ||
| order: ctx.values.order, | ||
| }); | ||
|
Comment on lines
25
to
31
There was a problem hiding this comment. 🛠️ Refactor suggestion Reuse a single Same duplication pattern as in - const monthlyData = await loadMonthlyUsageData({
+ const claudePath = getDefaultClaudePath();
+ const monthlyData = await loadMonthlyUsageData({
since: ctx.values.since,
until: ctx.values.until,
- claudePath: getDefaultClaudePath(),
+ claudePath,
mode: ctx.values.mode,
order: ctx.values.order,
});
…
- const mismatchStats = await detectMismatches(getDefaultClaudePath());
+ const mismatchStats = await detectMismatches(claudePath);Also applies to: 57-60 🧰 Tools🪛 ESLint[error] 26-26: Unsafe assignment of an (ts/no-unsafe-assignment) [error] 26-26: Unsafe member access .values on an (ts/no-unsafe-member-access) [error] 27-27: Unsafe assignment of an (ts/no-unsafe-assignment) [error] 27-27: Unsafe member access .values on an (ts/no-unsafe-member-access) [error] 29-29: Unsafe member access .values on an (ts/no-unsafe-member-access) [error] 30-30: Unsafe member access .values on an (ts/no-unsafe-member-access) 🤖 Prompt for AI Agents |
||
|
|
@@ -56,7 +56,7 @@ export const monthlyCommand = define({ | |
|
|
||
| // Show debug information if requested | ||
| if (ctx.values.debug && !ctx.values.json) { | ||
| const mismatchStats = await detectMismatches(getDefaultClaudePath()); | ||
| printMismatchReport(mismatchStats, ctx.values.debugSamples); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ import { | |
| createTotalsObject, | ||
| getTotalTokens, | ||
| } from '../calculate-cost.ts'; | ||
| import { getDefaultClaudePath, loadSessionData } from '../data-loader.ts'; | ||
| import { detectMismatches, printMismatchReport } from '../debug.ts'; | ||
| import { log, logger } from '../logger.ts'; | ||
| import { sharedCommandConfig } from '../shared-args.internal.ts'; | ||
|
|
@@ -25,7 +25,7 @@ export const sessionCommand = define({ | |
| const sessionData = await loadSessionData({ | ||
| since: ctx.values.since, | ||
| until: ctx.values.until, | ||
| claudePath: getDefaultClaudePath(), | ||
| mode: ctx.values.mode, | ||
| order: ctx.values.order, | ||
| }); | ||
|
Comment on lines
25
to
31
There was a problem hiding this comment. 🛠️ Refactor suggestion Deduplicate Mirror the optimisation applied to the other commands. - const sessionData = await loadSessionData({
+ const claudePath = getDefaultClaudePath();
+ const sessionData = await loadSessionData({
since: ctx.values.since,
until: ctx.values.until,
- claudePath: getDefaultClaudePath(),
+ claudePath,
mode: ctx.values.mode,
order: ctx.values.order,
});
…
- const mismatchStats = await detectMismatches(getDefaultClaudePath());
+ const mismatchStats = await detectMismatches(claudePath);Also applies to: 46-49 🧰 Tools🪛 ESLint[error] 26-26: Unsafe assignment of an (ts/no-unsafe-assignment) [error] 26-26: Unsafe member access .values on an (ts/no-unsafe-member-access) [error] 27-27: Unsafe assignment of an (ts/no-unsafe-assignment) [error] 27-27: Unsafe member access .values on an (ts/no-unsafe-member-access) [error] 29-29: Unsafe member access .values on an (ts/no-unsafe-member-access) [error] 30-30: Unsafe member access .values on an (ts/no-unsafe-member-access) 🤖 Prompt for AI Agents |
||
|
|
@@ -45,7 +45,7 @@ export const sessionCommand = define({ | |
|
|
||
| // Show debug information if requested | ||
| if (ctx.values.debug && !ctx.values.json) { | ||
| const mismatchStats = await detectMismatches(getDefaultClaudePath()); | ||
| printMismatchReport(mismatchStats, ctx.values.debugSamples); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,12 @@ | ||
| import { homedir } from 'node:os'; | ||
| import { join } from 'node:path'; | ||
| import process from 'node:process'; | ||
| import { afterEach, beforeEach, describe, expect, test } from 'bun:test'; | ||
| import { createFixture } from 'fs-fixture'; | ||
| import { | ||
| calculateCostForEntry, | ||
| formatDate, | ||
| getDefaultClaudePath, | ||
| loadDailyUsageData, | ||
| loadMonthlyUsageData, | ||
| loadSessionData, | ||
|
|
@@ -29,6 +33,74 @@ describe('formatDate', () => { | |
| }); | ||
| }); | ||
|
|
||
| describe('getDefaultClaudePath', () => { | ||
| const originalEnv = process.env.CLAUDE_CONFIG_DIR; | ||
|
|
||
| beforeEach(() => { | ||
| // Clean up env var before each test | ||
| delete process.env.CLAUDE_CONFIG_DIR; | ||
| }); | ||
|
|
||
| afterEach(() => { | ||
| // Restore original environment | ||
| if (originalEnv != null) { | ||
| process.env.CLAUDE_CONFIG_DIR = originalEnv; | ||
| } | ||
| else { | ||
| delete process.env.CLAUDE_CONFIG_DIR; | ||
| } | ||
| }); | ||
|
|
||
| test('returns CLAUDE_CONFIG_DIR when environment variable is set', async () => { | ||
| await using fixture = await createFixture({ | ||
| claude: {}, | ||
| }); | ||
| process.env.CLAUDE_CONFIG_DIR = fixture.path; | ||
|
|
||
| expect(getDefaultClaudePath()).toBe(fixture.path); | ||
| }); | ||
|
|
||
| test('returns default path when CLAUDE_CONFIG_DIR is not set', () => { | ||
| // Ensure CLAUDE_CONFIG_DIR is not set | ||
| delete process.env.CLAUDE_CONFIG_DIR; | ||
|
|
||
| // Test that it returns the default path (which ends with .claude) | ||
| const actualPath = getDefaultClaudePath(); | ||
| expect(actualPath).toMatch(/\.claude$/); | ||
| expect(actualPath).toContain(homedir()); | ||
| }); | ||
|
|
||
| test('returns default path with trimmed CLAUDE_CONFIG_DIR', async () => { | ||
| await using fixture = await createFixture({ | ||
| claude: {}, | ||
| }); | ||
| // Test with extra spaces | ||
| process.env.CLAUDE_CONFIG_DIR = ` ${fixture.path} `; | ||
|
|
||
| expect(getDefaultClaudePath()).toBe(fixture.path); | ||
| }); | ||
|
|
||
| test('throws an error when CLAUDE_CONFIG_DIR is not a directory', async () => { | ||
| await using fixture = await createFixture(); | ||
| process.env.CLAUDE_CONFIG_DIR = join(fixture.path, 'not-a-directory'); | ||
|
|
||
| expect(() => getDefaultClaudePath()).toThrow(/Claude data directory does not exist/); | ||
| }); | ||
|
|
||
| test('throws an error when CLAUDE_CONFIG_DIR does not exist', async () => { | ||
| process.env.CLAUDE_CONFIG_DIR = '/nonexistent/path/that/does/not/exist'; | ||
|
|
||
| expect(() => getDefaultClaudePath()).toThrow(/Claude data directory does not exist/); | ||
| }); | ||
|
|
||
| test('throws an error when default path does not exist', () => { | ||
| // Set to a non-existent path | ||
| process.env.CLAUDE_CONFIG_DIR = '/nonexistent/path/.claude'; | ||
|
|
||
| expect(() => getDefaultClaudePath()).toThrow(/Claude data directory does not exist/); | ||
| }); | ||
| }); | ||
|
|
||
| describe('loadDailyUsageData', () => { | ||
| test('returns empty array when no files found', async () => { | ||
| await using fixture = await createFixture({ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,18 +2,34 @@ import type { CostMode, SortOrder } from './types.internal.ts'; | |
| import { readFile } from 'node:fs/promises'; | ||
| import { homedir } from 'node:os'; | ||
| import path from 'node:path'; | ||
| import process from 'node:process'; | ||
| import { unreachable } from '@core/errorutil'; | ||
| import { groupBy } from 'es-toolkit'; // TODO: after node20 is deprecated, switch to native Object.groupBy | ||
| import { sort } from 'fast-sort'; | ||
| import { isDirectorySync } from 'path-type'; | ||
| import { glob } from 'tinyglobby'; | ||
| import * as v from 'valibot'; | ||
| import { logger } from './logger.ts'; | ||
| import { | ||
| PricingFetcher, | ||
| } from './pricing-fetcher.ts'; | ||
|
|
||
| const DEFAULT_CLAUDE_CODE_PATH = path.join(homedir(), '.claude'); | ||
|
|
||
| /** | ||
| * Default path for Claude data directory | ||
| * Uses environment variable CLAUDE_CONFIG_DIR if set, otherwise defaults to ~/.claude | ||
| */ | ||
| export function getDefaultClaudePath(): string { | ||
| const envClaudeCodePath = process.env.CLAUDE_CONFIG_DIR?.trim() ?? DEFAULT_CLAUDE_CODE_PATH; | ||
| if (!isDirectorySync(envClaudeCodePath)) { | ||
| throw new Error( | ||
| ` Claude data directory does not exist: ${envClaudeCodePath}. | ||
| Please set CLAUDE_CONFIG_DIR to a valid path, or ensure ${DEFAULT_CLAUDE_CODE_PATH} exists. | ||
| `.trim(), | ||
| ); | ||
| } | ||
|
Comment on lines
+24
to
+31
There was a problem hiding this comment. Guard against empty/undefined
This currently crashes the whole process (see CI failure).
export function getDefaultClaudePath(): string {
- const envClaudeCodePath = process.env.CLAUDE_CONFIG_DIR?.trim() ?? DEFAULT_CLAUDE_CODE_PATH;
- if (!isDirectorySync(envClaudeCodePath)) {
- throw new Error(
- ` Claude data directory does not exist: ${envClaudeCodePath}.
-Please set CLAUDE_CONFIG_DIR to a valid path, or ensure ${DEFAULT_CLAUDE_CODE_PATH} exists.
- `.trim(),
- );
- }
- return envClaudeCodePath;
+ const raw = process.env.CLAUDE_CONFIG_DIR;
+ const envPath = raw?.trim();
+
+ // If the user explicitly provided a path, validate it
+ if (envPath && envPath.length > 0) {
+ if (!isDirectorySync(envPath)) {
+ throw new Error(`CLAUDE_CONFIG_DIR points to a non-existent directory: ${envPath}`);
+ }
+ return envPath;
+ }
+
+ // Fallback to default path (preserves previous non-blocking behaviour)
+ return DEFAULT_CLAUDE_CODE_PATH;
}This prevents the empty-string crash, keeps the strict check for explicit custom paths, and lets CI/tests run without needing to create 🧰 Tools🪛 ESLint[error] 24-24: Unsafe assignment of an error typed value. (ts/no-unsafe-assignment) [error] 24-24: Unsafe call of a(n) (ts/no-unsafe-call) [error] 24-24: Unsafe member access .env on an (ts/no-unsafe-member-access) [error] 25-25: Unexpected any value in conditional. An explicit comparison or type conversion is required. (ts/strict-boolean-expressions) [error] 25-25: Unsafe call of a(n) (ts/no-unsafe-call) 🪛 GitHub Check: ci[failure] 26-26: error: Claude data directory does not exist: /home/runner/.claude. 🤖 Prompt for AI Agents |
||
| return envClaudeCodePath; | ||
| } | ||
|
|
||
| export const UsageDataSchema = v.object({ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,6 @@ | ||
| import type { Args } from 'gunshi'; | ||
| import type { CostMode, SortOrder } from './types.internal.ts'; | ||
| import * as v from 'valibot'; | ||
| import { CostModes, dateSchema, SortOrders } from './types.internal.ts'; | ||
|
|
||
| function parseDateArg(value: string): string { | ||
|
|
@@ -25,12 +24,6 @@ export const sharedArgs = { | |
| description: 'Filter until date (YYYYMMDD format)', | ||
| parse: parseDateArg, | ||
| }, | ||
| json: { | ||
| type: 'boolean', | ||
| short: 'j', | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🛠️ Refactor suggestion
Cache the resolved Claude path once instead of invoking
getDefaultClaudePath()twicegetDefaultClaudePath()performs I/O + validation on every call.Resolve it once, reuse it for both
loadDailyUsageDataanddetectMismatches, and avoid the (minor) overhead while guaranteeing both calls operate on the identical directory.Also applies to: 46-49
🧰 Tools
🪛 ESLint
[error] 26-26: Unsafe assignment of an
anyvalue.(ts/no-unsafe-assignment)
[error] 26-26: Unsafe member access .values on an
anyvalue.(ts/no-unsafe-member-access)
[error] 27-27: Unsafe assignment of an
anyvalue.(ts/no-unsafe-assignment)
[error] 27-27: Unsafe member access .values on an
anyvalue.(ts/no-unsafe-member-access)
[error] 29-29: Unsafe member access .values on an
anyvalue.(ts/no-unsafe-member-access)
[error] 30-30: Unsafe member access .values on an
anyvalue.(ts/no-unsafe-member-access)
🤖 Prompt for AI Agents