Merge pull request #513 from rajbos/claude

Claude Code support

Author: rajbos

README.md

@@ -11,6 +11,7 @@ Track your GitHub Copilot token usage and AI Fluency across VS Code, Visual Stud
 - GitHub Copilot CLI
 - OpenCode + GitHub Copilot
 - Crush + GitHub Copilot
+- Claude Code (Anthropic)
 - Visual Studio + GitHub Copilot
 
 ---

cli/src/commands/stats.ts

@@ -137,6 +137,7 @@ function getEditorDisplayName(source: string): string {
 		'cursor': 'Cursor',
 		'copilot-cli': 'Copilot CLI',
 		'opencode': 'OpenCode',
+		'claude-code': 'Claude Code',
 	};
 	return names[source] || source;
 }

cli/src/helpers.ts

@@ -11,6 +11,7 @@ import { OpenCodeDataAccess } from '../../vscode-extension/src/opencode';
 import { CrushDataAccess } from '../../vscode-extension/src/crush';
 import { ContinueDataAccess } from '../../vscode-extension/src/continue';
 import { VisualStudioDataAccess } from '../../vscode-extension/src/visualstudio';
+import { ClaudeCodeDataAccess } from '../../vscode-extension/src/claudecode';
 import { parseSessionFileContent } from '../../vscode-extension/src/sessionParser';
 import { estimateTokensFromText, getModelFromRequest, isJsonlContent, estimateTokensFromJsonlSession, calculateEstimatedCost, getModelTier } from '../../vscode-extension/src/tokenEstimation';
 import type { DetailedStats, PeriodStats, ModelUsage, EditorUsage, SessionFileCache, UsageAnalysisStats, UsageAnalysisPeriod } from '../../vscode-extension/src/types';
@@ -60,15 +61,21 @@ function createVisualStudio(): VisualStudioDataAccess {
 	return new VisualStudioDataAccess();
 }
 
+/** Create Claude Code data access instance for CLI */
+function createClaudeCode(): ClaudeCodeDataAccess {
+	return new ClaudeCodeDataAccess();
+}
+
 // Module-level singletons so sql.js WASM is only initialised once across all session files
 const _openCodeInstance = createOpenCode();
 const _crushInstance = createCrush();
 const _continueInstance = createContinue();
 const _visualStudioInstance = createVisualStudio();
+const _claudeCodeInstance = createClaudeCode();
 
 /** Create session discovery instance for CLI */
 function createSessionDiscovery(): SessionDiscovery {
-	return new SessionDiscovery({ log, warn, error, openCode: _openCodeInstance, crush: _crushInstance, continue_: _continueInstance, visualStudio: _visualStudioInstance });
+	return new SessionDiscovery({ log, warn, error, openCode: _openCodeInstance, crush: _crushInstance, continue_: _continueInstance, visualStudio: _visualStudioInstance, claudeCode: _claudeCodeInstance });
 }
 
 /** Discover all session files on this machine */
