token-usage-sync 1.2.0 → 1.3.0

package/index.js

@@ -145,6 +145,109 @@ function calculateUsageForPeriod(entries, hoursAgo) {
   };
 }
 
+// セッションブロックを特定する
+// Claude Codeは5時間ブロック方式: セッション開始から5時間でリセット
+function identifySessionBlocks(entries, sessionDurationHours = 5) {
+  const sorted = entries
+    .filter(e => e.timestamp || e.message?.timestamp)
+    .map(e => ({
+      ...e,
+      _ts: new Date(e.timestamp || e.message?.timestamp).getTime()
+    }))
+    .sort((a, b) => a._ts - b._ts);
+
+  const blocks = [];
+  let currentBlock = null;
+
+  for (const entry of sorted) {
+    const entryTime = entry._ts;
+
+    if (!currentBlock) {
+      currentBlock = {
+        startTime: entryTime,
+        endTime: entryTime + sessionDurationHours * 60 * 60 * 1000,
+        entries: [entry]
+      };
+    } else if (entryTime <= currentBlock.endTime) {
+      currentBlock.entries.push(entry);
+    } else {
+      blocks.push(currentBlock);
+      currentBlock = {
+        startTime: entryTime,
+        endTime: entryTime + sessionDurationHours * 60 * 60 * 1000,
+        entries: [entry]
+      };
+    }
+  }
+
+  if (currentBlock) {
+    blocks.push(currentBlock);
+  }
+
+  return blocks;
+}
+
+// 現在のアクティブブロックの使用量を計算
+function calculateActiveBlockUsage(entries, now = new Date()) {
+  const blocks = identifySessionBlocks(entries, 5);
+  const nowTime = now.getTime();
+
+  const activeBlock = blocks.find(b => nowTime <= b.endTime && nowTime >= b.startTime);
+
+  if (!activeBlock) {
+    return {
+      inputTokens: 0,
+      outputTokens: 0,
+      cacheCreationTokens: 0,
+      cacheReadTokens: 0,
+      totalTokens: 0,
+      weightedTokens: 0,
+      blockStartTime: null,
+      blockEndTime: null,
+      elapsedMinutes: 0,
+      remainingMinutes: 0,
+    };
+  }
+
+  let inputTokens = 0;
+  let outputTokens = 0;
+  let cacheCreationTokens = 0;
+  let cacheReadTokens = 0;
+
+  for (const entry of activeBlock.entries) {
+    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.0 +
+    cacheReadTokens * 0
+  );
+
+  const elapsedMinutes = Math.round((nowTime - activeBlock.startTime) / 60000);
+  const remainingMinutes = Math.round((activeBlock.endTime - nowTime) / 60000);
+
+  return {
+    inputTokens,
+    outputTokens,
+    cacheCreationTokens,
+    cacheReadTokens,
+    totalTokens: inputTokens + outputTokens + cacheCreationTokens + cacheReadTokens,
+    weightedTokens,
+    blockStartTime: new Date(activeBlock.startTime),
+    blockEndTime: new Date(activeBlock.endTime),
+    elapsedMinutes,
+    remainingMinutes,
+  };
+}
+
 // 使用量を集計
 function aggregateUsage(entries) {
   let totalInputTokens = 0;
@@ -198,6 +301,9 @@ function aggregateUsage(entries) {
     }
   }
 
+  // セッションブロック方式の使用量を計算（Claude Code準拠）
+  const activeBlock = calculateActiveBlockUsage(entries);
+
   // ローリングウィンドウの使用量を計算
   const last5Hours = calculateUsageForPeriod(entries, 5);
   const last24Hours = calculateUsageForPeriod(entries, 24);
@@ -212,7 +318,9 @@ function aggregateUsage(entries) {
       cacheReadInputTokens: totalCacheReadInputTokens,
       messageCount,
     },
