@caius_kong/ccusage-dashboard 0.2.16 → 0.2.18

package/README.md

@@ -37,9 +37,9 @@ to what ccusage itself reports** — the source you already trust.
 npx @caius_kong/ccusage-dashboard
 ```
 
-That's it. npx downloads the package (including its own `ccusage` dependency),
-starts a local server on `http://127.0.0.1:8799`, and prints the dashboard URL
-for you to open.
+That's it. npx downloads the package, uses the `ccusage` already on your machine
+(or fetches the latest via `npx`), starts a local server on `http://127.0.0.1:8799`,
+and prints the dashboard URL for you to open.
 
 > Requirements: **Node.js** (for the launcher) and **Python 3.8+** (for the server).
 > On macOS: `brew install python3`. No other installs, no build step, no config.
@@ -95,11 +95,11 @@ Browser (index.html)
 server.py  (Python stdlib, zero deps)
    │  spawns:  ccusage daily/monthly/weekly ... --json --offline
    ▼
-ccusage   (bundled dependency — the real cost engine)
+ccusage   (your installed version — the real cost engine)
 ```
 
-- `lib/server.py` — Python stdlib HTTP server. Resolves a local ccusage
-  (bundled dep → PATH → npx cache), warms caches on boot (~3s), then serves instant responses.
+- `lib/server.py` — Python stdlib HTTP server. Resolves ccusage the same way you run
+  it (PATH → `npx ccusage`), so it always uses the system's version; warms caches on boot (~3s), then serves instant responses.
 - `lib/index.html` — single-file dashboard. No build step, no CDN.
 - `bin/ccusage-ui.js` — Node launcher (finds python3, starts server, prints URL).
 

package/lib/server.py

@@ -43,63 +43,25 @@ _lock = threading.Lock()
 
 
 def resolve_ccusage() -> list[str]:
-    """Resolve a fast local ccusage entrypoint.
+    """Resolve the ccusage CLI the system itself uses, and only that.
 
-    Prefer a directly invocable local binary/cache so we don't pay an `npx`
-    resolution + possible network fetch on every report (~5-7s cold). Look for,
-    in order: an explicit --ccusage-path, a global `ccusage` on PATH, the npm
-    npx cache, the bun cache, then fall back to `npx --yes ccusage@latest`.
-    Returns a command list to run.
+    Hard constraint: every number comes from the ccusage CLI, and it must be
+    the same one the user runs (`npx ccusage ...`). So we look for, in order,
+    an explicit --ccusage-path, a `ccusage` on PATH, then `npx --yes ccusage`.
+    No cache-scanning and no version-picking: the version is whatever the
+    system resolves, never a stale copy we chose ourselves.
     """
-    def _npx_cached_cli() -> str | None:
-        for base in ("npm", "bun"):
-            roots = []
-            if base == "npm":
-                target = Path.home() / ".npm/_npx"
-                if target.is_dir():
-                    roots.extend(p for p in target.glob("*/node_modules/ccusage/src/cli.js"))
-                # also newer npm layout
-                roots.extend((Path.home() / ".npm/_npx").glob("*/node_modules/ccusage/src/cli.js"))
-            else:
-                target = Path.home() / ".bun/install/cache"
-                if target.is_dir():
-                    roots.extend(p for p in target.glob("ccusage*/src/cli.js"))
-            # prefer highest semver-ish (sort by version suffix descending)
-            def _ver(p: Path) -> tuple:
-                s = p.as_posix()
-                m = re.search(r"ccusage@?(\d+)\.(\d+)\.(\d+)", s)
-                return tuple(map(int, m.groups())) if m else (0, 0, 0)
-            best = max(roots, key=_ver, default=None)
-            if best:
-                return str(best)
-        return None
-
     explicit = _CCUSAGE_PATH_OVERRIDE
     if explicit:
         return [explicit]
     p = shutil.which("ccusage")
     if p:
         return [p]
-    # Bundled ccusage dependency: walk up from the package to find node_modules/ccusage
-    for parent in APP_DIR.parents:
-        bundled = parent / "node_modules" / "ccusage" / "src" / "cli.js"
-        if bundled.exists():
-            return [_node(), str(bundled)]
-    cli = _npx_cached_cli()
-    if cli:
-        return [_node(), str(cli)]
-    return ["npx", "--yes", "ccusage@latest"]
+    return ["npx", "--yes", "ccusage"]
 
 
 _CCUSAGE_PATH_OVERRIDE: str | None = None
 
-
-def _node() -> str:
-    import shutil as _s
-
-    n = _s.which("node") or "node"
-    return n
-
 BUDGET = 300.0  # monthly cap in USD (override via --budget or CCUSAGE_BUDGET)
 TTL = {"/api/today": 15, "/api/week": 60, "/api/month": 60, "/api/range": 120, "/api/trend": 120, "/api/sessions": 60}
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caius_kong/ccusage-dashboard",
-  "version": "0.2.16",
+  "version": "0.2.18",
   "description": "One-command local dashboard for ccusage: today/week/month/custom cost by model, 30-day trend, monthly budget alert. Numbers straight from ccusage.",
   "license": "MIT",
   "type": "commonjs",
@@ -32,9 +32,7 @@
     "url": "https://github.com/caius-kong/ccusage-dashboard"
   },
   "author": "Caius Kong",
-  "dependencies": {
-    "ccusage": "^20.0.20"
-  },
+  "dependencies": {},
   "publishConfig": {
     "access": "public"
   }