@kairyou/agent-tools 0.8.0 → 0.10.0

package/integrations/usage/lib/format.mjs

@@ -4,6 +4,8 @@
 
 import { newApiQuotaScale, providerUsageDays } from "./config.mjs";
 
+const ONE_API_HARD_LIMIT_SENTINEL_USD = 1_000_000;
+
 export function pickNumber(obj, keys) {
   for (const key of keys) {
     const value = obj?.[key];
@@ -112,15 +114,34 @@ export async function formatQuota(data) {
   return keys ? `received (${keys})` : `checked ${unit}`;
 }
 
-export async function formatNewApiTokenLine(data) {
+export function newApiTokenQuota(data) {
   const root = usageRoot(data);
   const unlimited = root?.unlimited_quota === true || root?.unlimitedQuota === true;
-  const quota = pickNumber(root, ["quota", "limit", "total_quota", "totalQuota"]);
-  const used = pickNumber(root, ["used_quota", "usedQuota", "used"]);
-  let remaining = pickNumber(root, ["remain_quota", "remainQuota", "remaining", "balance"]);
+  const quota = pickNumber(root, [
+    "quota",
+    "limit",
+    "total_quota",
+    "totalQuota",
+    "total_granted",
+    "totalGranted",
+  ]);
+  const used = pickNumber(root, ["used_quota", "usedQuota", "used", "total_used", "totalUsed"]);
+  let remaining = pickNumber(root, [
+    "remain_quota",
+    "remainQuota",
+    "remaining",
+    "balance",
+    "total_available",
+    "totalAvailable",
+  ]);
   if (remaining === undefined && quota !== undefined && used !== undefined) {
     remaining = Math.max(0, quota - used);
   }
+  return { unlimited, quota, used, remaining };
+}
+
+export async function formatNewApiTokenLine(data) {
+  const { unlimited, quota, used, remaining } = newApiTokenQuota(data);
 
   if (!unlimited && quota === undefined && used === undefined && remaining === undefined) {
     throw new Error("NewAPI token usage payload has no quota fields");
@@ -128,7 +149,7 @@ export async function formatNewApiTokenLine(data) {
 
   const parts = [];
   if (unlimited) parts.push("unlimited");
-  if (remaining !== undefined) parts.push(`balance ${await formatNewApiQuota(remaining)}`);
+  if (!unlimited && remaining !== undefined) parts.push(`balance ${await formatNewApiQuota(remaining)}`);
   if (used !== undefined && quota !== undefined) {
     parts.push(`used ${await formatNewApiQuota(used)}/${await formatNewApiQuota(quota)}`);
   } else if (used !== undefined) {
@@ -158,9 +179,62 @@ export function formatOpenRouterLine(data) {
 }
 
 export function formatOneApiBillingLine(limit, used) {
+  if (!hasSpendableOneApiLimit(limit)) return `used ${formatMoney(used)}`;
   return `balance ${formatMoney(Math.max(0, limit - used))} | used ${formatMoney(used)}/${formatMoney(limit)}`;
 }
 
+export function hasSpendableOneApiLimit(limit) {
+  return Number.isFinite(limit) && limit >= 0 && limit < ONE_API_HARD_LIMIT_SENTINEL_USD;
+}
+
+function effectiveClaudeCodeHubWindow(root, suffix) {
+  const keyLimit = pickNumber(root, [`keyLimit${suffix}Usd`]);
+  if (keyLimit !== undefined && keyLimit > 0) {
+    return { limit: keyLimit, used: pickNumber(root, [`keyCurrent${suffix}Usd`]) };
+  }
+  const userLimit = pickNumber(root, [`userLimit${suffix}Usd`]);
+  return {
+    limit: userLimit !== undefined && userLimit > 0 ? userLimit : undefined,
+    used: pickNumber(root, [`userCurrent${suffix}Usd`]),
+  };
+}
+
+function earliestDate(...values) {
+  return values
+    .map((value) => ({ value, time: Date.parse(value) }))
+    .filter((entry) => entry.value && Number.isFinite(entry.time))
+    .sort((left, right) => left.time - right.time)[0]?.value;
+}
+
+export function formatClaudeCodeHubLine(data) {
+  const root = usageRoot(data);
+  const windows = [
+    ["5h", "5h"],
+    ["D", "Daily"],
+    ["W", "Weekly"],
+    ["M", "Monthly"],
+    ["T", "Total"],
+  ];
+  const parts = [];
+
+  for (const [label, suffix] of windows) {
+    const { limit, used } = effectiveClaudeCodeHubWindow(root, suffix);
+    if (limit !== undefined && used !== undefined) {
+      parts.push(`${label} ${formatMoney(used)}/${formatMoney(limit)}`);
+    }
+  }
+
+  if (parts.length === 0) {
+    const totalUsed = pickNumber(root, ["keyCurrentTotalUsd", "userCurrentTotalUsd"]);
+    if (totalUsed !== undefined) parts.push(`used ${formatMoney(totalUsed)}`);
+  }
+
+  const expires = shortDate(earliestDate(root?.expiresAt, root?.userExpiresAt));
+  if (expires) parts.push(`Exp ${expires}`);
+  if (parts.length === 0) throw new Error("Claude Code Hub quota payload has no quota fields");
+  return parts.join(" | ");
+}
+
 function formatQuotaLimitedLine(root) {
   const quota = root?.quota || {};
   const limit = pickNumber(quota, ["limit", "quota"]);

package/integrations/usage/lib/http.mjs

@@ -4,7 +4,10 @@
 import { createContext, runInContext } from "node:vm";
 import { debugLog } from "./config.mjs";
 
-const REQUEST_TIMEOUT_MS = 5000;
+// No user waits on this request: the hook reads a snapshot and refreshes in a
+// detached process, and skill/CLI queries are explicit. Custom routes can pass
+// their own timeoutMs.
+const DEFAULT_REQUEST_TIMEOUT_MS = 10_000;
 const SHIELD_USER_AGENT =
   "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 " +
   "(KHTML, like Gecko) Chrome/132.0.0.0 Safari/537.36";
@@ -126,7 +129,7 @@ function mergeSetCookiePairs(cookieHeader, setCookieHeaders) {
 }
 
 export async function requestJson(url, options = {}) {
-  const { key = "", headers = {}, name = "usage", timeoutMs = REQUEST_TIMEOUT_MS } = options;
+  const { key = "", headers = {}, name = "usage", timeoutMs = DEFAULT_REQUEST_TIMEOUT_MS } = options;
   let cookieHeader = "";
   for (let attempt = 0; attempt < 2; attempt += 1) {
     const controller = new AbortController();

package/integrations/usage/lib/routes.mjs

@@ -24,9 +24,12 @@ import {
   usageRoot,
   hasV1UsageFields,
   formatQuota,
+  newApiTokenQuota,
   formatNewApiTokenLine,
   formatOneApiBillingLine,
+  hasSpendableOneApiLimit,
   formatOpenRouterLine,
+  formatClaudeCodeHubLine,
 } from "./format.mjs";
 import { readRouteCache } from "./cache.mjs";
 
@@ -66,13 +69,7 @@ async function fetchNewApiTokenUsage(context) {
     key: context.key,
     name: "New API token usage",
   });
-  const root = usageRoot(json);
-  const quota = pickNumber(root, ["quota", "limit", "total_quota", "totalQuota"]);
-  const used = pickNumber(root, ["used_quota", "usedQuota", "used"]);
-  let remaining = pickNumber(root, ["remain_quota", "remainQuota", "remaining", "balance"]);
-  if (remaining === undefined && quota !== undefined && used !== undefined) {
-    remaining = Math.max(0, quota - used);
-  }
+  const { quota, used, remaining } = newApiTokenQuota(json);
   const scale = await newApiQuotaScale();
   const quotaForWarning = scale ? quota / scale : quota;
   const usedForWarning = scale ? used / scale : used;
@@ -109,13 +106,16 @@ async function fetchOneApiBillingUsage(context) {
     throw new Error("One API billing payload has no quota fields");
   }
   const used = usageCents / 100;
+  const spendableLimit = hasSpendableOneApiLimit(limit);
   const normalized = {
-    mode: "quota_limited",
-    quota: {
-      limit,
-      used,
-      remaining: Math.max(0, limit - used),
-    },
+    mode: spendableLimit ? "quota_limited" : "unrestricted",
+    ...(spendableLimit ? {
+      quota: {
+        limit,
+        used,
+        remaining: Math.max(0, limit - used),
+      },
+    } : { used }),
     unit: "USD",
     source: "oneapi-billing",
     raw: { subscription, usage },
@@ -128,6 +128,24 @@ async function fetchOneApiBillingUsage(context) {
   );
 }
 
+// Claude Code Hub exposes self-scoped quota windows to the same API key used
+// for model requests. The endpoint accepts the existing Bearer authentication.
+async function fetchClaudeCodeHubUsage(context) {
+  const base = cleanBaseUrl(context.baseUrl)
+    .replace(/\/api\/v1$/i, "")
+    .replace(/\/v1$/i, "");
+  const json = await requestJson(joinUrl(base, "/api/v1/me/quota"), {
+    key: context.key,
+    name: "Claude Code Hub quota",
+  });
+  return usageResult(
+    context,
+    "claude-code-hub",
+    formatClaudeCodeHubLine(json),
+    json
+  );
+}
+
 // OpenRouter exposes normal API-key usage at /api/v1/key. Some accounts also
 // expose credits at /api/v1/credits; keep this route isolated because
 // OpenRouter's base URL already includes /api/v1, unlike New API.
@@ -173,6 +191,11 @@ const USAGE_ROUTES = {
     path: "/api/v1/key",
     run: fetchOpenRouterUsage,
   },
+  "claude-code-hub": {
+    id: "claude-code-hub",
+    path: "/api/v1/me/quota",
+    run: fetchClaudeCodeHubUsage,
+  },
 };
 
 // User-authored gateway routes, declared in config.jsonc:
@@ -256,7 +279,8 @@ async function routeRegistry() {
   return registry;
 }
 
-// Presets select API-key usage protocols, not hosted gateway brands.
+// Presets primarily select API-key usage protocols. Brand aliases map to a
+// shared protocol when the upstream gateway exposes the same endpoints.
 async function usageRouteIds(context) {
   const preset = await usagePreset();
   const routes = {
@@ -264,7 +288,10 @@ async function usageRouteIds(context) {
     "openai-compatible": ["v1-usage"],
     "new-api": ["newapi-token"],
     "one-api": ["oneapi-billing"],
+    "one-hub": ["oneapi-billing"],
+    "done-hub": ["oneapi-billing"],
     "openrouter": ["openrouter"],
+    "claude-code-hub": ["claude-code-hub"],
   };
   if (routes[preset]) return routes[preset];
 
@@ -275,7 +302,7 @@ async function usageRouteIds(context) {
   const customIds = (await customRoutes()).map((route) => route.id);
   const builtinIds = hostIncludes(context.baseUrl, "openrouter.ai")
     ? ["openrouter"]
-    : ["v1-usage", "newapi-token", "oneapi-billing"];
+    : ["v1-usage", "newapi-token", "oneapi-billing", "claude-code-hub"];
   return [...new Set([...customIds, ...builtinIds])];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kairyou/agent-tools",
-  "version": "0.8.0",
+  "version": "0.10.0",
   "description": "Reusable Agent Skills and installable integrations (statusline, provider usage, vision) for Codex, Claude Code, and opencode.",
   "license": "MIT",
   "repository": {
@@ -15,6 +15,7 @@
   },
   "files": [
     "config.default.jsonc",
+    "docs/",
     "dist/",
     "integrations/",
     "scripts/",

package/scripts/install.mjs

@@ -57,6 +57,15 @@ const INSTALL_ROOT =
   process.env.AGENT_TOOLS_HOME || path.join(os.homedir(), ".agent-tools");
 const META_KEY = "_agentTools";
 const META_VERSION = 1;
+// Stamped into install-state.json so a later install can tell which release
+// wrote the current layout. Purely informational today.
+const PACKAGE_VERSION = (() => {
+  try {
+    return JSON.parse(fs.readFileSync(path.join(REPO_ROOT, "package.json"), "utf8")).version || "";
+  } catch {
+    return "";
+  }
+})();
 // Everything copied into ~/.agent-tools is built output from dist/ (see
 // scripts/build.mjs); integrations/ holds the sources.
 const SOURCE = {
@@ -395,14 +404,13 @@ function removeFile(file, dryRun) {
   console.log(`  removed ${file}`);
 }
 
-function usageEntry() {
+function usageEntry({ silent = false } = {}) {
   return {
     hooks: [
       {
         type: "command",
-        command: nodeCmd(RUNTIME.codexUsageHook),
+        command: `${nodeCmd(RUNTIME.codexUsageHook)}${silent ? " --silent" : ""}`,
         timeout: 5,
-        statusMessage: "Refreshing API usage",
       },
     ],
   };
@@ -433,7 +441,7 @@ function applyProviderUsage(cfg, { remove }) {
     }
     cfg.hooks[event] = cfg.hooks[event] || [];
     cfg.hooks[event] = cfg.hooks[event].filter((entry) => !isOurProviderUsageEntry(entry));
-    cfg.hooks[event].push(usageEntry());
+    cfg.hooks[event].push(usageEntry({ silent: event === "UserPromptSubmit" }));
   }
   if (Object.keys(cfg.hooks).length === 0) delete cfg.hooks;
 }
@@ -631,6 +639,7 @@ function managedSkillStatus(dest, identity) {
 
 function recordManagedSkill(dest, identity) {
   const state = readInstallState();
+  state.packageVersion = PACKAGE_VERSION;
   state.artifacts[skillManifestKey(dest)] = {
     path: fwd(path.resolve(dest)),
     ...identity,

package/scripts/publish.mjs

@@ -41,8 +41,12 @@ if (typeof PACKAGE_NAME !== "string" || PACKAGE_NAME.trim() === "") {
 }
 
 function runNpm(args, { capture = false, allowFailure = false } = {}) {
-  const npmExecPath = process.env.npm_execpath;
-  const command = npmExecPath ? process.execPath : process.platform === "win32" ? "npm.cmd" : "npm";
+  // npm run sets npm_execpath. When invoked directly (`node scripts/...`), find
+  // the bundled npm-cli.js next to node — spawning npm.cmd fails on Node 22+.
+  // Version-manager layouts may not have it there, so fall back to PATH.
+  const bundledNpm = path.join(path.dirname(process.execPath), "node_modules", "npm", "bin", "npm-cli.js");
+  const npmExecPath = process.env.npm_execpath || (fs.existsSync(bundledNpm) ? bundledNpm : undefined);
+  const command = npmExecPath ? process.execPath : "npm";
   const commandArgs = npmExecPath ? [npmExecPath, ...args] : args;
   const result = spawnSync(command, commandArgs, {
     cwd: ROOT,

package/scripts/release.mjs

@@ -78,12 +78,14 @@ function run(command, args, { label, onFailure } = {}) {
 }
 
 function runNpm(args) {
-  const npmExecPath = process.env.npm_execpath;
-  if (npmExecPath) {
-    run(process.execPath, [npmExecPath, ...args], { label: `npm ${args.join(" ")}` });
-  } else {
-    run(process.platform === "win32" ? "npm.cmd" : "npm", args);
-  }
+  // npm run sets npm_execpath. When invoked directly (`node scripts/...`), find
+  // the bundled npm-cli.js next to node — spawning npm.cmd fails on Node 22+.
+  // Version-manager layouts may not have it there, so fall back to PATH.
+  const bundledNpm = path.join(path.dirname(process.execPath), "node_modules", "npm", "bin", "npm-cli.js");
+  const npmExecPath = process.env.npm_execpath || (fs.existsSync(bundledNpm) ? bundledNpm : undefined);
+  const command = npmExecPath ? process.execPath : "npm";
+  const commandArgs = npmExecPath ? [npmExecPath, ...args] : args;
+  run(command, commandArgs, { label: `npm ${args.join(" ")}` });
 }
 
 function printRecovery(commands) {