@say8425/cc-statusline 1.4.0 → 2.0.1

package/README.md

@@ -23,13 +23,6 @@ Add the following to `~/.claude/settings.json`:
 }
 ```
 
-## CLI Options
-
-| Option | Description | Default |
-|--------|-------------|:-------:|
-| [`--plan <plan>`](#plan-selection) | Set token limit for your subscription (pro, max5x, max20x) | `pro` |
-| [`--no-usage`](#disable) | Hide usage metrics line | - |
-
 ## Screenshots
 
 ### Git diff only
@@ -44,21 +37,9 @@ Add the following to `~/.claude/settings.json`:
 
 ![scenario3_diff_pr](docs/scenario3_diff_pr.png)
 
-### Context Normal (< 50%)
-
-![Screenshot of status line with normal context usage, under 50%](docs/context_normal.png)
-
-### Context Warning (50-80%)
-
-![Screenshot of status line with warning context usage, between 50% and 80%](docs/context_warning.png)
-
-### Context Critical (> 80%)
-
-![Screenshot of status line with critical context usage, over 80%](docs/context_critical.png)
+### Usage Metrics
 
-### Limit Reset Timer
-
-![Screenshot of status line with limit reset timer](docs/limit_reset.png)
+![Screenshot of status line with usage metrics](docs/usage_metrics.png)
 
 ## Features
 
@@ -68,9 +49,10 @@ Add the following to `~/.claude/settings.json`:
 - **Git Diff**: File count, insertions, deletions
 - **PR URL**: Clickable OSC 8 hyperlink
 - **TrueColor**: Dynamic colors based on thresholds
-- **Limit Reset Timer**: Countdown to usage limit reset
-- **Block Usage**: 5-hour block token usage with percentage
-- **Burn Rate**: Token consumption rate per minute
+- **Limit Reset Time**: Reset time display (HH:MM)
+- **Block Usage**: 5-hour utilization percentage (from server API)
+- **Weekly Reset Timer**: Weekly limit reset time (MM/DD HH:MM)
+- **Weekly Usage**: 7-day utilization percentage (from server API)
 
 ## Emoji Guide
 
@@ -81,56 +63,41 @@ Add the following to `~/.claude/settings.json`:
 | ⏱️    | Session elapsed time     |
 | 💰    | Session cost in USD      |
 | 🧠    | Context window usage     |
-| ⏳    | Limit reset countdown    |
-| 📊    | 5-hour block token usage |
-| 🔥    | Token burn rate (per min)|
+| ⏳    | Limit reset time         |
+| 📊    | 5-hour utilization %     |
+| ⏰    | Weekly limit reset time  |
+| 📅    | 7-day utilization %      |
 | ✏️    | Uncommitted changes      |
 | 📎    | Pull request link        |
 
 ## Usage Metrics
 
-Shows usage information for the 5-hour billing block.
-
-### How It Works
-
-Automatically parses JSONL files from `~/.claude/projects/` to detect:
+Shows usage information from the Anthropic Usage API.
 
-1. **Usage limit error messages** - Extracts exact reset time from "Claude AI usage limit reached" errors
-2. **5-hour billing blocks** - Calculates block end time based on latest activity (like [ccusage](https://github.com/ryoppippi/ccusage))
-3. **Token usage** - Sums input and output tokens within the current 5-hour block
-4. **Burn rate** - Calculates average token consumption per minute
+> [!WARNING]
+> The `--show-usage` feature uses an unofficial, reverse-engineered Anthropic API endpoint to retrieve usage data. This is not an officially supported API, and may break or change at any time without notice. **Use at your own risk.** The author assumes no responsibility for any consequences, including but not limited to account restrictions or service disruptions, that may arise from the use of this feature.
 
-No manual configuration required.
+> [!NOTE]
+> This feature is **macOS only** as it reads the OAuth token from macOS Keychain (`Claude Code-credentials`).
 
-### Plan Selection
-
-Different Claude Code plans have different token limits. Use the `--plan` flag to set your plan:
+### How It Works
 
-```json
-{
-  "statusLine": {
-    "type": "command",
-    "command": "bunx @say8425/cc-statusline --plan max5x",
-    "padding": 0
-  }
-}
-```
+Calls the Anthropic Usage API (`/api/oauth/usage`) using the OAuth access token from macOS Keychain to retrieve:
 
-| Plan | Token Limit | Command |
-|------|-------------|---------|
-| Pro (default) | 450K | `--plan pro` or omit |
-| Max 5x | 2.25M | `--plan max5x` |
-| Max 20x | 9M | `--plan max20x` |
+1. **5-hour utilization** - Server-calculated usage percentage for the current billing block
+2. **7-day utilization** - Server-calculated weekly usage percentage
+3. **Reset timer** - Exact reset time from the server (`five_hour.resets_at`)
+4. **Weekly reset timer** - Weekly limit reset time (`seven_day.resets_at`), shown as `MM/DD HH:MM` (e.g., `02/15 17:00`)
 
-### Disable
+### Enable
 
-To hide the usage metrics line (reset timer, block usage, burn rate), use the `--no-usage` flag:
+Usage metrics are **hidden by default**. To enable, use the `--show-usage` flag:
 
 ```json
 {
   "statusLine": {
     "type": "command",
-    "command": "bunx @say8425/cc-statusline --no-usage",
+    "command": "bunx @say8425/cc-statusline --show-usage",
     "padding": 0
   }
 }
