token-usage-sync 1.5.1 → 1.5.2

package/index.js

@@ -25,7 +25,7 @@ const flags = {
 
 // 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';
+const USER_ID = process.env.SYNC_USER_ID || getArgValue('user-id') || 'msgmacbookair';
 
 // ヘルプ表示
 if (flags.help) {
@@ -125,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 {
@@ -225,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);
@@ -305,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: {
@@ -416,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 ===');
@@ -429,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)`);
@@ -438,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.1",
+  "version": "1.5.2",
   "description": "Sync Claude Code token usage to your self-hosted dashboard",
   "type": "module",
   "bin": {