ai-heatmap 1.14.7 → 1.17.0

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:
@@ -199,6 +209,10 @@ npx --yes ai-heatmap@latest update
 
 ## Deployment
 
+```bash
+npm publish
+```
+
 ### GitHub Pages
 
 1. Enable GitHub Pages (Settings > Pages > Source: GitHub Actions)

package/bin/cli.mjs

@@ -1,12 +1,34 @@
 #!/usr/bin/env node
 import { execSync } from "node:child_process";
-import { existsSync } from "node:fs";
+import { existsSync, writeFileSync, readFileSync, mkdirSync } from "node:fs";
 import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
+import os from "node:os";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const root = resolve(__dirname, "..");
 
+function getMachineName() {
+  try {
+    if (process.platform === "darwin") {
+      const serial = execSync(
+        "ioreg -rd1 -c IOPlatformExpertDevice | awk '/IOPlatformSerialNumber/ {print $NF}' | tr -d '\"'",
+        { encoding: "utf-8", stdio: ["pipe", "pipe", "ignore"] },
+      ).trim();
+      if (serial) return serial;
+    } else if (process.platform === "linux") {
+      const id = readFileSync("/etc/machine-id", "utf-8").trim();
+      if (id) return id.slice(0, 12);
+    } else if (process.platform === "win32") {
+      const uuid = execSync("wmic csproduct get UUID /value", {
+        encoding: "utf-8", stdio: ["pipe", "pipe", "ignore"],
+      }).match(/UUID=([^\r\n]+)/)?.[1]?.trim();
+      if (uuid) return uuid.replace(/[^a-zA-Z0-9]/g, "").slice(0, 12);
+    }
+  } catch {}
+  return os.hostname().replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+
 const [command, ...args] = process.argv.slice(2);
 
 const HELP = `
@@ -15,12 +37,14 @@ ai-heatmap - AI usage cost heatmap
 Commands:
   init          [--repo <name>]        Create a new heatmap repo and generate initial data
   update        [--repo <owner/repo>]  Generate data + push to repo
+                [--name <machine>]
   generate-svg                         Generate heatmap.svg from data.json
   delete        [--repo <name>]        Delete the heatmap GitHub repo
   deploy        [--repo <name>]        Deploy to Vercel (SVG API endpoint)
 
 Options:
   --repo <name>           Target repo (default: {user}-ai-heatmap)
+  --name <machine>        Machine name for per-device data file (default: serial number)
   --since YYYYMMDD        Start date (update only)
   --until YYYYMMDD        End date (update only)
 
@@ -28,6 +52,7 @@ Examples:
   npx ai-heatmap init
   npx ai-heatmap init --repo my-heatmap
   npx ai-heatmap update
+  npx ai-heatmap update --name=mac
   npx ai-heatmap update --repo owner/repo-name
   npx ai-heatmap delete
   npx ai-heatmap deploy
@@ -38,6 +63,45 @@ function getArg(flag) {
   return idx !== -1 && args[idx + 1] ? args[idx + 1] : null;
 }
 
+function resolveRepo(repoArg) {
+  try {
+    const owner = execSync("gh api user --jq .login", { encoding: "utf-8" }).trim();
+    if (!repoArg) return `${owner}/${owner}-ai-heatmap`;
+    if (!repoArg.includes("/")) return `${owner}/${repoArg}`;
+    return repoArg;
+  } catch {
+    if (repoArg && repoArg.includes("/")) return repoArg;
+    console.error("Could not determine repo. Use --repo <owner/repo>");
+    process.exit(1);
+  }
+}
+
+function pushFile(repo, repoPath, localPath) {
+  const content = readFileSync(localPath, "utf-8");
+  const base64 = Buffer.from(content).toString("base64");
+
+  let sha = "";
+  try {
+    sha = execSync(
+      `gh api repos/${repo}/contents/${repoPath} --jq .sha`,
+      { encoding: "utf-8", stdio: ["pipe", "pipe", "ignore"] },
+    ).trim();
+  } catch { /* file doesn't exist yet */ }
+
+  const payload = {
+    message: `Update ${repoPath} (${new Date().toISOString().slice(0, 10)})`,
+    content: base64,
+  };
+  if (sha) payload.sha = sha;
+
+  const payloadStr = JSON.stringify(JSON.stringify(payload));
+  execSync(
+    `echo ${payloadStr} | gh api repos/${repo}/contents/${repoPath} -X PUT --input -`,
+    { stdio: ["pipe", "inherit", "inherit"] },
+  );
+  console.log(`  Pushed ${repoPath} to ${repo}`);
+}
+
 switch (command) {
   case "init": {
     const script = resolve(__dirname, "init.mjs");
@@ -47,13 +111,57 @@ switch (command) {
   }
   case "update": {
     const genScript = resolve(root, "scripts/generate.mjs");
-    const pushScript = resolve(__dirname, "push.mjs");
+    const outDir = resolve(root, "public");
     const genArgs = args.filter(
-      (a) => a.startsWith("--since") || a.startsWith("--until"),
+      (a) => a.startsWith("--since") || a.startsWith("--until") || a.startsWith("--name"),
     );
-    const pushArgs = args.filter((a) => a.startsWith("--repo"));
+
+    const repo = resolveRepo(getArg("--repo"));
+
+    // 머신 이름 결정 (generate.mjs와 동일한 로직)
+    const nameFlag = genArgs.find((a) => a.startsWith("--name="));
+    const machineName = nameFlag
+      ? nameFlag.slice("--name=".length)
+      : getMachineName();
+
+    // 1. GitHub API로 다른 컴퓨터의 data-*.json 파일들을 로컬에 다운로드
+    console.log(`Fetching machine data files from ${repo}...`);
+    mkdirSync(outDir, { recursive: true });
+    try {
+      const raw = execSync(
+        `gh api repos/${repo}/contents/public --jq '[.[] | select(.name | test("^data-.+\\.json$"))]'`,
+        { encoding: "utf-8", stdio: ["pipe", "pipe", "ignore"] },
+      );
+      const files = JSON.parse(raw);
+      for (const file of files) {
+        // 현재 컴퓨터 파일은 generate에서 새로 생성하므로 건너뜀
+        if (file.name === `data-${machineName}.json`) continue;
+        const decoded = Buffer.from(file.content.replace(/\n/g, ""), "base64").toString("utf-8");
+        writeFileSync(resolve(outDir, file.name), decoded);
+        console.log(`  Fetched ${file.name}`);
+      }
+    } catch {
+      console.log("  No existing machine data files found (first run).");
+    }
+
+    // 2. generate: 이 컴퓨터 데이터 수집 + 모든 data-*.json 합산 → data.json 생성
     execSync(`node ${genScript} ${genArgs.join(" ")}`, { stdio: "inherit" });
-    execSync(`node ${pushScript} ${pushArgs.join(" ")}`, { stdio: "inherit" });
+
+    // 3. data-{name}.json push (이 컴퓨터 개별 파일)
+    const machineFile = `data-${machineName}.json`;
+    const machineFilePath = resolve(outDir, machineFile);
+    if (existsSync(machineFilePath)) {
+      console.log(`Pushing machine data file...`);
+      pushFile(repo, `public/${machineFile}`, machineFilePath);
+    }
+
+    // 4. data.json push (합산 결과)
+    const dataPath = resolve(outDir, "data.json");
+    if (existsSync(dataPath)) {
+      console.log(`Pushing merged data.json...`);
+      pushFile(repo, "public/data.json", dataPath);
+    }
+
     break;
   }
   case "delete": {

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.14.7",
+  "version": "1.17.0",
   "description": "AI usage cost heatmap powered by ccusage + react-activity-calendar",
   "type": "module",
   "bin": {

package/scripts/generate.mjs

@@ -1,73 +1,191 @@
 #!/usr/bin/env node
 import { execSync } from "node:child_process";
-import { writeFileSync, mkdirSync } from "node:fs";
+import { writeFileSync, mkdirSync, readdirSync, readFileSync } from "node:fs";
 import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
+import os from "node:os";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const root = resolve(__dirname, "..");
 
+function getMachineName() {
+  try {
+    if (process.platform === "darwin") {
+      const serial = execSync(
+        "ioreg -rd1 -c IOPlatformExpertDevice | awk '/IOPlatformSerialNumber/ {print $NF}' | tr -d '\"'",
+        { encoding: "utf-8", stdio: ["pipe", "pipe", "ignore"] },
+      ).trim();
+      if (serial) return serial;
+    } else if (process.platform === "linux") {
+      const id = readFileSync("/etc/machine-id", "utf-8").trim();
+      if (id) return id.slice(0, 12);
+    } else if (process.platform === "win32") {
+      const uuid = execSync("wmic csproduct get UUID /value", {
+        encoding: "utf-8", stdio: ["pipe", "pipe", "ignore"],
+      }).match(/UUID=([^\r\n]+)/)?.[1]?.trim();
+      if (uuid) return uuid.replace(/[^a-zA-Z0-9]/g, "").slice(0, 12);
+    }
+  } catch {}
+  return os.hostname().replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+
 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) {
-  if (cost === 0 || maxCost === 0) return 0;
-  const ratio = cost / maxCost;
+function toLevel(cost, max) {
+  if (cost === 0 || max === 0) return 0;
+  const ratio = cost / max;
   if (ratio <= 0.25) return 1;
   if (ratio <= 0.5) return 2;
   if (ratio <= 0.75) return 3;
   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 cacheTotal = entry.cacheCreationTokens + entry.cacheReadTokens;
-    const cacheHitRate = cacheTotal > 0
-      ? Math.round((entry.cacheReadTokens / cacheTotal) * 100)
-      : 0;
-    activities.push({
-      date,
-      count: Math.round(entry.totalCost * 100) / 100,
-      level: toLevel(entry.totalCost),
-      inputTokens: entry.inputTokens,
-      outputTokens: entry.outputTokens,
-      totalTokens: entry.totalTokens,
-      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 = dirFlag
+  ? resolve(dirFlag.slice("--dir=".length))
+  : resolve(root, "public");
+mkdirSync(outDir, { recursive: true });
+
+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)`);
 }
 