@@ -141,6 +108,25 @@ To hide the usage metrics line (reset timer, block usage, burn rate), use the `-
 - [Bun](https://bun.sh) - JavaScript runtime
 - [gh](https://cli.github.com) - GitHub CLI (optional, for PR URL)
 
+## Development
+
+```bash
+# Install dependencies
+bun install
+
+# Run tests
+bun test
+
+# Run tests with coverage
+bun test --coverage
+
+# Type check
+bun run typecheck
+
+# Lint
+bun run lint
+```
+
 ## Color Thresholds
 
 | Metric        | Normal (white) | Warning (yellow) | Critical (red) |

package/package.json

@@ -1,32 +1,32 @@
 {
-  "name": "@say8425/cc-statusline",
-  "version": "1.4.0",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/say8425/cc-statusline.git"
-  },
-  "devDependencies": {
-    "@biomejs/biome": "^2.3.9",
-    "@types/bun": "latest",
-    "typescript": "^5.9.3"
-  },
-  "bin": {
-    "cc-statusline": "src/index.ts"
-  },
-  "description": "Custom statusline for Claude Code",
-  "files": [
-    "src/index.ts"
-  ],
-  "publishConfig": {
-    "registry": "https://registry.npmjs.org"
-  },
-  "scripts": {
-    "start": "bun src/index.ts",
-    "lint": "biome check src/",
-    "typecheck": "tsc --noEmit"
-  },
-  "type": "module",
-  "dependencies": {
-    "ccusage": "^18.0.5"
-  }
+	"name": "@say8425/cc-statusline",
+	"version": "2.0.1",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/say8425/cc-statusline.git"
+	},
+	"devDependencies": {
+		"@biomejs/biome": "^2.3.9",
+		"@types/bun": "latest",
+		"typescript": "^5.9.3"
+	},
+	"bin": {
+		"cc-statusline": "dist/index.js"
+	},
+	"description": "Custom statusline for Claude Code",
+	"files": [
+		"dist/index.js"
+	],
+	"publishConfig": {
+		"registry": "https://registry.npmjs.org"
+	},
+	"scripts": {
+		"build": "bun build.ts",
+		"start": "bun src/index.ts",
+		"test": "bun test",
+		"test:coverage": "bun test --coverage",
+		"lint": "biome check src/",
+		"typecheck": "tsc --noEmit"
+	},
+	"type": "module"
 }

package/src/index.ts

@@ -1,385 +0,0 @@
-#!/usr/bin/env bun
-
-import { $ } from "bun";
-import { loadSessionBlockData } from "ccusage/data-loader";
-
-// 공식 Claude Code JSON input 타입 정의
-interface ClaudeStatusInput {
-	cost: {
-		total_duration_ms: number;
-		total_cost_usd: number;
-	};
-	context_window: {
-		context_window_size: number;
-		current_usage: {
-			input_tokens: number;
-			output_tokens: number;
-			cache_creation_input_tokens: number;
-			cache_read_input_tokens: number;
-		};
-	};
-	workspace: {
-		current_dir: string;
-		project_dir: string;
-	};
-}
-
-// 블록 사용량 정보 타입
-interface BlockUsageInfo {
-	resetTime: Date | null;
-	blockTokens: number;
-	blockStartTime: number | null;
-}
-
-// 캐시 구조
-const cache = {
-	branch: { value: "", timestamp: 0 },
-	gitChanges: { files: 0, insertions: 0, deletions: 0, timestamp: 0 },
-	prUrl: { value: null as string | null, timestamp: 0 },
-	blockUsage: {
-		value: null as BlockUsageInfo | null,
-		timestamp: 0,
-	},
-};
-
-// 캐시 TTL (ms)
-const CACHE_TTL = {
-	branch: 5000, // 5초
-	gitChanges: 3000, // 3초
-	prUrl: 30000, // 30초
-	blockUsage: 60000, // 60초 (JSONL 파싱은 비용이 크므로 긴 TTL)
-};
-
-// Plan별 5시간 토큰 한도
-const PLAN_LIMITS = {
-	pro: 450_000, // Pro plan
-	max5x: 2_250_000, // Max 5x (450K * 5)
-	max20x: 9_000_000, // Max 20x (450K * 20)
-} as const;
-
-type Plan = keyof typeof PLAN_LIMITS;
-
-const DEFAULT_PLAN: Plan = "pro";
-
-// TrueColor 색상 정의
-const C = {
-	RESET: "\x1b[0m",
-	CYAN: "\x1b[38;2;0;255;255m",
-	MAGENTA: "\x1b[38;2;255;100;200m",
-	GREEN: "\x1b[38;2;100;255;100m",
-	YELLOW: "\x1b[38;2;255;220;100m",
-	RED: "\x1b[38;2;255;100;100m",
-	BLUE: "\x1b[38;2;100;150;255m",
-	WHITE: "\x1b[38;2;200;200;200m",
-	UNDERLINE: "\x1b[4m",
-};
-
-// 사용률에 따른 색상 (Context 및 Block Usage 공통)
-function getUsageColor(pct: number): string {
-	if (pct < 50) return C.WHITE;
-	if (pct < 80) return C.YELLOW;
-	return C.RED;
-}
-
-// 숫자 포맷팅 (천 단위 콤마)
-function formatNumber(n: number): string {
-	return n.toLocaleString("en-US");
-}
-
-// 시간 포맷팅 (HH:MM)
-function formatTime(hours: number, mins: number): string {
-	return `${hours.toString().padStart(2, "0")}:${mins.toString().padStart(2, "0")}`;
-}
-
-// stdin에서 JSON 읽기
-async function readStdin(): Promise<string> {
-	const chunks: Uint8Array[] = [];
-	for await (const chunk of Bun.stdin.stream()) {
-		chunks.push(chunk);
-	}
-	return Buffer.concat(chunks).toString("utf-8");
-}
-
-// Git 브랜치 가져오기 (캐싱)
-async function getBranchCached(): Promise<string> {
-	if (Date.now() - cache.branch.timestamp < CACHE_TTL.branch) {
-		return cache.branch.value;
-	}
-	try {
-		const result = await $`git branch --show-current 2>/dev/null`.text();
-		cache.branch = { value: result.trim(), timestamp: Date.now() };
-		return cache.branch.value;
-	} catch {
-		return cache.branch.value;
-	}
-}
-
-// Git 변경사항 가져오기 (캐싱)
-async function getGitChangesCached(): Promise<{
-	files: number;
-	insertions: number;
-	deletions: number;
-}> {
-	if (Date.now() - cache.gitChanges.timestamp < CACHE_TTL.gitChanges) {
-		return cache.gitChanges;
-	}
-	try {
-		const [diff, staged] = await Promise.all([
-			$`git diff --shortstat 2>/dev/null`.text(),
-			$`git diff --cached --shortstat 2>/dev/null`.text(),
-		]);
-		const combined = `${diff}\n${staged}`;
-
-		// 파일 수, insertions, deletions 추출
-		const [files, insertions, deletions] = [
-			/(\d+) file/g,
-			/(\d+) insertion/g,
-			/(\d+) deletion/g,
-		].map((regex) =>
-			(combined.match(regex) || []).reduce(
-				(sum, m) => sum + Number.parseInt(m, 10),
-				0,
-			),
-		);
-		cache.gitChanges = { files, insertions, deletions, timestamp: Date.now() };
-		return cache.gitChanges;
-	} catch {
-		return cache.gitChanges;
-	}
-}
-
-// PR URL 가져오기 (캐싱)
-async function getPrUrlCached(): Promise<string | null> {
-	if (Date.now() - cache.prUrl.timestamp < CACHE_TTL.prUrl) {
-		return cache.prUrl.value;
-	}
-	try {
-		const result = await $`gh pr view --json url -q .url 2>/dev/null`.text();
-		cache.prUrl = { value: result.trim() || null, timestamp: Date.now() };
-		return cache.prUrl.value;
-	} catch {
-		return cache.prUrl.value;
-	}
-}
-
-// CLI 인자 파싱
-const args = process.argv.slice(2);
-const noUsage = args.includes("--no-usage");
-
-// --plan 옵션 파싱 (예: --plan max5x)
-const planIndex = args.indexOf("--plan");
-const planArg =
-	planIndex !== -1 && planIndex + 1 < args.length
-		? args[planIndex + 1]
-		: DEFAULT_PLAN;
-const BLOCK_TOKEN_LIMIT =
-	PLAN_LIMITS[planArg as Plan] ?? PLAN_LIMITS[DEFAULT_PLAN];
-
-// ccusage를 사용하여 블록 사용량 정보 추출
-async function getBlockUsageFromCcusage(): Promise<BlockUsageInfo> {
-	const result: BlockUsageInfo = {
-		resetTime: null,
-		blockTokens: 0,
-		blockStartTime: null,
-	};
-
-	try {
-		const blocks = await loadSessionBlockData({
-			sessionDurationHours: 5,
-			offline: true,
-			order: "desc",
-		});
-
-		if (blocks.length === 0) return result;
-
-		// 가장 최근의 활성 블록 찾기 (갭 블록 제외)
-		const activeBlock = blocks.find((b) => !b.isGap);
-		if (!activeBlock) return result;
-
-		// 블록 토큰 합산 (input + output만, 캐시 토큰 제외)
-		const { tokenCounts } = activeBlock;
-		result.blockTokens = tokenCounts.inputTokens + tokenCounts.outputTokens;
-
-		result.blockStartTime = activeBlock.startTime.getTime();
-
-		// 리셋 시간 설정 (ccusage가 제공하는 usageLimitResetTime 또는 블록 종료 시간)
-		if (
-			activeBlock.usageLimitResetTime &&
-			activeBlock.usageLimitResetTime > new Date()
-		) {
-			result.resetTime = activeBlock.usageLimitResetTime;
-		} else if (activeBlock.endTime > new Date()) {
-			result.resetTime = activeBlock.endTime;
-		}
-
-		return result;
-	} catch {
-		return result;
-	}
-}
-
-// 블록 사용량 가져오기 (캐싱)
-async function getBlockUsageCached(): Promise<BlockUsageInfo | null> {
-	if (Date.now() - cache.blockUsage.timestamp < CACHE_TTL.blockUsage) {
-		return cache.blockUsage.value;
-	}
-
-	const blockUsage = await getBlockUsageFromCcusage();
-	cache.blockUsage = { value: blockUsage, timestamp: Date.now() };
-	return blockUsage;
-}
-
-// 리셋까지 남은 시간 계산
-function getTimeUntilReset(resetTime: Date): {
-	hours: number;
-	minutes: number;
-} {
-	const now = new Date();
-	const diff = resetTime.getTime() - now.getTime();
-
-	if (diff <= 0) {
-		return { hours: 0, minutes: 0 };
-	}
-
-	const hours = Math.floor(diff / (1000 * 60 * 60));
-	const minutes = Math.floor((diff % (1000 * 60 * 60)) / (1000 * 60));
-
-	return { hours, minutes };
-}
-
-// 토큰 수를 K 단위로 포맷팅
-function formatTokensK(tokens: number): string {
-	if (tokens >= 1000) {
-		return `${Math.round(tokens / 1000)}K`;
-	}
-	return tokens.toString();
-}
-
-// 분당 번레이트 계산 (tokens/min)
-function calculateBurnRate(
-	blockTokens: number,
-	blockStartTime: number | null,
-): number {
-	if (!blockStartTime || blockTokens === 0) return 0;
-
-	const now = Date.now();
-	const elapsedMinutes = (now - blockStartTime) / (1000 * 60);
-
-	if (elapsedMinutes < 1) return 0; // 1분 미만에는 변동성이 큰 값을 표시하지 않음
-
-	return Math.round(blockTokens / elapsedMinutes);
-}
-
-// 메인 함수
-async function main() {
-	// 1. stdin에서 Claude Code JSON 읽기
-	const claudeJson: ClaudeStatusInput = JSON.parse(await readStdin());
-
-	// 2. 폴더 이름 추출 (프로젝트 루트 디렉토리)
-	const folder = claudeJson.workspace?.project_dir?.split("/").pop() || "";
-
-	// 3. 세션 시간 계산
-	const sessionMs = claudeJson.cost?.total_duration_ms || 0;
-	const sessionSec = Math.floor(sessionMs / 1000);
-	const sessionHrs = Math.floor(sessionSec / 3600);
-	const sessionMins = Math.floor((sessionSec % 3600) / 60);
-
-	// 4. 비용
-	const costUsd = claudeJson.cost?.total_cost_usd || 0;
-
-	// 5. Context 토큰 계산
-	const usage = claudeJson.context_window?.current_usage;
-	const contextSize = claudeJson.context_window?.context_window_size || 200000;
-
-	const totalTokens = usage
-		? usage.input_tokens +
-			usage.output_tokens +
-			usage.cache_creation_input_tokens +
-			usage.cache_read_input_tokens
-		: 0;
-
-	const contextPct = Math.round((totalTokens / contextSize) * 100);
-	const ctxColor = getUsageColor(contextPct);
-
-	// 6. Git 정보 + 블록 사용량 (캐싱, 병렬 실행)
-	const [branch, gitChanges, prUrl, blockUsage] = await Promise.all([
-		getBranchCached(),
-		getGitChangesCached(),
-		getPrUrlCached(),
-		noUsage ? Promise.resolve(null) : getBlockUsageCached(),
-	]);
-
-	// 7. 출력
-	// 1번째 줄: 폴더 | 브랜치
-	let line1 = `${C.WHITE}📁 ${folder}${C.RESET}`;
-	if (branch) {
-		line1 += ` | ${C.WHITE}🌿 ${branch}${C.RESET}`;
-	}
-	console.log(line1);
-
-	// 2번째 줄: 세션 시간 | 비용 | 컨텍스트
-	const line2 =
-		`${C.WHITE}⏱️ ${formatTime(sessionHrs, sessionMins)}${C.RESET}` +
-		` | ${C.WHITE}💰 $${costUsd.toFixed(2)}${C.RESET}` +
-		` | ${ctxColor}🧠 ${formatNumber(totalTokens)} (${contextPct}%)${C.RESET}`;
-
-	console.log(line2);
-
-	// 3번째 줄: 리셋 타이머 | 사용량 | 번레이트 (--no-usage가 아닐 때)
-	if (!noUsage && blockUsage) {
-		const parts: string[] = [];
-
-		// 리셋 타이머
-		if (blockUsage.resetTime) {
-			const resetTime = getTimeUntilReset(blockUsage.resetTime);
-			parts.push(
-				`${C.WHITE}⏳ ${formatTime(resetTime.hours, resetTime.minutes)}${C.RESET}`,
-			);
-		}
-
-		// 블록 사용량
-		const usagePct = Math.round(
-			(blockUsage.blockTokens / BLOCK_TOKEN_LIMIT) * 100,
-		);
-		const usageColor = getUsageColor(usagePct);
-		parts.push(
-			`${usageColor}📊 ${formatTokensK(blockUsage.blockTokens)}/${formatTokensK(BLOCK_TOKEN_LIMIT)} (${usagePct}%)${C.RESET}`,
-		);
-
-		// 번레이트
-		const burnRate = calculateBurnRate(
-			blockUsage.blockTokens,
-			blockUsage.blockStartTime,
-		);
-		if (burnRate > 0) {
-			parts.push(`${C.WHITE}🔥 ${formatTokensK(burnRate)}/min${C.RESET}`);
-		}
-
-		if (parts.length > 0) {
-			console.log(parts.join(" | "));
-		}
-	}
-
-	// 4번째 줄: git changes | PR URL
-	const hasGitChanges =
-		gitChanges.files > 0 ||
-		gitChanges.insertions > 0 ||
-		gitChanges.deletions > 0;
-	if (hasGitChanges || prUrl) {
-		let line4 = "";
-		if (hasGitChanges) {
-			line4 += `✏️ ${C.WHITE}${gitChanges.files} files${C.RESET} ${C.GREEN}+${gitChanges.insertions}${C.RESET} ${C.RED}-${gitChanges.deletions}${C.RESET}`;
-		}
-		if (prUrl) {
-			const prLabel = prUrl
-				.replace("https://github.com/", "")
-				.replace("/pull/", "#");
-			if (line4) line4 += " | ";
-			// OSC 8 하이퍼링크
-			line4 += `📎 ${C.WHITE}${C.UNDERLINE}\x1b]8;;${prUrl}\x07${prLabel}\x1b]8;;\x07${C.RESET}`;
-		}
-		console.log(line4);
-	}
-}
-
-main().catch(console.error);