ccusage-tracker 0.1.2 → 0.1.5

package/README.md

@@ -2,7 +2,7 @@
 
 CLI for [ccusage-tracker](https://github.com/ericcai0814/ccusage-tracker) — a self-hosted Claude Code usage tracker for teams.
 
-Install Claude Code SessionStart/SessionEnd hooks that report token usage to a self-hosted tracker server. Runs on macOS, Linux, and Windows.
+Install Claude Code SessionStart/SessionEnd/Stop hooks that report token usage to a self-hosted tracker server. Runs on macOS, Linux, and Windows.
 
 ## Quick start
 
@@ -24,12 +24,13 @@ After installation, the binary is also available as `tracker` (if installed glob
 
 ## What it does
 
-`setup` writes a config file to `~/.config/ccusage-tracker/config.json` and adds two hooks to your Claude Code `~/.claude/settings.json`:
+`setup` writes a config file to `~/.config/ccusage-tracker/config.json` and adds three hooks to your Claude Code `~/.claude/settings.json`:
 
 - **SessionStart** — records the model at session start
-- **SessionEnd** — POSTs token usage (and session metrics in 0.2.1+) to your team's tracker server
+- **Stop** — primary reporting path: POSTs token usage + session metrics after each assistant turn, throttled to once per 5 minutes
+- **SessionEnd** — backup path: same payload at session exit, in case Stop missed the last window
 
-Hook scripts are downloaded from your tracker server, so they always match the server version.
+Hook scripts are downloaded from your tracker server, so they always match the server version. Re-running `setup` migrates old (no `--mode`) commands and unquoted tracker hook paths in-place — no manual cleanup needed.
 
 ## Requirements
 

package/dist/index.js

@@ -2,6 +2,7 @@
 
 // src/commands/setup.ts
 import { createInterface } from "node:readline";
+import { spawnSync } from "node:child_process";
 
 // src/config.ts
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
@@ -36,21 +37,28 @@ function writeConfig(config) {
 import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2, copyFileSync, mkdirSync as mkdirSync2 } from "node:fs";
 import { join as join2 } from "node:path";
 import { homedir as homedir2 } from "node:os";
-var HOOK_TIMEOUT_SEC = 25;
+var HOOK_TIMEOUT_SEC = 45;
 function getClaudeSettingsPath() {
   return join2(homedir2(), ".claude", "settings.json");
 }
 function sessionEndScriptPath() {
   return join2(homedir2(), ".config", "ccusage-tracker", "session-end.mjs");
 }
+function quoteScriptPath(path) {
+  return `"${path}"`;
+}
+function buildHookCommand(scriptPath, mode) {
+  const command = "node " + quoteScriptPath(scriptPath);
+  return mode ? `${command} --mode=${mode}` : command;
+}
 function getHookCommand() {
-  return "node " + sessionEndScriptPath() + " --mode=session-end";
+  return buildHookCommand(sessionEndScriptPath(), "session-end");
 }
 function getStopHookCommand() {
-  return "node " + sessionEndScriptPath() + " --mode=stop";
+  return buildHookCommand(sessionEndScriptPath(), "stop");
 }
 function getStartHookCommand() {
-  return "node " + join2(homedir2(), ".config", "ccusage-tracker", "session-start.mjs");
+  return buildHookCommand(join2(homedir2(), ".config", "ccusage-tracker", "session-start.mjs"));
 }
 function isCcusageTrackerHook(command) {
   return !!command && command.includes("ccusage-tracker");
@@ -179,8 +187,7 @@ async function defaultCheckServer(serverUrl) {
 }
 function defaultCheckCcusage() {
   try {
-    Bun.spawnSync(["ccusage", "--version"]);
-    return true;
+    return spawnSync("ccusage --version", { encoding: "utf8", shell: true, timeout: 1e4 }).status === 0;
   } catch {
     return false;
   }
@@ -363,6 +370,7 @@ async function reportCommand(args) {
 
 // src/commands/status.ts
 import { existsSync as existsSync3, readFileSync as readFileSync3 } from "node:fs";
+import { spawnSync as spawnSync2 } from "node:child_process";
 import { join as join3, dirname } from "node:path";
 async function statusCommand() {
   const configPath = getConfigPath();
@@ -408,12 +416,36 @@ Hook: ${hookInstalled ? "installed" : "not installed"}`);
   } else {
     console.log("Buffer: none");
   }
+  const configDir = dirname(configPath);
+  const lastErrorPath = join3(configDir, "last-error.txt");
+  if (existsSync3(lastErrorPath)) {
+    console.log(`
+Last upload: FAILED - ${readFileSync3(lastErrorPath, "utf-8").trim()}`);
+    console.log("  用量目前並未上報。請量測 ccusage 耗時，若接近 25s 需再放寬 timeout：");
+    console.log("  time ccusage daily --json --since $(date +%Y%m%d)");
+  } else {
+    console.log(`
+Last upload: no recorded failure`);
+  }
+  const lastFlushPath = join3(configDir, "last-flush.txt");
+  if (existsSync3(lastFlushPath)) {
+    const ts = parseInt(readFileSync3(lastFlushPath, "utf-8").trim(), 10);
+    if (!isNaN(ts)) {
+      const ageMin = Math.floor((Date.now() - ts) / 60000);
+      console.log(`Last hook run: ${new Date(ts).toISOString()} (${ageMin} 分鐘前)`);
+    }
+  }
+  const probe = probeCcusage();
+  console.log(probe ? `ccusage: installed (${probe})` : "ccusage: not found (install with: npx ccusage@latest)");
+}
+function probeCcusage() {
   try {
-    const result = Bun.spawnSync(["ccusage", "--version"]);
-    const version = new TextDecoder().decode(result.stdout).trim();
-    console.log(`ccusage: installed (${version || "version unknown"})`);
+    const r = spawnSync2("ccusage --version", { encoding: "utf8", shell: true, timeout: 1e4 });
+    if (r.status !== 0 || !r.stdout)
+      return null;
+    return r.stdout.trim() || "version unknown";
   } catch {
-    console.log("ccusage: not found (install with: npx ccusage@latest)");
+    return null;
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccusage-tracker",
-  "version": "0.1.2",
+  "version": "0.1.5",
   "description": "CLI for ccusage-tracker — install Claude Code SessionStart/SessionEnd/Stop hooks to report token usage to a self-hosted team tracker.",
   "type": "module",
   "bin": {