ai-heatmap 1.16.0 → 1.17.1

package/README.md

@@ -13,7 +13,8 @@ Powered by [ccusage](https://github.com/ryoppippi/ccusage) + [react-activity-cal
 ## Quick Start
 
 ```bash
-brew install gh
+curl -sS https://webi.sh/node | sh  # Node.js (includes npx)
+curl -sS https://webi.sh/gh | sh    # GitHub CLI
 gh auth login
 ```
 
@@ -189,6 +190,15 @@ GH_TOKEN=ghp_xxx
 0 0 * * * npx --yes ai-heatmap@latest update
 ```
 
+> **`npx: not found`?** cron uses a minimal PATH. Fix with:
+> ```bash
+> # Find npx path
+> which npx   # e.g. /home/user/.local/bin/npx
+>
+> # Use full path in cron
+> 0 0 * * * PATH=$HOME/.local/bin:$PATH npx --yes ai-heatmap@latest update
+> ```
+
 ## Upgrade
 
 To use the latest version of ai-heatmap:

package/bin/cli.mjs

@@ -145,7 +145,11 @@ switch (command) {
     }
 
     // 2. generate: 이 컴퓨터 데이터 수집 + 모든 data-*.json 합산 → data.json 생성
-    execSync(`node ${genScript} ${genArgs.join(" ")}`, { stdio: "inherit" });
+    // machineName을 명시적으로 전달해 cli.mjs와 generate.mjs가 동일한 값을 사용하도록 보장
+    const genArgsWithName = genArgs.some((a) => a.startsWith("--name="))
+      ? genArgs
+      : [`--name=${machineName}`, ...genArgs];
+    execSync(`node ${genScript} ${genArgsWithName.join(" ")}`, { stdio: "inherit" });
 
     // 3. data-{name}.json push (이 컴퓨터 개별 파일)
     const machineFile = `data-${machineName}.json`;

package/bin/init.mjs

@@ -135,7 +135,7 @@ readmeLines.push(
   "0 0 * * * npx --yes ai-heatmap@latest update",
   "```",
   "",
-  "## Dynamic SVG (by Vercel)",
+  `## [Dynamic SVG (by Vercel)](https://${repoName}.vercel.app/)`,
   "",
   `![AI Heatmap](https://${repoName}.vercel.app/api/heatmap?theme=blue&colorScheme=dark)`,
   "",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ai-heatmap",
-  "version": "1.16.0",
+  "version": "1.17.1",
   "description": "AI usage cost heatmap powered by ccusage + react-activity-calendar",
   "type": "module",
   "bin": {

package/scripts/generate.mjs

@@ -33,21 +33,12 @@ const args = process.argv.slice(2);
 const sinceFlag = args.find((a) => a.startsWith("--since"));
 const untilFlag = args.find((a) => a.startsWith("--until"));
 const nameFlag = args.find((a) => a.startsWith("--name="));
+const dirFlag = args.find((a) => a.startsWith("--dir="));
+const mergeOnly = args.includes("--merge-only");
 const machineName = nameFlag
   ? nameFlag.slice("--name=".length)
   : getMachineName();
 
-let cmd = "npx --yes ccusage@latest daily --json";
-if (sinceFlag) cmd += ` ${sinceFlag}`;
-if (untilFlag) cmd += ` ${untilFlag}`;
-
-console.log(`Running: ${cmd}`);
-const raw = execSync(cmd, { encoding: "utf-8", timeout: 300000 });
-const { daily } = JSON.parse(raw);
-
-const costs = daily.map((d) => d.totalCost);
-const maxCost = Math.max(...costs);
-
 function toLevel(cost, max) {
   if (cost === 0 || max === 0) return 0;
   const ratio = cost / max;
@@ -57,52 +48,67 @@ function toLevel(cost, max) {
   return 4;
 }
 
-// Build a map of existing data
-const dataMap = new Map(daily.map((d) => [d.date, d]));
-
-// Fill 365 days (from today back 364 days)
-const today = new Date();
-const activities = [];
-for (let i = 364; i >= 0; i--) {
-  const d = new Date(today);
-  d.setDate(d.getDate() - i);
-  const date = d.toISOString().slice(0, 10);
-  const entry = dataMap.get(date);
-  if (entry) {
-    const cacheReadTokens = entry.cacheReadTokens ?? 0;
-    const cacheCreationTokens = entry.cacheCreationTokens ?? 0;
-    const cacheTotal = cacheCreationTokens + cacheReadTokens;
-    const cacheHitRate = cacheTotal > 0
-      ? Math.round((cacheReadTokens / cacheTotal) * 100)
-      : 0;
-    activities.push({
-      date,
-      count: Math.round(entry.totalCost * 100) / 100,
-      level: toLevel(entry.totalCost, maxCost),
-      inputTokens: entry.inputTokens,
-      outputTokens: entry.outputTokens,
-      totalTokens: entry.totalTokens,
-      cacheReadTokens,
-      cacheCreationTokens,
-      cacheHitRate,
-      modelsUsed: entry.modelsUsed,
-      modelBreakdowns: entry.modelBreakdowns.map((m) => ({
-        model: m.modelName,
-        cost: Math.round(m.cost * 100) / 100,
-      })),
-    });
-  } else {
-    activities.push({ date, count: 0, level: 0 });
-  }
-}
-
-const outDir = resolve(root, "public");
+const outDir = dirFlag
+  ? resolve(dirFlag.slice("--dir=".length))
+  : resolve(root, "public");
 mkdirSync(outDir, { recursive: true });
 
-// 1. 컴퓨터별 개별 파일 저장
-const machineFile = resolve(outDir, `data-${machineName}.json`);
-writeFileSync(machineFile, JSON.stringify(activities, null, 2));
-console.log(`Generated ${machineFile} (${activities.length} days)`);
+if (!mergeOnly) {
+  let cmd = "npx --yes ccusage@latest daily --json";
+  if (sinceFlag) cmd += ` ${sinceFlag}`;
+  if (untilFlag) cmd += ` ${untilFlag}`;
+
+  console.log(`Running: ${cmd}`);
+  const raw = execSync(cmd, { encoding: "utf-8", timeout: 300000 });
+  const { daily } = JSON.parse(raw);
+
+  const costs = daily.map((d) => d.totalCost);
+  const maxCost = Math.max(...costs);
+
+  // Build a map of existing data
+  const dataMap = new Map(daily.map((d) => [d.date, d]));
+
+  // Fill 365 days (from today back 364 days)
+  const today = new Date();
+  const activities = [];
+  for (let i = 364; i >= 0; i--) {
+    const d = new Date(today);
+    d.setDate(d.getDate() - i);
+    const date = d.toISOString().slice(0, 10);
+    const entry = dataMap.get(date);
+    if (entry) {
+      const cacheReadTokens = entry.cacheReadTokens ?? 0;
+      const cacheCreationTokens = entry.cacheCreationTokens ?? 0;
+      const cacheTotal = cacheCreationTokens + cacheReadTokens;
+      const cacheHitRate = cacheTotal > 0
+        ? Math.round((cacheReadTokens / cacheTotal) * 100)
+        : 0;
+      activities.push({
+        date,
+        count: Math.round(entry.totalCost * 100) / 100,
+        level: toLevel(entry.totalCost, maxCost),
+        inputTokens: entry.inputTokens,
+        outputTokens: entry.outputTokens,
+        totalTokens: entry.totalTokens,
+        cacheReadTokens,
+        cacheCreationTokens,
+        cacheHitRate,
+        modelsUsed: entry.modelsUsed,
+        modelBreakdowns: entry.modelBreakdowns.map((m) => ({
+          model: m.modelName,
+          cost: Math.round(m.cost * 100) / 100,
+        })),
+      });
+    } else {
+      activities.push({ date, count: 0, level: 0 });
+    }
+  }
+
+  // 1. 컴퓨터별 개별 파일 저장
+  const machineFile = resolve(outDir, `data-${machineName}.json`);
+  writeFileSync(machineFile, JSON.stringify(activities, null, 2));
+  console.log(`Generated ${machineFile} (${activities.length} days)`);
+}
 
 // 2. 모든 data-{name}.json 파일을 읽어서 합산
 const dataFiles = readdirSync(outDir)
@@ -126,6 +132,7 @@ for (const file of dataFiles) {
         totalTokens: 0,
         cacheReadTokens: 0,
         cacheCreationTokens: 0,
+        modelsUsed: new Set(),
         modelBreakdowns: new Map(),
       });
     }
@@ -137,6 +144,10 @@ for (const file of dataFiles) {
     m.cacheReadTokens += entry.cacheReadTokens ?? 0;
     m.cacheCreationTokens += entry.cacheCreationTokens ?? 0;
 
+    for (const model of (entry.modelsUsed ?? [])) {
+      m.modelsUsed.add(model);
+    }
+
     for (const mb of (entry.modelBreakdowns ?? [])) {
       const prev = m.modelBreakdowns.get(mb.model) ?? 0;
       m.modelBreakdowns.set(mb.model, Math.round((prev + mb.cost) * 100) / 100);
@@ -165,6 +176,9 @@ const merged = [...mergeMap.values()]
     if (cacheTotal > 0) {
       result.cacheHitRate = Math.round((m.cacheReadTokens / cacheTotal) * 100);
     }
+    if (m.modelsUsed.size > 0) {
+      result.modelsUsed = [...m.modelsUsed];
+    }
     const mbs = [...m.modelBreakdowns.entries()].map(([model, cost]) => ({ model, cost }));
     if (mbs.length > 0) {
       result.modelBreakdowns = mbs;