-    // Claude Code制限と同じローリングウィンドウ
+    // セッションブロック（Claude Code準拠）
+    activeBlock,
+    // ローリングウィンドウ
     limits: {
       last5Hours,
       last24Hours,
@@ -309,24 +417,29 @@ async function main() {
   console.log('\n📊 Claude Code Usage Summary\n');
 
   // 制限値
-  // 5時間: 重み付けトークン（cache_read=0x, cache_create=1x）
-  // 週間: 生トークン
-  const LIMIT_5H_WEIGHTED = 4_100_000;  // 5時間制限: 4.1M weighted tokens
   const LIMIT_WEEK_RAW = 195_000_000;   // 週間制限: 195M raw tokens
 
-  const pct5h = Math.round((usage.limits.last5Hours.weightedTokens / LIMIT_5H_WEIGHTED) * 100);
   const pctWeek = Math.round((usage.limits.lastWeek.totalTokens / LIMIT_WEEK_RAW) * 100);
 
-  // ローリングウィンドウ（Claude Code制限と同じ形式）
-  console.log('=== Usage Limits ===');
-  console.log(`5h Session:  ${usage.limits.last5Hours.weightedTokens.toLocaleString()} weighted / ${LIMIT_5H_WEIGHTED.toLocaleString()} (${pct5h}%)`);
-  console.log(`Weekly:      ${usage.limits.lastWeek.totalTokens.toLocaleString()} raw / ${LIMIT_WEEK_RAW.toLocaleString()} (${pctWeek}%)`);
+  // アクティブブロック（Claude Code準拠のセッションブロック方式）
+  console.log('=== Active Session Block ===');
+  if (usage.activeBlock && usage.activeBlock.blockStartTime) {
+    const elapsed = usage.activeBlock.elapsedMinutes;
+    const remaining = usage.activeBlock.remainingMinutes;
+    const elapsedStr = `${Math.floor(elapsed / 60)}h ${elapsed % 60}m`;
+    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()}`);
+    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)`);
+  } else {
+    console.log('Status:      No active block');
+  }
 
-  console.log('\n=== Last 5 Hours Breakdown ===');
-  console.log(`  Input:         ${usage.limits.last5Hours.inputTokens.toLocaleString()} × 1.0`);
-  console.log(`  Output:        ${usage.limits.last5Hours.outputTokens.toLocaleString()} × 1.0`);
-  console.log(`  Cache Create:  ${usage.limits.last5Hours.cacheCreationTokens.toLocaleString()} × 1.0`);
-  console.log(`  Cache Read:    ${usage.limits.last5Hours.cacheReadTokens.toLocaleString()} × 0 (free)`);
+  console.log('\n=== Weekly Limit ===');
+  console.log(`Weekly:      ${usage.limits.lastWeek.totalTokens.toLocaleString()} / ${LIMIT_WEEK_RAW.toLocaleString()} (${pctWeek}%)`);
 
   console.log('\n=== All Time Total ===');
   console.log(`Total Tokens:  ${usage.summary.totalTokens.toLocaleString()}`);

package/lib/calculations.js

