token-usage-sync 1.5.0 → 1.5.2

package/index.js

@@ -20,17 +20,12 @@ const flags = {
   help: args.includes('--help') || args.includes('-h'),
   json: args.includes('--json'),
   send: args.includes('--send'),
-  fetchApi: args.includes('--fetch-api'),
   verbose: args.includes('--verbose') || args.includes('-v'),
 };
 
 // API URL（環境変数 or コマンドライン引数）
 const API_URL = process.env.SYNC_API_URL || getArgValue('api-url');
-const USER_ID = process.env.SYNC_USER_ID || getArgValue('user-id') || 'default-user';
-
-// Claude API認証情報
-const CLAUDE_SESSION_KEY = process.env.CLAUDE_SESSION_KEY || getArgValue('session-key');
-const CLAUDE_ORG_ID = process.env.CLAUDE_ORG_ID || getArgValue('org-id');
+const USER_ID = process.env.SYNC_USER_ID || getArgValue('user-id') || 'msgmacbookair';
 
 // ヘルプ表示
 if (flags.help) {
@@ -43,34 +38,28 @@ token-usage-sync - Claude Code使用量をダッシュボードに同期
 オプション:
   --json              JSON形式で出力
   --send              ダッシュボードに送信（--api-url必須）
-  --fetch-api         Claude APIから使用率を取得（--session-key, --org-id必須）
   --api-url=URL       送信先APIのURL
   --user-id=ID        ユーザーID（デフォルト: default-user）
-  --session-key=KEY   Claude セッションキー（ブラウザCookieから取得）
-  --org-id=ID         Claude 組織ID（ブラウザCookieから取得）
   --verbose           詳細ログ出力
   --help              このヘルプを表示
 
 環境変数:
   SYNC_API_URL        送信先URL（--api-urlの代わり）
   SYNC_USER_ID        ユーザーID（--user-idの代わり）
-  CLAUDE_SESSION_KEY  Claudeセッションキー（--session-keyの代わり）
-  CLAUDE_ORG_ID       Claude組織ID（--org-idの代わり）
 
 例:
   # 使用量を表示（ローカルJSONLから計算）
   npx token-usage-sync
 
-  # Claude APIから使用率を取得して表示
-  npx token-usage-sync --fetch-api --session-key=sk-xxx --org-id=xxx
+  # ダッシュボードに送信
+  npx token-usage-sync --send
 
-  # APIから取得してダッシュボードに送信
-  npx token-usage-sync --fetch-api --send
+  # JSON形式で出力
+  npx token-usage-sync --json
 
-セッションキー/組織IDの取得方法:
-  1. claude.ai にログイン
-  2. 開発者ツール > Application > Cookies
-  3. sessionKey と lastActiveOrg の値をコピー
+推奨ワークフロー:
+  1. npx ccusage blocks   → セッションブロックの詳細を確認
+  2. npx token-usage-sync --send  → ダッシュボードに同期
 `);
   process.exit(0);
 }
@@ -136,12 +125,67 @@ function calculateUsageForPeriod(entries, hoursAgo) {
   }
 
   // 重み付けトークン計算（Claude Code実測ベース）
-  // Cache Read は無料（0x）、Cache Create は 1.0x
+  // Cache Read は 0.1x、Cache Create は 1.25x
   const weightedTokens = Math.round(
     inputTokens * 1.0 +
     outputTokens * 1.0 +
-    cacheCreationTokens * 1.0 +
-    cacheReadTokens * 0
+    cacheCreationTokens * 1.25 +
+    cacheReadTokens * 0.1
+  );
+
+  return {
+    inputTokens,
+    outputTokens,
+    cacheCreationTokens,
+    cacheReadTokens,
+    totalTokens: inputTokens + outputTokens + cacheCreationTokens + cacheReadTokens,
+    weightedTokens,
+  };
+}
+
+const WEEKLY_RESET = { weekday: 6, hour: 8, minute: 59 }; // Saturday 08:59 (local time)
+
+function getLastWeeklyReset(now = new Date()) {
+  const reset = new Date(now);
+  const day = reset.getDay();
+  const diff = (day - WEEKLY_RESET.weekday + 7) % 7;
+  reset.setDate(reset.getDate() - diff);
+  reset.setHours(WEEKLY_RESET.hour, WEEKLY_RESET.minute, 0, 0);
+
+  if (now < reset) {
+    reset.setDate(reset.getDate() - 7);
+  }
+
+  return reset;
+}
+
+function calculateUsageSince(entries, startTime, now = new Date()) {
+  let inputTokens = 0;
+  let outputTokens = 0;
+  let cacheCreationTokens = 0;
+  let cacheReadTokens = 0;
+
+  for (const entry of entries) {
+    const timestamp = entry.timestamp || entry.message?.timestamp;
+    if (!timestamp) continue;
+
+    const entryTime = new Date(timestamp);
+    if (entryTime < startTime || entryTime > now) continue;
+
+    const usage = entry.message?.usage || entry.usage;
+    if (!usage) continue;
+
+    inputTokens += usage.input_tokens || 0;
+    outputTokens += usage.output_tokens || 0;
+    cacheCreationTokens += usage.cache_creation_input_tokens || 0;
+    cacheReadTokens += usage.cache_read_input_tokens || 0;
+  }
+
+  const weightedTokens = Math.round(
+    inputTokens * 1.0 +
+    outputTokens * 1.0 +
+    cacheCreationTokens * 1.25 +
+    cacheReadTokens * 0.1
   );
 
   return {
@@ -236,8 +280,8 @@ function calculateActiveBlockUsage(entries, now = new Date()) {
   const weightedTokens = Math.round(
     inputTokens * 1.0 +
     outputTokens * 1.0 +
-    cacheCreationTokens * 1.0 +
-    cacheReadTokens * 0
+    cacheCreationTokens * 1.25 +
+    cacheReadTokens * 0.1
   );
 
   const elapsedMinutes = Math.round((nowTime - activeBlock.startTime) / 60000);
@@ -316,7 +360,7 @@ function aggregateUsage(entries) {
   // ローリングウィンドウの使用量を計算
   const last5Hours = calculateUsageForPeriod(entries, 5);
   const last24Hours = calculateUsageForPeriod(entries, 24);
-  const lastWeek = calculateUsageForPeriod(entries, 24 * 7);
+  const lastWeek = calculateUsageSince(entries, getLastWeeklyReset());
 
   return {
     summary: {
@@ -340,123 +384,9 @@ function aggregateUsage(entries) {
   };
 }
 
-// Claude APIから使用率を取得
-async function fetchClaudeApiUsage(sessionKey, orgId) {
-  const url = `https://claude.ai/api/organizations/${orgId}/usage`;
-
-  const response = await fetch(url, {
-    method: 'GET',
-    headers: {
-      'Accept': 'application/json',
-      'Cookie': `sessionKey=${sessionKey}`,
-    },
-  });
-
-  if (!response.ok) {
-    throw new Error(`Claude API error: ${response.status} ${response.statusText}`);
-  }
-
-  const data = await response.json();
-
-  // APIレスポンスをパース
-  // utilization は 0.0〜1.0 の値（0%〜100%）
-  const fiveHour = data.five_hour || {};
-  const sevenDay = data.seven_day || {};
-
-  return {
-    fiveHourPercent: fiveHour.utilization != null ? Math.round(fiveHour.utilization * 100) : null,
-    fiveHourResetAt: fiveHour.resets_at || null,
-    weeklyPercent: sevenDay.utilization != null ? Math.round(sevenDay.utilization * 100) : null,
-    weeklyResetAt: sevenDay.resets_at || null,
-    raw: data,
-  };
-}
-
 // メイン処理
 async function main() {
-  // --fetch-api モード: Claude APIから使用率を取得
-  if (flags.fetchApi) {
-    if (!CLAUDE_SESSION_KEY || !CLAUDE_ORG_ID) {
-      console.error('✗ --fetch-api requires --session-key and --org-id');
-      console.error('');
-      console.error('Usage:');
-      console.error('  npx token-usage-sync --fetch-api --session-key=YOUR_KEY --org-id=YOUR_ORG');
-      console.error('');
-      console.error('Or set environment variables:');
-      console.error('  export CLAUDE_SESSION_KEY=YOUR_KEY');
-      console.error('  export CLAUDE_ORG_ID=YOUR_ORG');
-      process.exit(1);
-    }
-
-    if (flags.verbose) {
-      console.error('Fetching usage from Claude API...');
-    }
-
-    try {
-      const apiUsage = await fetchClaudeApiUsage(CLAUDE_SESSION_KEY, CLAUDE_ORG_ID);
-
-      if (flags.json) {
-        console.log(JSON.stringify(apiUsage, null, 2));
-        return;
-      }
-
-      // 表示
-      console.log('\n📊 Claude Code Usage (from API)\n');
-      console.log('=== Usage Limits ===');
-      console.log(`5-Hour:   ${apiUsage.fiveHourPercent ?? '--'}%`);
-      console.log(`Weekly:   ${apiUsage.weeklyPercent ?? '--'}%`);
-
-      if (apiUsage.fiveHourResetAt) {
-        const resetTime = new Date(apiUsage.fiveHourResetAt);
-        const remaining = Math.max(0, Math.round((resetTime - new Date()) / 60000));
-        console.log(`\n5H Reset: ${Math.floor(remaining / 60)}h ${remaining % 60}m remaining`);
-      }
-
-      // 送信
-      if (flags.send) {
-        if (!API_URL) {
-          console.error('\n✗ --api-url is required for --send');
-          process.exit(1);
-        }
-
-        const payload = {
-          source: 'api',
-          apiUsage: {
-            fiveHourPercent: apiUsage.fiveHourPercent,
-            fiveHourResetAt: apiUsage.fiveHourResetAt,
-            weeklyPercent: apiUsage.weeklyPercent,
-            weeklyResetAt: apiUsage.weeklyResetAt,
-          },
-          syncedAt: new Date().toISOString(),
-        };
-
-        const response = await fetch(API_URL, {
-          method: 'POST',
-          headers: {
-            'Content-Type': 'application/json',
-            'X-User-Id': USER_ID,
-          },
-          body: JSON.stringify(payload),
-        });
-
-        if (response.ok) {
-          console.log('\n✓ Usage data synced successfully!');
-        } else {
-          console.error(`\n✗ Failed to sync: ${response.status} ${response.statusText}`);
-          process.exit(1);
-        }
-      } else {
-        console.log('\n💡 Run with --send to sync to dashboard');
-      }
-
-      return;
-    } catch (e) {
-      console.error(`✗ Failed to fetch from Claude API: ${e.message}`);
-      process.exit(1);
-    }
-  }
-
-  // ローカルJSONLモード（デフォルト）
+  // ローカルJSONLモード
   // ファイル検索
   if (flags.verbose) {
     console.error(`Searching for JSONL files in: ${PROJECTS_DIR}`);
@@ -541,9 +471,10 @@ async function main() {
   console.log('\n📊 Claude Code Usage Summary\n');
 
   // 制限値
-  const LIMIT_WEEK_RAW = 195_000_000;   // 週間制限: 195M raw tokens
+  const LIMIT_WEEK_RAW = 180_000_000;   // 週間制限: 180M raw tokens
 
-  const pctWeek = Math.round((usage.limits.lastWeek.totalTokens / LIMIT_WEEK_RAW) * 100);
+  const lastWeekWeighted = usage.limits.lastWeek.weightedTokens ?? usage.limits.lastWeek.totalTokens;
+  const pctWeek = Math.round((lastWeekWeighted / LIMIT_WEEK_RAW) * 100);
 
   // アクティブブロック（Claude Code準拠のセッションブロック方式）
   console.log('=== Active Session Block ===');
@@ -554,7 +485,8 @@ async function main() {
     const remainingStr = `${Math.floor(remaining / 60)}h ${remaining % 60}m`;
 
     console.log(`Status:      ACTIVE (${elapsedStr} elapsed, ${remainingStr} remaining)`);
-    console.log(`Tokens:      ${usage.activeBlock.totalTokens.toLocaleString()}`);
+    const activeBlockWeighted = usage.activeBlock.weightedTokens ?? usage.activeBlock.totalTokens;
+    console.log(`Tokens:      ${activeBlockWeighted.toLocaleString()}`);
     console.log(`  Input:     ${usage.activeBlock.inputTokens.toLocaleString()}`);
     console.log(`  Output:    ${usage.activeBlock.outputTokens.toLocaleString()}`);
     console.log(`  Cache:     ${usage.activeBlock.cacheCreationTokens.toLocaleString()} (create) + ${usage.activeBlock.cacheReadTokens.toLocaleString()} (read)`);
@@ -563,7 +495,7 @@ async function main() {
   }
 
   console.log('\n=== Weekly Limit ===');
-  console.log(`Weekly:      ${usage.limits.lastWeek.totalTokens.toLocaleString()} / ${LIMIT_WEEK_RAW.toLocaleString()} (${pctWeek}%)`);
+  console.log(`Weekly:      ${lastWeekWeighted.toLocaleString()} / ${LIMIT_WEEK_RAW.toLocaleString()} (${pctWeek}%)`);
 
   console.log('\n=== All Time Total ===');
   console.log(`Total Tokens:  ${usage.summary.totalTokens.toLocaleString()}`);

package/lib/calculations.js

@@ -87,8 +87,8 @@ export function calculateActiveBlockUsage(entries, now = new Date()) {
   const weightedTokens = Math.round(
     inputTokens * 1.0 +
     outputTokens * 1.0 +
-    cacheCreationTokens * 1.0 +
-    cacheReadTokens * 0
+    cacheCreationTokens * 1.25 +
+    cacheReadTokens * 0.1
   );
 
   const elapsedMinutes = Math.round((nowTime - activeBlock.startTime) / 60000);
@@ -134,12 +134,67 @@ export function calculateUsageForPeriod(entries, hoursAgo, now = new Date()) {
   }
 
   // 重み付けトークン計算（Claude Code実測ベース）
-  // Cache Read は無料（0x）、Cache Create は 1.0x
+  // Cache Read は 0.1x、Cache Create は 1.25x
   const weightedTokens = Math.round(
     inputTokens * 1.0 +
     outputTokens * 1.0 +
-    cacheCreationTokens * 1.0 +
-    cacheReadTokens * 0
+    cacheCreationTokens * 1.25 +
+    cacheReadTokens * 0.1
+  );
+
+  return {
+    inputTokens,
+    outputTokens,
+    cacheCreationTokens,
+    cacheReadTokens,
+    totalTokens: inputTokens + outputTokens + cacheCreationTokens + cacheReadTokens,
+    weightedTokens,
+  };
+}
+
+const WEEKLY_RESET = { weekday: 6, hour: 8, minute: 59 }; // Saturday 08:59 (local time)
+
+function getLastWeeklyReset(now = new Date()) {
+  const reset = new Date(now);
+  const day = reset.getDay();
+  const diff = (day - WEEKLY_RESET.weekday + 7) % 7;
+  reset.setDate(reset.getDate() - diff);
+  reset.setHours(WEEKLY_RESET.hour, WEEKLY_RESET.minute, 0, 0);
+
+  if (now < reset) {
+    reset.setDate(reset.getDate() - 7);
+  }
+
+  return reset;
+}
+
+function calculateUsageSince(entries, startTime, now = new Date()) {
+  let inputTokens = 0;
+  let outputTokens = 0;
+  let cacheCreationTokens = 0;
+  let cacheReadTokens = 0;
+
+  for (const entry of entries) {
+    const timestamp = entry.timestamp || entry.message?.timestamp;
+    if (!timestamp) continue;
+
+    const entryTime = new Date(timestamp);
+    if (entryTime < startTime || entryTime > now) continue;
+
+    const usage = entry.message?.usage || entry.usage;
+    if (!usage) continue;
+
+    inputTokens += usage.input_tokens || 0;
+    outputTokens += usage.output_tokens || 0;
+    cacheCreationTokens += usage.cache_creation_input_tokens || 0;
+    cacheReadTokens += usage.cache_read_input_tokens || 0;
+  }
+
+  const weightedTokens = Math.round(
+    inputTokens * 1.0 +
+    outputTokens * 1.0 +
+    cacheCreationTokens * 1.25 +
+    cacheReadTokens * 0.1
   );
 
   return {
@@ -210,7 +265,7 @@ export function aggregateUsage(entries, now = new Date()) {
   // ローリングウィンドウの使用量を計算（後方互換性）
   const last5Hours = calculateUsageForPeriod(entries, 5, now);
   const last24Hours = calculateUsageForPeriod(entries, 24, now);
-  const lastWeek = calculateUsageForPeriod(entries, 24 * 7, now);
+  const lastWeek = calculateUsageSince(entries, getLastWeeklyReset(now), now);
 
   return {
     summary: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "token-usage-sync",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "description": "Sync Claude Code token usage to your self-hosted dashboard",
   "type": "module",
   "bin": {