@caius_kong/ccusage-dashboard 0.2.16 → 0.2.17

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,12 @@ 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.
+  (PATH → npx cache → `npx ccusage@latest`), picking the highest real version so it
+  always matches the system's `ccusage`; 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

@@ -51,28 +51,37 @@ def resolve_ccusage() -> list[str]:
     npx cache, the bun cache, then fall back to `npx --yes ccusage@latest`.
     Returns a command list to run.
     """
+    def _pkg_version(cli: Path) -> tuple | None:
+        """Real version of the ccusage package owning `cli`.
+
+        Read it from package.json, NEVER from the directory path: npm's npx
+        cache uses opaque hash dirs (no "ccusage@x.y.z"), so path-regex would
+        degrade every candidate to (0, 0, 0) and make "pick highest" a silent
+        no-op that picks an arbitrary (often stale) version.
+        """
+        pj = cli.parent.parent / "package.json"
+        try:
+            m = re.search(r'"version"\s*:\s*"(\d+)\.(\d+)\.(\d+)', pj.read_text())
+        except OSError:
+            return None
+        return tuple(map(int, m.groups())) if m else None
+
     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
+        """Highest-versioned ccusage in the npx/bun caches, or None.
+
+        Only candidates whose real version is readable are considered, so we
+        never fall back to an arbitrary pick. Returning None lets the caller
+        defer to `npx ccusage@latest`, which resolves the system's version.
+        """
+        roots = []
+        npm_target = Path.home() / ".npm/_npx"
+        if npm_target.is_dir():
+            roots.extend(npm_target.glob("*/node_modules/ccusage/src/cli.js"))
+        bun_target = Path.home() / ".bun/install/cache"
+        if bun_target.is_dir():
+            roots.extend(bun_target.glob("ccusage*/src/cli.js"))
+        scored = [(v, p) for p in roots if (v := _pkg_version(p)) is not None]
+        return str(max(scored)[1]) if scored else None
 
     explicit = _CCUSAGE_PATH_OVERRIDE
     if explicit:
@@ -80,11 +89,6 @@ def resolve_ccusage() -> list[str]:
     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)]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caius_kong/ccusage-dashboard",
-  "version": "0.2.16",
+  "version": "0.2.17",
   "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"
   }