@@ -1,4 +1,114 @@
-// 期間内の使用量を計算
+// セッションブロックを特定する
+// Claude Codeは5時間ブロック方式: セッション開始から5時間でリセット
+export function identifySessionBlocks(entries, sessionDurationHours = 5) {
+  // タイムスタンプでソート
+  const sorted = entries
+    .filter(e => e.timestamp || e.message?.timestamp)
+    .map(e => ({
+      ...e,
+      _ts: new Date(e.timestamp || e.message?.timestamp).getTime()
+    }))
+    .sort((a, b) => a._ts - b._ts);
+
+  const blocks = [];
+  let currentBlock = null;
+
+  for (const entry of sorted) {
+    const entryTime = entry._ts;
+
+    if (!currentBlock) {
+      // 最初のブロック開始
+      currentBlock = {
+        startTime: entryTime,
+        endTime: entryTime + sessionDurationHours * 60 * 60 * 1000,
+        entries: [entry]
+      };
+    } else if (entryTime <= currentBlock.endTime) {
+      // 現在のブロック内
+      currentBlock.entries.push(entry);
+    } else {
+      // 新しいブロック開始
+      blocks.push(currentBlock);
+      currentBlock = {
+        startTime: entryTime,
+        endTime: entryTime + sessionDurationHours * 60 * 60 * 1000,
+        entries: [entry]
+      };
+    }
+  }
+
+  if (currentBlock) {
+    blocks.push(currentBlock);
+  }
+
+  return blocks;
+}
+
+// 現在のアクティブブロックの使用量を計算
+export function calculateActiveBlockUsage(entries, now = new Date()) {
+  const blocks = identifySessionBlocks(entries, 5);
+  const nowTime = now.getTime();
+
+  // アクティブブロックを探す（現在時刻がブロックの終了時刻前）
+  const activeBlock = blocks.find(b => nowTime <= b.endTime && nowTime >= b.startTime);
+
+  if (!activeBlock) {
+    // アクティブブロックがない場合は0を返す
+    return {
+      inputTokens: 0,
+      outputTokens: 0,
+      cacheCreationTokens: 0,
+      cacheReadTokens: 0,
+      totalTokens: 0,
+      weightedTokens: 0,
+      blockStartTime: null,
+      blockEndTime: null,
+      elapsedMinutes: 0,
+      remainingMinutes: 0,
+    };
+  }
+
+  let inputTokens = 0;
+  let outputTokens = 0;
+  let cacheCreationTokens = 0;
+  let cacheReadTokens = 0;
+
+  for (const entry of activeBlock.entries) {
+    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;
+  }
+
+  // 重み付けトークン計算（Claude Code実測ベース）
+  const weightedTokens = Math.round(
+    inputTokens * 1.0 +
+    outputTokens * 1.0 +
+    cacheCreationTokens * 1.0 +
+    cacheReadTokens * 0
+  );
+
+  const elapsedMinutes = Math.round((nowTime - activeBlock.startTime) / 60000);
+  const remainingMinutes = Math.round((activeBlock.endTime - nowTime) / 60000);
+
+  return {
+    inputTokens,
+    outputTokens,
+    cacheCreationTokens,
+    cacheReadTokens,
+    totalTokens: inputTokens + outputTokens + cacheCreationTokens + cacheReadTokens,
+    weightedTokens,
+    blockStartTime: new Date(activeBlock.startTime),
+    blockEndTime: new Date(activeBlock.endTime),
+    elapsedMinutes,
+    remainingMinutes,
+  };
+}
+
+// 期間内の使用量を計算（後方互換性のため残す）
 export function calculateUsageForPeriod(entries, hoursAgo, now = new Date()) {
   const cutoff = new Date(now.getTime() - hoursAgo * 60 * 60 * 1000);
 
@@ -94,7 +204,10 @@ export function aggregateUsage(entries, now = new Date()) {
     }
   }
 
-  // ローリングウィンドウの使用量を計算
+  // セッションブロック方式の使用量を計算（Claude Code準拠）
+  const activeBlock = calculateActiveBlockUsage(entries, now);
+
+  // ローリングウィンドウの使用量を計算（後方互換性）
   const last5Hours = calculateUsageForPeriod(entries, 5, now);
   const last24Hours = calculateUsageForPeriod(entries, 24, now);
   const lastWeek = calculateUsageForPeriod(entries, 24 * 7, now);
@@ -108,6 +221,9 @@ export function aggregateUsage(entries, now = new Date()) {
       cacheReadInputTokens: totalCacheReadInputTokens,
       messageCount,
     },
+    // セッションブロック（Claude Code準拠）
+    activeBlock,
+    // ローリングウィンドウ（後方互換性）
     limits: {
       last5Hours,
       last24Hours,

package/package.json

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