apps/ccusage/config-schema.json (1)

651-705: ⚠️ Potential issue | 🟡 Minor

Add customDirs to the statusline command schema.

statusline.ts exposes customDirs, but commands.statusline still has additionalProperties: false without a customDirs property, so command-specific statusline config is rejected by schema validation/autocomplete.

Proposed schema addition

 								"debug": {
 									"type": "boolean",
 									"description": "Show pricing mismatch information for debugging",
 									"markdownDescription": "Show pricing mismatch information for debugging",
 									"default": false
+								},
+								"customDirs": {
+									"type": "string",
+									"description": "Additional Claude data directories to include (comma-separated paths). Each must contain a projects/ subdirectory.",
+									"markdownDescription": "Additional Claude data directories to include (comma-separated paths). Each must contain a projects/ subdirectory."
 								}

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@apps/ccusage/config-schema.json` around lines 651 - 705, Add a new
"customDirs" property to the "statusline" object schema so the CLI accepts the
statusline.ts option; specifically, inside the "statusline" properties (the same
object containing "offline", "visualBurnRate", "costSource", etc.) add
"customDirs" with type "array" and items of type "string", include a short
"description"/"markdownDescription" and a sensible "default" (e.g., an empty
array), leaving "additionalProperties": false in place; this ensures the
statusline configuration (and the statusline.ts exported customDirs) validates
and is autocompleted.

apps/ccusage/src/data-loader.ts (1)

98-138: ⚠️ Potential issue | 🟠 Major

Align path merging and ~/ expansion across all path sources.

The new docs describe customDirs as additive to defaults and CLAUDE_CONFIG_DIR, but this branch still skips defaults whenever CLAUDE_CONFIG_DIR is set. Also, ~/ expansion is applied only to customDirs, so CLAUDE_CONFIG_DIR="~/.claude" is resolved relative to the cwd instead of the home directory.

Centralize parsing/normalization and add defaults independently of env/custom sources.

🐛 Proposed direction

 export function getClaudePaths(customDirs?: string): string[] {
 	const paths: string[] = [];
 	const normalizedPaths = new Set<string>();

+	function expandHome(dirPath: string): string {
+		return dirPath.startsWith("~/")
+			? path.join(USER_HOME_DIR, dirPath.slice(2))
+			: dirPath;
+	}
+
+	function parsePathList(pathList: string): string[] {
+		return pathList
+			.split(",")
+			.map((p) => p.trim())
+			.filter((p) => p !== "")
+			.map(expandHome);
+	}
+
 	/**
 	 * Try to add a directory path if it's valid (exists and has projects/ subdir)
 	 */
 	function addIfValid(dirPath: string): void {
 		const normalizedPath = path.resolve(dirPath);
 		if (isDirectorySync(normalizedPath)) {
 			const projectsPath = path.join(normalizedPath, CLAUDE_PROJECTS_DIR_NAME);
 			if (isDirectorySync(projectsPath)) {
 				if (!normalizedPaths.has(normalizedPath)) {
 					normalizedPaths.add(normalizedPath);
 					paths.push(normalizedPath);
 				}
 			}
 		}
 	}

-	// Check environment variable first (supports comma-separated paths)
+	// Always include standard Claude locations first.
+	const defaultPaths = [
+		DEFAULT_CLAUDE_CONFIG_PATH,
+		path.join(USER_HOME_DIR, DEFAULT_CLAUDE_CODE_PATH),
+	];
+	for (const defaultPath of defaultPaths) {
+		addIfValid(defaultPath);
+	}
+
+	// Add environment variable paths (supports comma-separated paths)
 	const envPaths = (process.env[CLAUDE_CONFIG_DIR_ENV] ?? '').trim();
 	if (envPaths !== '') {
-		const envPathList = envPaths
-			.split(',')
-			.map((p) => p.trim())
-			.filter((p) => p !== '');
-		for (const envPath of envPathList) {
+		for (const envPath of parsePathList(envPaths)) {
 			addIfValid(envPath);
 		}
-		// If environment variable is set but no valid paths found (before custom dirs), throw error
-		if (paths.length === 0 && (customDirs == null || customDirs.trim() === '')) {
-			throw new Error(
-				`No valid Claude data directories found in CLAUDE_CONFIG_DIR. Please ensure the following exists:
-- ${envPaths}/${CLAUDE_PROJECTS_DIR_NAME}`.trim(),
-			);
-		}
-	} else {
-		// Only check default paths if no environment variable is set
-		const defaultPaths = [
-			DEFAULT_CLAUDE_CONFIG_PATH, // New default: XDG config directory
-			path.join(USER_HOME_DIR, DEFAULT_CLAUDE_CODE_PATH), // Old default: ~/.claude
-		];
-
-		for (const defaultPath of defaultPaths) {
-			addIfValid(defaultPath);
-		}
 	}

 	// Add custom directories (always, regardless of env var)
 	if (customDirs != null && customDirs.trim() !== '') {
-		const customDirList = customDirs
-			.split(',')
-			.map((p) => p.trim())
-			.filter((p) => p !== '');
-		for (const customDir of customDirList) {
-			// Expand ~ to home directory
-			const expandedPath = customDir.startsWith('~/')
-				? path.join(USER_HOME_DIR, customDir.slice(2))
-				: customDir;
-			addIfValid(expandedPath);
+		for (const customDir of parsePathList(customDirs)) {
+			addIfValid(customDir);
 		}
 	}

🤖 Prompt for AI Agents

Verify each finding against the current code and only fix it if needed.

In `@apps/ccusage/src/data-loader.ts` around lines 98 - 138, The code currently
treats CLAUDE_CONFIG_DIR as replacing defaults and only expands "~/" for
customDirs; update the path-collection logic so defaults
(DEFAULT_CLAUDE_CONFIG_PATH and path.join(USER_HOME_DIR,
DEFAULT_CLAUDE_CODE_PATH)) are always included, and parse/normalize all sources
(env via CLAUDE_CONFIG_DIR_ENV, customDirs, and defaults) using a single helper
normalization step that expands "~/" using USER_HOME_DIR, trims, splits comma
lists, filters empties, and then calls addIfValid for each resolved path; ensure
the branch that reads CLAUDE_CONFIG_DIR no longer skips adding defaults and
throw the existing error only after normalization if paths remains empty.