-const outDir = resolve(root, "public");
-mkdirSync(outDir, { recursive: true });
+// 2. 모든 data-{name}.json 파일을 읽어서 합산
+const dataFiles = readdirSync(outDir)
+  .filter((f) => f.match(/^data-.+\.json$/))
+  .sort()
+  .map((f) => resolve(outDir, f));
+
+console.log(`Merging ${dataFiles.length} file(s): ${dataFiles.map((f) => f.split("/").pop()).join(", ")}`);
+
+const mergeMap = new Map();
+
+for (const file of dataFiles) {
+  const fileData = JSON.parse(readFileSync(file, "utf-8"));
+  for (const entry of fileData) {
+    if (!mergeMap.has(entry.date)) {
+      mergeMap.set(entry.date, {
+        date: entry.date,
+        count: 0,
+        inputTokens: 0,
+        outputTokens: 0,
+        totalTokens: 0,
+        cacheReadTokens: 0,
+        cacheCreationTokens: 0,
+        modelsUsed: new Set(),
+        modelBreakdowns: new Map(),
+      });
+    }
+    const m = mergeMap.get(entry.date);
+    m.count = Math.round((m.count + (entry.count ?? 0)) * 100) / 100;
+    m.inputTokens += entry.inputTokens ?? 0;
+    m.outputTokens += entry.outputTokens ?? 0;
+    m.totalTokens += entry.totalTokens ?? 0;
+    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);
+    }
+  }
+}
+
+// 합산된 최대값 기준으로 level 재계산
+const allCounts = [...mergeMap.values()].map((m) => m.count);
+const mergedMax = Math.max(...allCounts);
+
+const merged = [...mergeMap.values()]
+  .sort((a, b) => a.date.localeCompare(b.date))
+  .map((m) => {
+    const cacheTotal = m.cacheReadTokens + m.cacheCreationTokens;
+    const result = {
+      date: m.date,
+      count: m.count,
+      level: toLevel(m.count, mergedMax),
+    };
+    if (m.inputTokens || m.outputTokens || m.totalTokens) {
+      result.inputTokens = m.inputTokens;
+      result.outputTokens = m.outputTokens;
+      result.totalTokens = m.totalTokens;
+    }
+    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;
+    }
+    return result;
+  });
+
 const outPath = resolve(outDir, "data.json");
-writeFileSync(outPath, JSON.stringify(activities, null, 2));
-console.log(`Generated ${outPath} (${activities.length} days)`);
+writeFileSync(outPath, JSON.stringify(merged, null, 2));
+console.log(`Merged into ${outPath} (${merged.length} days)`);