ccusage 20.0.11 → 20.0.12

package/README.md

@@ -23,6 +23,27 @@
 
 > Analyze coding (agent) CLI token usage and costs from local data.
 
+## Major Sponsors
+
+<p align="center">
+    <a href="https://coderabbit.link/ryoppippi">
+        <picture>
+            <source media="(prefers-color-scheme: dark)" srcset="https://cdn.jsdelivr.net/gh/ccusage/ccusage@main/docs/public/coderabbit-logo-dark.svg">
+            <img src="https://cdn.jsdelivr.net/gh/ccusage/ccusage@main/docs/public/coderabbit-logo.svg" alt="CodeRabbit" width="320">
+        </picture>
+    </a>
+    &nbsp;&nbsp;&nbsp;&nbsp;
+    <a href="https://blacksmith.sh">
+        <img src="https://cdn.jsdelivr.net/gh/ccusage/ccusage@main/docs/public/blacksmith.png" alt="Blacksmith" width="320">
+    </a>
+</p>
+
+## Quick Start
+
+```bash
+npx ccusage@latest
+```
+
 ## Supported Sources
 
 ccusage reads local usage data from coding agent CLIs and turns it into daily, weekly, monthly, and session reports.
@@ -49,21 +70,21 @@ Use `ccusage daily`, `ccusage weekly`, `ccusage monthly`, or `ccusage session` t
 
 ## Installation
 
-### Quick Start (Recommended)
+### Package Runners
 
 You can run ccusage directly without a global installation:
 
 ```bash
-# Recommended
-bunx ccusage
+# npm
+npx ccusage@latest
 
 # Nix
 nix run github:ccusage/ccusage -- daily
 
 # Alternative package runners
+bunx ccusage
 pnpm dlx ccusage
 pnpx ccusage
-npx ccusage@latest
 
 # PR preview builds
 bunx -p https://pkg.pr.new/ccusage/ccusage@<pr-number> ccusage --offline
@@ -166,7 +187,7 @@ cd ccusage
 direnv allow
 ```
 
-The dev shell provides the pinned `pnpm`, Rust toolchain, GitHub CLI, git hooks, generated local agent skills, and project utilities from `flake.nix`. It also installs package dependencies from `pnpm-lock.yaml` when needed.
+The dev shell provides the pinned `pnpm`, Rust toolchain, GitHub CLI, git hooks, generated local agent skills, package tooling, and project utilities from `flake.nix`. Run `pnpm install --frozen-lockfile` only when a task needs workspace `node_modules`.
 
 Run project tasks with `just` from inside the Nix environment (`just --list` shows every recipe):
 
@@ -198,26 +219,7 @@ The scheduled `update pricing` workflow runs the same update and validation, the
 
 </details>
 
-## Sponsors
-
-<p align="center">
-    <strong>Sponsored by</strong>
-</p>
-
-<p align="center">
-    <a href="https://coderabbit.link/ryoppippi">
-        <picture>
-            <source media="(prefers-color-scheme: dark)" srcset="https://cdn.jsdelivr.net/gh/ccusage/ccusage@main/docs/public/coderabbit-logo-dark.svg">
-            <img src="https://cdn.jsdelivr.net/gh/ccusage/ccusage@main/docs/public/coderabbit-logo.svg" alt="CodeRabbit" width="320">
-        </picture>
-    </a>
-</p>
-
-<p align="center">
-    <a href="https://blacksmith.sh">
-        <img src="https://cdn.jsdelivr.net/gh/ccusage/ccusage@main/docs/public/blacksmith.png" alt="Blacksmith" width="320">
-    </a>
-</p>
+## GitHub Sponsors
 
 <p align="center">
     <a href="https://github.com/sponsors/ryoppippi">

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccusage",
-  "version": "20.0.11",
+  "version": "20.0.12",
   "description": "Analyze coding (agent) CLI token usage and costs from local data",
   "homepage": "https://github.com/ccusage/ccusage#readme",
   "bugs": {
@@ -15,19 +15,26 @@
   },
   "funding": "https://github.com/sponsors/ryoppippi",
   "bin": {
-    "ccusage": "./dist/cli.js"
+    "ccusage": "./src/cli.js"
   },
   "files": [
     "config-schema.json",
-    "dist/**/*.js"
+    "src/cli.js"
   ],
   "type": "module",
+  "devDependencies": {
+    "@types/node": "^24.10.1",
+    "publint": "^0.3.12"
+  },
   "optionalDependencies": {
-    "@ccusage/ccusage-darwin-arm64": "20.0.11",
-    "@ccusage/ccusage-darwin-x64": "20.0.11",
-    "@ccusage/ccusage-linux-x64": "20.0.11",
-    "@ccusage/ccusage-win32-arm64": "20.0.11",
-    "@ccusage/ccusage-win32-x64": "20.0.11",
-    "@ccusage/ccusage-linux-arm64": "20.0.11"
+    "@ccusage/ccusage-darwin-arm64": "20.0.12",
+    "@ccusage/ccusage-darwin-x64": "20.0.12",
+    "@ccusage/ccusage-linux-arm64": "20.0.12",
+    "@ccusage/ccusage-win32-arm64": "20.0.12",
+    "@ccusage/ccusage-linux-x64": "20.0.12",
+    "@ccusage/ccusage-win32-x64": "20.0.12"
+  },
+  "scripts": {
+    "build": "scripts/ensure-native-binary.nu && publint"
   }
 }

package/src/cli.js

@@ -0,0 +1,218 @@
+#!/usr/bin/env node
+// @ts-check
+import { spawn } from 'node:child_process';
+import { chmodSync, realpathSync, statSync } from 'node:fs';
+import { createRequire } from 'node:module';
+import process from 'node:process';
+import { fileURLToPath } from 'node:url';
+
+const require = createRequire(import.meta.url);
+
+/**
+ * @typedef {{ args: string[]; command: string } | { errorMessage: string }} CliRuntime
+ * @typedef {{ mode: number }} FileMode
+ * @typedef {{ error?: Error; signal?: NodeJS.Signals | null; status: number | null }} NativeSpawnResult
+ * @typedef {(command: string, args: string[]) => Promise<NativeSpawnResult>} NativeSpawner
+ * @typedef {{ argvEntry?: string; moduleUrl: string; realpathPath?: (path: string) => string }} MainModuleOptions
+ */
+
+/**
+ * @param {string} [platform]
+ * @param {string} [arch]
+ * @returns {string | undefined}
+ */
+function getNativePackageName(platform = process.platform, arch = process.arch) {
+	if (platform === 'darwin') {
+		if (arch === 'arm64') {
+			return '@ccusage/ccusage-darwin-arm64';
+		}
+		if (arch === 'x64') {
+			return '@ccusage/ccusage-darwin-x64';
+		}
+		return undefined;
+	}
+
+	if (platform === 'linux') {
+		if (arch === 'arm64') {
+			return '@ccusage/ccusage-linux-arm64';
+		}
+		if (arch === 'x64') {
+			return '@ccusage/ccusage-linux-x64';
+		}
+		return undefined;
+	}
+
+	if (platform === 'win32') {
+		if (arch === 'arm64') {
+			return '@ccusage/ccusage-win32-arm64';
+		}
+		if (arch === 'x64') {
+			return '@ccusage/ccusage-win32-x64';
+		}
+	}
+
+	return undefined;
+}
+
+/**
+ * @param {string} [platform]
+ * @returns {string}
+ */
+function getNativeBinarySubpath(platform = process.platform) {
+	return platform === 'win32' ? 'bin/ccusage.exe' : 'bin/ccusage';
+}
+
+/**
+ * @param {{ arch?: string; platform?: string; resolvePath?: (id: string) => string }} [options]
+ * @returns {string | undefined}
+ */
+function resolveNativeBinary({
+	arch = process.arch,
+	platform = process.platform,
+	resolvePath = (id) => require.resolve(id),
+} = {}) {
+	const packageName = getNativePackageName(platform, arch);
+	if (packageName == null) {
+		return undefined;
+	}
+
+	try {
+		return resolvePath(`${packageName}/${getNativeBinarySubpath(platform)}`);
+	} catch {
+		return undefined;
+	}
+}
+
+/**
+ * @param {{ arch?: string; argv: string[]; nativeBinaryPath?: string | null; platform?: string }} options
+ * @returns {CliRuntime}
+ */
+function resolveCliRuntime({
+	argv,
+	arch = process.arch,
+	nativeBinaryPath = resolveNativeBinary(),
+	platform = process.platform,
+}) {
+	if (nativeBinaryPath != null) {
+		return {
+			args: argv,
+			command: nativeBinaryPath,
+		};
+	}
+
+	return {
+		errorMessage: `ccusage native binary is not available for ${platform}-${arch}. Reinstall ccusage so optional native dependencies are installed.\n`,
+	};
+}
+
+/**
+ * @param {unknown} error
+ * @returns {string}
+ */
+function errorMessage(error) {
+	return error instanceof Error ? error.message : String(error);
+}
+
+/**
+ * @param {{ binaryPath: string; chmodPath?: (path: string, mode: number) => void; platform?: string; statPath?: (path: string) => FileMode }} options
+ * @returns {string | undefined}
+ */
+function ensureNativeBinaryExecutable({
+	binaryPath,
+	chmodPath = chmodSync,
+	platform = process.platform,
+	statPath = statSync,
+}) {
+	if (platform === 'win32') {
+		return undefined;
+	}
+
+	try {
+		const mode = statPath(binaryPath).mode;
+		if ((mode & 0o111) !== 0) {
+			return undefined;
+		}
+		chmodPath(binaryPath, 0o755);
+		return undefined;
+	} catch (error) {
+		return `ccusage native binary is not executable: ${errorMessage(error)}\n`;
+	}
+}
+
+/**
+ * @param {MainModuleOptions} options
+ * @returns {boolean}
+ */
+function isMainModule({ argvEntry = process.argv[1], moduleUrl, realpathPath = realpathSync }) {
+	if (argvEntry == null) {
+		return false;
+	}
+
+	const modulePath = fileURLToPath(moduleUrl);
+	try {
+		return realpathPath(modulePath) === realpathPath(argvEntry);
+	} catch {
+		return modulePath === argvEntry;
+	}
+}
+
+/**
+ * @returns {NativeSpawner}
+ */
+function createNativeSpawner() {
+	return async (command, args) =>
+		new Promise((resolve) => {
+			const child = spawn(command, args, { stdio: 'inherit' });
+			child.on('error', (error) => {
+				resolve({
+					error,
+					signal: null,
+					status: null,
+				});
+			});
+			child.on('exit', (status, signal) => {
+				resolve({
+					signal,
+					status,
+				});
+			});
+		});
+}
+
+/**
+ * @param {string[]} argv
+ * @param {NativeSpawner} [spawnNative]
+ * @returns {Promise<number>}
+ */
+async function runCli(argv, spawnNative = createNativeSpawner()) {
+	const runtime = resolveCliRuntime({ argv });
+	if ('errorMessage' in runtime) {
+		process.stderr.write(runtime.errorMessage);
+		return 1;
+	}
+
+	const executableError = ensureNativeBinaryExecutable({
+		binaryPath: runtime.command,
+	});
+	if (executableError != null) {
+		process.stderr.write(executableError);
+		return 1;
+	}
+
+	const result = await spawnNative(runtime.command, runtime.args);
+	if (result.error != null) {
+		process.stderr.write(`${result.error.message}\n`);
+		return 1;
+	}
+	if (result.signal != null) {
+		process.kill(process.pid, result.signal);
+		return 1;
+	}
+	return result.status ?? 1;
+}
+
+if (isMainModule({ moduleUrl: import.meta.url })) {
+	process.exitCode = await runCli(process.argv.slice(2));
+}
+
+export { ensureNativeBinaryExecutable, isMainModule, resolveCliRuntime, resolveNativeBinary };

package/dist/cli.js

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-import{createRequire as e}from"node:module";import{spawn as t}from"node:child_process";import{chmodSync as n,statSync as r}from"node:fs";import i from"node:process";const a=e(import.meta.url);function o(e=i.platform,t=i.arch){if(e===`darwin`)return t===`arm64`?`@ccusage/ccusage-darwin-arm64`:t===`x64`?`@ccusage/ccusage-darwin-x64`:void 0;if(e===`linux`)return t===`arm64`?`@ccusage/ccusage-linux-arm64`:t===`x64`?`@ccusage/ccusage-linux-x64`:void 0;if(e===`win32`){if(t===`arm64`)return`@ccusage/ccusage-win32-arm64`;if(t===`x64`)return`@ccusage/ccusage-win32-x64`}}function s(e=i.platform){return e===`win32`?`bin/ccusage.exe`:`bin/ccusage`}function c({arch:e=i.arch,platform:t=i.platform,resolvePath:n=e=>a.resolve(e)}={}){let r=o(t,e);if(r!=null)try{return n(`${r}/${s(t)}`)}catch{return}}function l({argv:e,arch:t=i.arch,nativeBinaryPath:n=c(),platform:r=i.platform}){return n==null?{errorMessage:`ccusage native binary is not available for ${r}-${t}. Reinstall ccusage so optional native dependencies are installed.\n`}:{args:e,command:n}}function u(e){return e instanceof Error?e.message:String(e)}function d({binaryPath:e,chmodPath:t=n,platform:a=i.platform,statPath:o=r}){if(a!==`win32`)try{if(o(e).mode&73)return;t(e,493);return}catch(e){return`ccusage native binary is not executable: ${u(e)}\n`}}function f(){return async(e,n)=>new Promise(r=>{let i=t(e,n,{stdio:`inherit`});i.on(`error`,e=>{r({error:e,signal:null,status:null})}),i.on(`exit`,(e,t)=>{r({signal:t,status:e})})})}async function p(e,t=f()){let n=l({argv:e});if(`errorMessage`in n)return i.stderr.write(n.errorMessage),1;let r=d({binaryPath:n.command});if(r!=null)return i.stderr.write(r),1;let a=await t(n.command,n.args);return a.error==null?a.signal==null?a.status??1:(i.kill(i.pid,a.signal),1):(i.stderr.write(`${a.error.message}\n`),1)}i.exitCode=await p(i.argv.slice(2));export{};
-//# sourceMappingURL=cli.js.map