@kairyou/agent-tools 0.6.0 → 0.7.1

package/dist/usage/core.mjs

@@ -4,7 +4,7 @@
 import { pathToFileURL as pathToFileURL2 } from "node:url";
 
 // integrations/usage/lib/config.mjs
-import { readFile, writeFile, mkdir } from "node:fs/promises";
+import { readFile, writeFile, mkdir, open, stat } from "node:fs/promises";
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { homedir } from "node:os";
@@ -905,10 +905,28 @@ async function agentConfig() {
   }
   return agentConfigCache;
 }
+var DEBUG_LOG_MAX_BYTES = 256 * 1024;
+var DEBUG_LOG_KEEP_BYTES = 128 * 1024;
+async function rotateDebugLogIfNeeded() {
+  try {
+    const { size } = await stat(DEBUG_PATH);
+    if (size <= DEBUG_LOG_MAX_BYTES) return;
+    const handle = await open(DEBUG_PATH, "r");
+    try {
+      const buffer = Buffer.alloc(DEBUG_LOG_KEEP_BYTES);
+      await handle.read(buffer, 0, DEBUG_LOG_KEEP_BYTES, size - DEBUG_LOG_KEEP_BYTES);
+      await writeFile(DEBUG_PATH, buffer.toString("utf8").replace(/^[^\n]*\n?/, ""));
+    } finally {
+      await handle.close();
+    }
+  } catch {
+  }
+}
 async function debugLog(event) {
   const config = await agentConfig();
   if (process.env.PROVIDER_USAGE_DEBUG !== "1" && config.debug !== true) return;
   await mkdir(dirname(DEBUG_PATH), { recursive: true });
+  await rotateDebugLogIfNeeded();
   const line = JSON.stringify({
     at: (/* @__PURE__ */ new Date()).toISOString(),
     ...event
@@ -919,33 +937,13 @@ async function debugLog(event) {
 async function providerUsageDays() {
   const config = await agentConfig();
   const value = Number(process.env.PROVIDER_USAGE_DAYS || config.days || DEFAULT_USAGE_DAYS);
-  if (!Number.isInteger(value) || value <= 0 || value > MAX_USAGE_DAYS) return DEFAULT_USAGE_DAYS;
-  return value;
+  if (!Number.isInteger(value) || value <= 0) return DEFAULT_USAGE_DAYS;
+  return Math.min(value, MAX_USAGE_DAYS);
 }
 async function usagePreset() {
   const config = await agentConfig();
   return String(process.env.PROVIDER_USAGE_PRESET || config.preset || "auto").toLowerCase();
 }
-async function panelUserId() {
-  const config = await agentConfig();
-  const raw = process.env.PROVIDER_USAGE_USER_ID || config.userId || "";
-  const parsed = Number.parseInt(String(raw), 10);
-  return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
-}
-async function panelUserHeaders() {
-  const userId = await panelUserId();
-  if (!userId) return {};
-  const value = String(userId);
-  return {
-    "New-API-User": value,
-    "Veloera-User": value,
-    "voapi-user": value,
-    "User-id": value,
-    "X-User-Id": value,
-    "Rix-Api-User": value,
-    "neo-api-user": value
-  };
-}
 function snapshotTtlMs() {
   const raw = Number(process.env.AGENT_TOOLS_USAGE_SNAPSHOT_TTL_MS);
   return Number.isFinite(raw) && raw >= 0 ? raw : 6e4;
@@ -1205,11 +1203,11 @@ function mergeSetCookiePairs(cookieHeader, setCookieHeaders) {
   return merged;
 }
 async function requestJson(url, options = {}) {
-  const { key = "", headers = {}, name = "usage" } = options;
+  const { key = "", headers = {}, name = "usage", timeoutMs = REQUEST_TIMEOUT_MS } = options;
   let cookieHeader = "";
   for (let attempt = 0; attempt < 2; attempt += 1) {
     const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+    const timeout = setTimeout(() => controller.abort(), timeoutMs);
     const response = await fetch(url, {
       headers: {
         accept: "application/json",
@@ -1388,36 +1386,8 @@ function formatOpenRouterLine(label, data) {
   if (parts.length === 1) throw new Error("OpenRouter payload has no usage fields");
   return parts.join(" | ");
 }
-function panelQuotaScale(kind) {
-  return kind === "veloera" ? 1e6 : DEFAULT_NEW_API_QUOTA_SCALE;
-}
-function panelQuotaLooksRemaining(kind) {
-  return ["new-api", "anyrouter", "agentrouter", "done-hub", "donehub"].includes(kind);
-}
-async function formatPanelUserSelfLine(label, data, kind) {
-  const root = usageRoot(data);
-  const scale = panelQuotaScale(kind);
-  const quota = pickNumber(root, ["quota"]);
-  const used = pickNumber(root, ["used_quota", "usedQuota"]);
-  const todayIncome = pickNumber(root, ["today_income", "todayIncome"]);
-  const todayUsed = pickNumber(root, ["today_quota_consumption", "todayQuotaConsumption"]);
-  if (quota === void 0 && used === void 0) {
-    throw new Error("panel /api/user/self payload has no quota fields");
-  }
-  const quotaUsd = quota === void 0 ? void 0 : quota / scale;
-  const usedUsd = used === void 0 ? void 0 : used / scale;
-  const remainingUsd = panelQuotaLooksRemaining(kind) ? quotaUsd : quotaUsd === void 0 || usedUsd === void 0 ? quotaUsd : Math.max(0, quotaUsd - usedUsd);
-  const totalUsd = panelQuotaLooksRemaining(kind) ? quotaUsd === void 0 || usedUsd === void 0 ? quotaUsd : quotaUsd + usedUsd : quotaUsd;
-  const parts = usageParts();
-  if (remainingUsd !== void 0) parts.push(`balance ${formatMoney(remainingUsd)}`);
-  if (usedUsd !== void 0 && totalUsd !== void 0) {
-    parts.push(`used ${formatMoney(usedUsd)}/${formatMoney(totalUsd)}`);
-  } else if (usedUsd !== void 0) {
-    parts.push(`used ${formatMoney(usedUsd)}`);
-  }
-  if (todayUsed !== void 0) parts.push(`today ${formatMoney(todayUsed / scale)}`);
-  if (todayIncome !== void 0) parts.push(`income ${formatMoney(todayIncome / scale)}`);
-  return parts.join(" | ");
+function formatOneApiBillingLine(limit, used) {
+  return `API | balance ${formatMoney(Math.max(0, limit - used))} | used ${formatMoney(used)}/${formatMoney(limit)}`;
 }
 function formatQuotaLimitedLine(label, root) {
   const quota = root?.quota || {};
@@ -1497,7 +1467,7 @@ async function fetchV1Usage(context) {
 async function fetchNewApiTokenUsage(context) {
   const json = await requestJson(joinUrl(serviceRoot(context.baseUrl), "/api/usage/token/"), {
     key: context.key,
-    name: "NewAPI token usage"
+    name: "New API token usage"
   });
   const root = usageRoot(json);
   const quota = pickNumber(root, ["quota", "limit", "total_quota", "totalQuota"]);
@@ -1523,66 +1493,37 @@ async function fetchNewApiTokenUsage(context) {
   };
   return usageResult(context, "newapi-token", await formatNewApiTokenLine(context.label, json), normalized);
 }
-async function fetchPanelUserSelfUsage(context) {
-  const preset = await usagePreset();
-  const kind = preset === "auto" ? "new-api" : preset;
-  const json = await requestJson(joinUrl(serviceRoot(context.baseUrl), "/api/user/self"), {
+async function fetchOneApiBillingUsage(context) {
+  const base = serviceRoot(context.baseUrl);
+  const subscription = await requestJson(joinUrl(base, "/v1/dashboard/billing/subscription"), {
     key: context.key,
-    name: "panel /api/user/self",
-    headers: await panelUserHeaders()
+    name: "One API billing subscription"
   });
-  const root = usageRoot(json);
-  if (pickNumber(root, ["quota"]) === void 0 && pickNumber(root, ["used_quota", "usedQuota"]) === void 0) {
-    await debugLog({
-      source: "panel /api/user/self",
-      payloadKeys: Object.keys(root || {}).slice(0, 20),
-      success: root?.success,
-      message: root?.message || root?.error?.message || ""
-    });
+  const usage = await requestJson(joinUrl(base, "/v1/dashboard/billing/usage"), {
+    key: context.key,
+    name: "One API billing usage"
+  });
+  const limit = pickNumber(subscription, ["hard_limit_usd", "hardLimitUsd"]);
+  const usageCents = pickNumber(usage, ["total_usage", "totalUsage"]);
+  if (limit === void 0 || usageCents === void 0) {
+    throw new Error("One API billing payload has no quota fields");
   }
-  const scale = panelQuotaScale(kind);
-  const quota = pickNumber(root, ["quota"]);
-  const used = pickNumber(root, ["used_quota", "usedQuota"]);
-  const remaining = panelQuotaLooksRemaining(kind) ? quota : quota === void 0 || used === void 0 ? quota : Math.max(0, quota - used);
-  const total = panelQuotaLooksRemaining(kind) ? quota === void 0 || used === void 0 ? quota : quota + used : quota;
+  const used = usageCents / 100;
   const normalized = {
     mode: "quota_limited",
     quota: {
-      limit: total === void 0 ? void 0 : total / scale,
-      used: used === void 0 ? void 0 : used / scale,
-      remaining: remaining === void 0 ? void 0 : remaining / scale
+      limit,
+      used,
+      remaining: Math.max(0, limit - used)
     },
     unit: "USD",
-    source: "panel-user-self",
-    raw: json
-  };
-  return usageResult(
-    context,
-    "panel-user-self",
-    await formatPanelUserSelfLine(context.label, json, kind),
-    normalized
-  );
-}
-async function fetchSub2ApiAuthMeUsage(context) {
-  const json = await requestJson(joinUrl(serviceRoot(context.baseUrl), "/api/v1/auth/me"), {
-    key: context.key,
-    name: "Sub2API auth/me"
-  });
-  const root = usageRoot(json);
-  const balance = pickNumber(root, ["balance"]);
-  if (balance === void 0) throw new Error("Sub2API auth/me payload has no balance field");
-  const normalized = {
-    mode: "unrestricted",
-    planName: root?.username || root?.email || context.label || "Sub2API",
-    balance,
-    unit: "USD",
-    source: "sub2api-auth-me",
-    raw: json
+    source: "oneapi-billing",
+    raw: { subscription, usage }
   };
   return usageResult(
     context,
-    "sub2api-auth-me",
-    `API | balance ${formatMoney(balance)}`,
+    "oneapi-billing",
+    formatOneApiBillingLine(limit, used),
     normalized
   );
 }
@@ -1610,20 +1551,15 @@ var USAGE_ROUTES = {
     path: "/v1/usage",
     run: fetchV1Usage
   },
-  "sub2api-auth-me": {
-    id: "sub2api-auth-me",
-    path: "/api/v1/auth/me",
-    run: fetchSub2ApiAuthMeUsage
-  },
   "newapi-token": {
     id: "newapi-token",
     path: "/api/usage/token/",
     run: fetchNewApiTokenUsage
   },
-  "panel-user-self": {
-    id: "panel-user-self",
-    path: "/api/user/self",
-    run: fetchPanelUserSelfUsage
+  "oneapi-billing": {
+    id: "oneapi-billing",
+    path: "/v1/dashboard/billing/subscription",
+    run: fetchOneApiBillingUsage
   },
   "openrouter": {
     id: "openrouter",
@@ -1697,23 +1633,16 @@ async function routeRegistry() {
 async function usageRouteIds(context) {
   const preset = await usagePreset();
   const routes = {
-    "sub2api": ["v1-usage", "sub2api-auth-me"],
+    "sub2api": ["v1-usage"],
     "openai-compatible": ["v1-usage"],
-    "new-api": ["newapi-token", "panel-user-self"],
-    "one-api": ["newapi-token", "panel-user-self"],
-    "onehub": ["newapi-token", "panel-user-self"],
-    "one-hub": ["newapi-token", "panel-user-self"],
-    "donehub": ["newapi-token", "panel-user-self"],
-    "done-hub": ["newapi-token", "panel-user-self"],
-    "veloera": ["panel-user-self", "newapi-token"],
-    "anyrouter": ["newapi-token", "panel-user-self", "v1-usage"],
-    "agentrouter": ["newapi-token", "panel-user-self", "v1-usage"],
+    "new-api": ["newapi-token"],
+    "one-api": ["oneapi-billing"],
     "openrouter": ["openrouter"]
   };
   if (routes[preset]) return routes[preset];
   if (preset !== "auto") return (await routeRegistry())[preset] ? [preset] : [];
   const customIds = (await customRoutes()).map((route) => route.id);
-  const builtinIds = hostIncludes(context.baseUrl, "openrouter.ai") ? ["openrouter"] : ["v1-usage", "sub2api-auth-me", "newapi-token", "panel-user-self"];
+  const builtinIds = hostIncludes(context.baseUrl, "openrouter.ai") ? ["openrouter"] : ["v1-usage", "newapi-token", "oneapi-billing"];
   return [.../* @__PURE__ */ new Set([...customIds, ...builtinIds])];
 }
 async function cachedUsageRoute(context, registry) {

package/integrations/usage/cli.mjs

@@ -2,6 +2,7 @@
 // Local CLI used by the managed at-usage skills.
 
 import { queryAgentProviderUsage } from "./core.mjs";
+import { debugLog } from "./lib/config.mjs";
 
 function parseAgent(argv) {
   for (let index = 0; index < argv.length; index += 1) {
@@ -20,8 +21,10 @@ if (agent !== "claude" && agent !== "codex") {
   try {
     const result = await queryAgentProviderUsage(agent);
     if (result?.text) process.stdout.write(`${result.text}\n`);
-  } catch {
+  } catch (error) {
     // Usage is informational. Leave stdout empty so the skill can report the
-    // provider as unavailable without exposing endpoint or credential details.
+    // provider as unavailable without exposing endpoint or credential details;
+    // with providerUsage.debug the error lands in logs/usage-debug.log.
+    await debugLog({ source: "cli", agent, error: error?.message || String(error) }).catch(() => {});
   }
 }

package/integrations/usage/lib/config.mjs

@@ -1,7 +1,7 @@
 // Paths, constants, config.jsonc access, and debug logging shared by the
 // usage runtime modules.
 
-import { readFile, writeFile, mkdir } from "node:fs/promises";
+import { readFile, writeFile, mkdir, open, stat } from "node:fs/promises";
 import { existsSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { homedir } from "node:os";
@@ -47,10 +47,31 @@ export async function agentConfig() {
   return agentConfigCache;
 }
 
+const DEBUG_LOG_MAX_BYTES = 256 * 1024;
+const DEBUG_LOG_KEEP_BYTES = 128 * 1024;
+
+async function rotateDebugLogIfNeeded() {
+  try {
+    const { size } = await stat(DEBUG_PATH);
+    if (size <= DEBUG_LOG_MAX_BYTES) return;
+    const handle = await open(DEBUG_PATH, "r");
+    try {
+      const buffer = Buffer.alloc(DEBUG_LOG_KEEP_BYTES);
+      await handle.read(buffer, 0, DEBUG_LOG_KEEP_BYTES, size - DEBUG_LOG_KEEP_BYTES);
+      await writeFile(DEBUG_PATH, buffer.toString("utf8").replace(/^[^\n]*\n?/, ""));
+    } finally {
+      await handle.close();
+    }
+  } catch {
+    // Rotation is best-effort; appending must not fail because of it.
+  }
+}
+
 export async function debugLog(event) {
   const config = await agentConfig();
   if (process.env.PROVIDER_USAGE_DEBUG !== "1" && config.debug !== true) return;
   await mkdir(dirname(DEBUG_PATH), { recursive: true });
+  await rotateDebugLogIfNeeded();
   const line = JSON.stringify({
     at: new Date().toISOString(),
     ...event,
@@ -61,8 +82,8 @@ export async function debugLog(event) {
 export async function providerUsageDays() {
   const config = await agentConfig();
   const value = Number(process.env.PROVIDER_USAGE_DAYS || config.days || DEFAULT_USAGE_DAYS);
-  if (!Number.isInteger(value) || value <= 0 || value > MAX_USAGE_DAYS) return DEFAULT_USAGE_DAYS;
-  return value;
+  if (!Number.isInteger(value) || value <= 0) return DEFAULT_USAGE_DAYS;
+  return Math.min(value, MAX_USAGE_DAYS);
 }
 
 export async function usagePreset() {
@@ -70,28 +91,6 @@ export async function usagePreset() {
   return String(process.env.PROVIDER_USAGE_PRESET || config.preset || "auto").toLowerCase();
 }
 
-export async function panelUserId() {
-  const config = await agentConfig();
-  const raw = process.env.PROVIDER_USAGE_USER_ID || config.userId || "";
-  const parsed = Number.parseInt(String(raw), 10);
-  return Number.isFinite(parsed) && parsed > 0 ? parsed : null;
-}
-
-export async function panelUserHeaders() {
-  const userId = await panelUserId();
-  if (!userId) return {};
-  const value = String(userId);
-  return {
-    "New-API-User": value,
-    "Veloera-User": value,
-    "voapi-user": value,
-    "User-id": value,
-    "X-User-Id": value,
-    "Rix-Api-User": value,
-    "neo-api-user": value,
-  };
-}
-
 // Passive callers (the codex hook fires per prompt; several sessions may run
 // at once) reuse a fresh snapshot instead of hitting the gateway every time.
 // Same knob the statusline uses; 0 disables.

package/integrations/usage/lib/format.mjs

@@ -1,6 +1,6 @@
 // Turns gateway payloads into the compact one-line usage message.
 
-import { newApiQuotaScale, providerUsageDays, DEFAULT_NEW_API_QUOTA_SCALE } from "./config.mjs";
+import { newApiQuotaScale, providerUsageDays } from "./config.mjs";
 
 export function pickNumber(obj, keys) {
   for (const key of keys) {
@@ -159,45 +159,8 @@ export function formatOpenRouterLine(label, data) {
   return parts.join(" | ");
 }
 
-export function panelQuotaScale(kind) {
-  return kind === "veloera" ? 1000000 : DEFAULT_NEW_API_QUOTA_SCALE;
-}
-
-export function panelQuotaLooksRemaining(kind) {
-  return ["new-api", "anyrouter", "agentrouter", "done-hub", "donehub"].includes(kind);
-}
-
-export async function formatPanelUserSelfLine(label, data, kind) {
-  const root = usageRoot(data);
-  const scale = panelQuotaScale(kind);
-  const quota = pickNumber(root, ["quota"]);
-  const used = pickNumber(root, ["used_quota", "usedQuota"]);
-  const todayIncome = pickNumber(root, ["today_income", "todayIncome"]);
-  const todayUsed = pickNumber(root, ["today_quota_consumption", "todayQuotaConsumption"]);
-
-  if (quota === undefined && used === undefined) {
-    throw new Error("panel /api/user/self payload has no quota fields");
-  }
-
-  const quotaUsd = quota === undefined ? undefined : quota / scale;
-  const usedUsd = used === undefined ? undefined : used / scale;
-  const remainingUsd = panelQuotaLooksRemaining(kind)
-    ? quotaUsd
-    : (quotaUsd === undefined || usedUsd === undefined ? quotaUsd : Math.max(0, quotaUsd - usedUsd));
-  const totalUsd = panelQuotaLooksRemaining(kind)
-    ? (quotaUsd === undefined || usedUsd === undefined ? quotaUsd : quotaUsd + usedUsd)
-    : quotaUsd;
-
-  const parts = usageParts();
-  if (remainingUsd !== undefined) parts.push(`balance ${formatMoney(remainingUsd)}`);
-  if (usedUsd !== undefined && totalUsd !== undefined) {
-    parts.push(`used ${formatMoney(usedUsd)}/${formatMoney(totalUsd)}`);
-  } else if (usedUsd !== undefined) {
-    parts.push(`used ${formatMoney(usedUsd)}`);
-  }
-  if (todayUsed !== undefined) parts.push(`today ${formatMoney(todayUsed / scale)}`);
-  if (todayIncome !== undefined) parts.push(`income ${formatMoney(todayIncome / scale)}`);
-  return parts.join(" | ");
+export function formatOneApiBillingLine(limit, used) {
+  return `API | balance ${formatMoney(Math.max(0, limit - used))} | used ${formatMoney(used)}/${formatMoney(limit)}`;
 }
 
 function formatQuotaLimitedLine(label, root) {

package/integrations/usage/lib/http.mjs

@@ -126,11 +126,11 @@ function mergeSetCookiePairs(cookieHeader, setCookieHeaders) {
 }
 
 export async function requestJson(url, options = {}) {
-  const { key = "", headers = {}, name = "usage" } = options;
+  const { key = "", headers = {}, name = "usage", timeoutMs = REQUEST_TIMEOUT_MS } = options;
   let cookieHeader = "";
   for (let attempt = 0; attempt < 2; attempt += 1) {
     const controller = new AbortController();
-    const timeout = setTimeout(() => controller.abort(), REQUEST_TIMEOUT_MS);
+    const timeout = setTimeout(() => controller.abort(), timeoutMs);
     const response = await fetch(url, {
       headers: {
         accept: "application/json",