@@ -136,6 +143,7 @@ function getEditorSourceFromPath(filePath: string): string {
 	if (normalized.includes('/.copilot/')) { return 'copilot-cli'; }
 	if (normalized.includes('/.crush/crush.db#')) { return 'crush'; }
 	if (normalized.includes('/opencode/')) { return 'opencode'; }
+	if (normalized.includes('/.claude/projects/')) { return 'claude-code'; }
 	if (normalized.includes('.vscode-server')) { return 'vscode-remote'; }
         if (normalized.includes('/.vs/') && normalized.includes('/copilot-chat/')) { return 'Visual Studio'; }
 	return 'vscode';
@@ -219,6 +227,24 @@ const crushResult: SessionData = {
                         return vsResult;
                 }
 
+		// Handle Claude Code sessions (JSONL with actual Anthropic API token counts)
+		if (_claudeCodeInstance.isClaudeCodeSessionFile(filePath)) {
+			const result = _claudeCodeInstance.getTokensFromClaudeCodeSession(filePath);
+			const interactions = _claudeCodeInstance.countClaudeCodeInteractions(filePath);
+			const modelUsage = _claudeCodeInstance.getClaudeCodeModelUsage(filePath);
+			const claudeResult: SessionData = {
+				file: filePath,
+				tokens: result.tokens,
+				thinkingTokens: result.thinkingTokens,
+				interactions,
+				modelUsage,
+				lastModified: stats.mtime,
+				editorSource: getEditorSourceFromPath(filePath),
+			};
+			setCached(filePath, stats.mtimeMs, stats.size, claudeResult);
+			return claudeResult;
+		}
+
 		const content = await fs.promises.readFile(filePath, 'utf-8');
 
 		if (!content.trim()) {
@@ -411,6 +437,7 @@ export async function calculateUsageAnalysisStats(sessionFiles: string[]): Promi
 		crush: _crushInstance,
 		continue_: _continueInstance,
 		visualStudio: _visualStudioInstance,
+		claudeCode: _claudeCodeInstance,
 		tokenEstimators,
 		modelPricing,
 		toolNameMap,

docs/cli/README.md

@@ -157,6 +157,7 @@ The CLI scans the same session files as the [VS Code extension](../vscode-extens
 - **VS Code Remote** / Codespaces sessions
 - **Copilot CLI** agent mode sessions
 - **OpenCode** sessions (JSON and SQLite)
+- **Claude Code** sessions (Anthropic CLI/IDE extension, actual API token counts)
 
 ---
 

docs/logFilesSchema/README.md

@@ -1,19 +1,29 @@
 # Session File Schema Documentation
 
-This directory contains documentation and analysis of GitHub Copilot session file schemas.
+This directory contains documentation and analysis of AI tool session file schemas.
 
 ## Files
 
 ### session-file-schema.json
-**Manually curated documentation** of the Copilot session file structure. This file describes:
+**Manually curated documentation** of the GitHub Copilot session file structure. This file describes:
 - File locations and formats (.json and .jsonl)
 - Complete schema for JSON session files
 - Complete schema for JSONL session files (both Copilot CLI and VS Code Incremental formats)
 - Links to official vscode-copilot-chat repository source code
 - Which fields the extension actually uses
 - Detailed descriptions and examples
 
-This is the **primary reference** for understanding session file structure.
+This is the **primary reference** for understanding Copilot session file structure.
+
+### claude-code-session-schema.json
+**Manually curated documentation** of the Claude Code (Anthropic CLI/IDE extension) session file structure. This file describes:
+- File locations: `~/.claude/projects/{project-hash}/{session-uuid}.jsonl` and subagent files
+- All event types: `user`, `assistant`, `queue-operation`, `file-history-snapshot`, `ai-title`
+- The `assistant.message.usage` object containing **actual Anthropic API token counts** (no estimation needed)
+- Prompt cache token fields: `cache_creation_input_tokens`, `cache_read_input_tokens`
+- Sub-agent session structure and how it differs from the main session
+- The `~/.claude/stats-cache.json` pre-aggregated stats format
+- Integration guidance for extending the token tracker to support Claude Code
 
 ### session-file-schema-analysis.json
 **Auto-generated analysis** from actual session files on disk. Generated by running:
@@ -28,13 +38,14 @@ Contains:
 
 ## Session File Formats
 
-The extension supports three distinct session file formats:
+The extension supports the following session file formats:
 
-| Format | Extension | Location | Discriminator |
-|--------|-----------|----------|---------------|
-| **JSON** | `.json` | workspaceStorage, globalStorage | N/A (standard JSON) |
-| **JSONL CLI** | `.jsonl` | `~/.copilot/session-state/` | `type` field (string) |
-| **JSONL Incremental** | `.jsonl` | workspaceStorage (VS Code Insiders) | `kind` field (number) |
+| Format | Tool | Extension | Location | Discriminator |
+|--------|------|-----------|----------|---------------|
+| **JSON** | GitHub Copilot | `.json` | workspaceStorage, globalStorage | N/A (standard JSON) |
+| **JSONL CLI** | GitHub Copilot | `.jsonl` | `~/.copilot/session-state/` | `type` field (string) |
+| **JSONL Incremental** | GitHub Copilot | `.jsonl` | workspaceStorage (VS Code Insiders) | `kind` field (number) |
+| **JSONL Claude Code** | Claude Code (Anthropic) | `.jsonl` | `~/.claude/projects/{hash}/` | Path-based: `~/.claude/` prefix |
 
 ### JSONL Format Detection
 
@@ -51,8 +62,17 @@ VS Code Insiders introduced a new incremental JSONL format that stores session d
 
 See `session-file-schema.json` → `jsonlIncrementalSchema` for full details.
 
-## Official Source References
+### Claude Code Format (New)
+
+Claude Code (Anthropic's CLI/IDE extension) writes sessions to `~/.claude/projects/{project-hash}/{session-uuid}.jsonl`:
+- Each line is a `user`, `assistant`, `queue-operation`, `file-history-snapshot`, or `ai-title` event
+- **Key advantage**: Assistant events contain actual Anthropic API token counts in `message.usage` — no estimation needed
+- Includes prompt cache fields: `cache_creation_input_tokens`, `cache_read_input_tokens`
+- Sub-agents are stored in `{session-uuid}/subagents/{agent-id}.jsonl`
 
+See `claude-code-session-schema.json` for full details.
+
+## Official Source References
 
 The session file schemas are defined in the following repositories: