axusage 3.2.0 → 3.3.0

package/dist/cli.js

@@ -7,6 +7,7 @@ import { usageCommand } from "./commands/usage-command.js";
 import { getCredentialSourcesPath } from "./config/credential-sources.js";
 import { getAvailableServices } from "./services/service-adapter-registry.js";
 import { configureColor } from "./utils/color.js";
+import { formatRequiresHelpText } from "./utils/format-requires-help-text.js";
 import { getRootOptionsError, } from "./utils/validate-root-options.js";
 // Parse --no-color early so help/error output is consistently uncolored.
 const shouldDisableColor = process.argv.includes("--no-color");
@@ -25,7 +26,7 @@ const program = new Command()
     .default("text"))
     .option("--auth-setup <service>", "set up authentication for a service (directs to appropriate CLI)")
     .option("--auth-status [service]", "check authentication status for services")
-    .addHelpText("after", () => `\nExamples:\n  # Fetch usage for all services\n  ${packageJson.name}\n\n  # JSON output for a single service\n  ${packageJson.name} --service claude --format json\n\n  # TSV output for piping to cut, awk, sort\n  ${packageJson.name} --format tsv | tail -n +2 | awk -F'\\t' '{print $1, $4"%"}'\n\n  # Filter Prometheus metrics with standard tools\n  ${packageJson.name} --format prometheus | grep axusage_utilization_percent\n\n  # Check authentication status for all services\n  ${packageJson.name} --auth-status\n\nSources config file: ${getCredentialSourcesPath()}\n(or set AXUSAGE_SOURCES to JSON to bypass file)\n\nRequires: claude, codex (ChatGPT), gemini, gh (Copilot) CLIs for auth\nOverride CLI paths: AXUSAGE_CLAUDE_PATH, AXUSAGE_CODEX_PATH, AXUSAGE_GEMINI_PATH, AXUSAGE_GH_PATH\n`);
+    .addHelpText("after", () => `\nExamples:\n  # Fetch usage for all services\n  ${packageJson.name}\n\n  # JSON output for a single service\n  ${packageJson.name} --service claude --format json\n\n  # TSV output for piping to cut, awk, sort\n  ${packageJson.name} --format tsv | tail -n +2 | awk -F'\\t' '{print $1, $4"%"}'\n\n  # Filter Prometheus metrics with standard tools\n  ${packageJson.name} --format prometheus | grep axusage_utilization_percent\n\n  # Check authentication status for all services\n  ${packageJson.name} --auth-status\n\nSources config file: ${getCredentialSourcesPath()}\n(or set AXUSAGE_SOURCES to JSON to bypass file)\n\n${formatRequiresHelpText()}\nOverride CLI paths: AXUSAGE_CLAUDE_PATH, AXUSAGE_CODEX_PATH, AXUSAGE_GEMINI_PATH, AXUSAGE_GH_PATH\n`);
 function fail(message) {
     console.error(`Error: ${message}`);
     console.error("Try 'axusage --help' for details.");

package/dist/commands/auth-status-command.js

@@ -1,6 +1,5 @@
-import { checkAuth } from "axauth";
+import { getServiceDiagnostic } from "../services/service-diagnostics.js";
 import { SUPPORTED_SERVICES, validateService, } from "../services/supported-service.js";
-import { getCopilotTokenFromCustomGhPath } from "../utils/copilot-gh-token.js";
 import { chalk } from "../utils/color.js";
 export function authStatusCommand(options) {
     const servicesToCheck = options.service
@@ -9,26 +8,16 @@ export function authStatusCommand(options) {
     let hasFailures = false;
     console.log(chalk.blue("\nAuthentication Status:\n"));
     for (const service of servicesToCheck) {
-        let result = checkAuth(service);
-        if (service === "copilot" && !result.authenticated) {
-            const tokenFromOverride = getCopilotTokenFromCustomGhPath();
-            if (tokenFromOverride) {
-                result = {
-                    ...result,
-                    authenticated: true,
-                    method: "GitHub CLI (AXUSAGE_GH_PATH)",
-                };
-            }
-        }
-        const status = result.authenticated
+        const diagnostic = getServiceDiagnostic(service);
+        const status = diagnostic.authenticated
             ? chalk.green("✓ authenticated")
             : chalk.red("✗ not authenticated");
-        if (!result.authenticated) {
+        if (!diagnostic.authenticated) {
             hasFailures = true;
         }
         console.log(`${chalk.bold(service)}: ${status}`);
-        if (result.method) {
-            console.log(`  ${chalk.dim("Method:")} ${chalk.dim(result.method)}`);
+        if (diagnostic.authMethod) {
+            console.log(`  ${chalk.dim("Method:")} ${chalk.dim(diagnostic.authMethod)}`);
         }
     }
     if (hasFailures) {

package/dist/services/service-diagnostics.d.ts

@@ -0,0 +1,11 @@
+import type { SupportedService } from "./supported-service.js";
+type ServiceDiagnostic = {
+    readonly service: SupportedService;
+    readonly cliAvailable: boolean;
+    readonly cliPath: string;
+    readonly authenticated: boolean;
+    readonly authMethod: string | undefined;
+};
+export type { ServiceDiagnostic };
+export declare function getServiceDiagnostic(service: SupportedService): ServiceDiagnostic;
+export declare function getAllServiceDiagnostics(): ServiceDiagnostic[];

package/dist/services/service-diagnostics.js

@@ -0,0 +1,29 @@
+import { checkAuth } from "axauth";
+import { checkCliDependency, getAuthCliDependency, } from "../utils/check-cli-dependency.js";
+import { getCopilotTokenFromCustomGhPath } from "../utils/copilot-gh-token.js";
+import { SUPPORTED_SERVICES } from "./supported-service.js";
+export function getServiceDiagnostic(service) {
+    const dependency = getAuthCliDependency(service);
+    const cliResult = checkCliDependency(dependency);
+    let authResult = checkAuth(service);
+    if (service === "copilot" && !authResult.authenticated) {
+        const tokenFromOverride = getCopilotTokenFromCustomGhPath();
+        if (tokenFromOverride) {
+            authResult = {
+                ...authResult,
+                authenticated: true,
+                method: "GitHub CLI (AXUSAGE_GH_PATH)",
+            };
+        }
+    }
+    return {
+        service,
+        cliAvailable: cliResult.ok,
+        cliPath: cliResult.path,
+        authenticated: authResult.authenticated,
+        authMethod: authResult.method,
+    };
+}
+export function getAllServiceDiagnostics() {
+    return SUPPORTED_SERVICES.map((service) => getServiceDiagnostic(service));
+}

package/dist/utils/format-requires-help-text.d.ts

@@ -0,0 +1,17 @@
+type RuntimeRequirement = {
+    readonly label: string;
+    readonly status: "ok";
+} | {
+    readonly label: string;
+    readonly status: "missing" | "not-authorized";
+    readonly fix: string;
+};
+export type { RuntimeRequirement };
+/**
+ * Formats a list of runtime requirements into a compact or detailed string.
+ *
+ * All-ok → single line: `Requires: claude, codex (ChatGPT), gemini, gh (Copilot)`
+ * Any non-ok → multi-line with inline remediation per requirement.
+ */
+export declare function formatRequiresSection(requirements: readonly RuntimeRequirement[]): string;
+export declare function formatRequiresHelpText(): string;

package/dist/utils/format-requires-help-text.js

@@ -0,0 +1,62 @@
+import { getAllServiceDiagnostics } from "../services/service-diagnostics.js";
+import { getAuthCliDependency } from "./check-cli-dependency.js";
+const SERVICE_LABELS = {
+    claude: "claude",
+    codex: "codex (ChatGPT)",
+    gemini: "gemini",
+    copilot: "gh (Copilot)",
+};
+const AUTH_FIX_COMMANDS = {
+    claude: "Run: claude",
+    codex: "Run: codex",
+    gemini: "Run: gemini",
+    copilot: "Run: gh auth login",
+};
+function diagnosticToRequirement(diagnostic) {
+    const label = SERVICE_LABELS[diagnostic.service];
+    if (!diagnostic.cliAvailable) {
+        const dependency = getAuthCliDependency(diagnostic.service);
+        return {
+            label,
+            status: "missing",
+            fix: `Install: ${dependency.installHint}. ` +
+                `Or set ${dependency.envVar}=/path/to/${dependency.command}`,
+        };
+    }
+    if (!diagnostic.authenticated) {
+        return {
+            label,
+            status: "not-authorized",
+            fix: AUTH_FIX_COMMANDS[diagnostic.service],
+        };
+    }
+    return { label, status: "ok" };
+}
+let cachedRequirements;
+function getRuntimeRequirementsStatus() {
+    if (cachedRequirements)
+        return cachedRequirements;
+    cachedRequirements = getAllServiceDiagnostics().map((d) => diagnosticToRequirement(d));
+    return cachedRequirements;
+}
+/**
+ * Formats a list of runtime requirements into a compact or detailed string.
+ *
+ * All-ok → single line: `Requires: claude, codex (ChatGPT), gemini, gh (Copilot)`
+ * Any non-ok → multi-line with inline remediation per requirement.
+ */
+export function formatRequiresSection(requirements) {
+    if (requirements.every((r) => r.status === "ok")) {
+        return `Requires: ${requirements.map((r) => r.label).join(", ")}`;
+    }
+    const lines = requirements.map((r) => {
+        if (r.status === "ok")
+            return `  - ${r.label}`;
+        const tag = r.status === "missing" ? "MISSING" : "NOT AUTHORIZED";
+        return `  - ${r.label} - ${tag}! ${r.fix}`;
+    });
+    return `Requires:\n${lines.join("\n")}`;
+}
+export function formatRequiresHelpText() {
+    return formatRequiresSection(getRuntimeRequirementsStatus());
+}

package/package.json

@@ -2,7 +2,7 @@
   "name": "axusage",
   "author": "Łukasz Jerciński",
   "license": "MIT",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "description": "Monitor API usage across Claude, ChatGPT, GitHub Copilot, and Gemini from a single CLI",
   "repository": {
     "type": "git",