@kairyou/agent-tools 0.6.0 → 0.7.0

package/README.md

@@ -109,9 +109,9 @@ and never touch your edits or comments.
 For API relay / gateway setups: shows the relay's balance / quota inside the
 agent, so when you pay per use or have plan limits you always know how much you
 have spent and how much is left — without opening the gateway console.
-Works with the usage APIs of Sub2API, NewAPI/OneAPI-family panels (OneHub,
-DoneHub, Veloera, ...), and OpenRouter; compatibility can vary with a
-deployment's version and auth scheme.
+Works with API-key usage endpoints exposed by Sub2API, One API, New API, and
+OpenRouter. Compatibility depends on the gateway version and whether the
+corresponding usage endpoint is enabled.
 
 ```bash
 npx -y @kairyou/agent-tools@latest usage -a claude
@@ -140,14 +140,17 @@ endpoint and key — and tune `providerUsage` in `~/.agent-tools/config.jsonc`:
 ```jsonc
 {
   "providerUsage": {
-    "preset": "auto", // sub2api | new-api | veloera | openrouter | ...
-    "userId": "",     // some NewAPI/Veloera panels require your panel user id
-    "days": 30,       // spend window for the "30d" field (max 90)
+    "preset": "auto", // auto | sub2api | one-api | new-api | openrouter | <custom-route-id>
+    "days": 30,       // how many recent days of spend to count
     "debug": false    // true: log probes to ~/.agent-tools/logs/usage-debug.log
   }
 }
 ```
 
+Keep `preset` set to `auto` for automatic detection. Select a specific protocol
+only when you know which usage endpoint the gateway exposes; a configured
+custom route id is also accepted.
+
 #### Custom gateway routes
 
 For gateways the built-in probes cannot reach (e.g. cookie-authenticated

package/README.zh-CN.md

@@ -102,8 +102,8 @@ npx -y @kairyou/agent-tools@latest statusline -a claude
 
 面向使用 API 中转的场景: 在 agent 内直接显示中转网关的余额/额度, 按量付费或
 有套餐限额时, 随时知道花了多少, 还剩多少, 不用切出去登录网关后台.
-支持 Sub2API, NewAPI/OneAPI 系面板 (OneHub, DoneHub, Veloera 等)
-与 OpenRouter 的用量接口; 同类网关的部署版本和鉴权方式不同, 兼容性可能有差异.
+支持 Sub2API, One API, New API 与 OpenRouter 提供的 API Key 用量接口.
+具体兼容性取决于网关版本及其是否开放相应接口.
 
 ```bash
 npx -y @kairyou/agent-tools@latest usage -a claude
@@ -130,14 +130,16 @@ provider 的 `base_url` 和密钥; Claude Code: 读取 `ANTHROPIC_BASE_URL` 与
 ```jsonc
 {
   "providerUsage": {
-    "preset": "auto", // sub2api | new-api | veloera | openrouter | ...
-    "userId": "",     // 部分 NewAPI/Veloera 面板需要填面板用户 id
-    "days": 30,       // "30d" 字段的统计窗口(最大 90)
+    "preset": "auto", // auto | sub2api | one-api | new-api | openrouter | <自定义 route id>
+    "days": 30,       // 统计最近多少天的消耗
     "debug": false    // true: 探测过程写入 ~/.agent-tools/logs/usage-debug.log
   }
 }
 ```
 
+保持 `preset: "auto"` 即可自动探测. 只有明确知道网关开放的是哪种用量协议时,
+才指定相应的内置 preset 或已配置的自定义 route id.
+
 #### 自定义网关路由
 
 内置探测覆盖不到的网关(比如 cookie 认证的中转), 可以自己写路由模块并在

package/dist/usage/core.mjs

@@ -919,33 +919,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;
@@ -1388,36 +1368,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 +1449,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 +1475,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 +1533,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 +1615,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/lib/config.mjs

@@ -61,8 +61,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 +70,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/routes.mjs

@@ -8,7 +8,6 @@ import {
   AGENT_TOOLS_HOME,
   agentConfig,
   usagePreset,
-  panelUserHeaders,
   newApiQuotaScale,
   providerUsageDays,
   debugLog,
@@ -22,15 +21,12 @@ import {
 } from "./urls.mjs";
 import {
   pickNumber,
-  formatMoney,
   usageRoot,
   hasV1UsageFields,
   formatQuota,
   formatNewApiTokenLine,
+  formatOneApiBillingLine,
   formatOpenRouterLine,
-  formatPanelUserSelfLine,
-  panelQuotaScale,
-  panelQuotaLooksRemaining,
 } from "./format.mjs";
 import { readRouteCache } from "./cache.mjs";
 
@@ -63,13 +59,12 @@ async function fetchV1Usage(context) {
   return usageResult(context, "v1-usage", await formatQuota(context.label, json), json);
 }
 
-// NewAPI / OneAPI family panels: use the current API key as Bearer auth and
-// query token usage from the service root rather than the /v1 OpenAI-compatible
-// path.
+// New API exposes a read-only usage endpoint authenticated by the same relay
+// API key used for model requests.
 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"]);
@@ -96,84 +91,46 @@ async function fetchNewApiTokenUsage(context) {
   return usageResult(context, "newapi-token", await formatNewApiTokenLine(context.label, json), normalized);
 }
 
-// NewAPI / OneAPI / OneHub / DoneHub / Veloera panel session endpoint, based on
-// Metapi's platform handling. This works when PROVIDER_USAGE_API_KEY is a panel
-// access/session token, or when the site accepts the API key for /api/user/self.
-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"), {
+// One API's legacy OpenAI billing endpoints use the same relay API key as
+// model requests. Subscription reports the total quota; usage reports cents.
+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"]) === undefined && pickNumber(root, ["used_quota", "usedQuota"]) === undefined) {
-    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 === undefined || usageCents === undefined) {
+    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 === undefined || used === undefined ? quota : Math.max(0, quota - used));
-  const total = panelQuotaLooksRemaining(kind)
-    ? (quota === undefined || used === undefined ? quota : quota + used)
-    : quota;
+  const used = usageCents / 100;
   const normalized = {
     mode: "quota_limited",
     quota: {
-      limit: total === undefined ? undefined : total / scale,
-      used: used === undefined ? undefined : used / scale,
-      remaining: remaining === undefined ? undefined : remaining / scale,
+      limit,
+      used,
+      remaining: Math.max(0, limit - used),
     },
     unit: "USD",
-    source: "panel-user-self",
-    raw: json,
+    source: "oneapi-billing",
+    raw: { subscription, usage },
   };
   return usageResult(
     context,
-    "panel-user-self",
-    await formatPanelUserSelfLine(context.label, json, kind),
-    normalized
-  );
-}
-
-// Sub2API exposes user balance as USD at /api/v1/auth/me. Newer deployments may
-// also expose richer subscription summaries through /v1/usage, so this route is
-// a fallback for deployments where /v1/usage is unavailable.
-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 === undefined) 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,
-  };
-  return usageResult(
-    context,
-    "sub2api-auth-me",
-    `API | balance ${formatMoney(balance)}`,
+    "oneapi-billing",
+    formatOneApiBillingLine(limit, used),
     normalized
   );
 }
 
 // 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 NewAPI/OneAPI.
+// OpenRouter's base URL already includes /api/v1, unlike New API.
 async function fetchOpenRouterUsage(context) {
   const base = cleanBaseUrl(context.baseUrl).includes("/api/v1")
     ? cleanBaseUrl(context.baseUrl)
@@ -201,20 +158,15 @@ const 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",
@@ -224,7 +176,7 @@ const USAGE_ROUTES = {
 };
 
 // User-authored gateway routes, declared in config.jsonc:
-//   "providerUsage": { "routes": ["custom/anyrouter.mjs"] }
+//   "providerUsage": { "routes": ["custom/my-gateway.mjs"] }
 // Paths resolve against ~/.agent-tools. Each module exports
 // `export async function run(context, helpers)` plus an optional
 // `export const meta = { id }` (id defaults to the file name). Broken modules
@@ -304,25 +256,14 @@ async function routeRegistry() {
   return registry;
 }
 
-// Presets are probe-order aliases over the routes above, not separate
-// protocols (e.g. anyrouter/agentrouter just try the NewAPI panel endpoints
-// and /v1/usage in a different order).
-// They do not provide panel session-cookie authentication; only endpoints that
-// accept the configured Bearer key can succeed.
+// Presets select API-key usage protocols, not hosted gateway brands.
 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];
@@ -334,7 +275,7 @@ async function usageRouteIds(context) {
   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"];
+    : ["v1-usage", "newapi-token", "oneapi-billing"];
   return [...new Set([...customIds, ...builtinIds])];
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kairyou/agent-tools",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "description": "Reusable Agent Skills and installable integrations (statusline, provider usage, vision) for Codex, Claude Code, and opencode.",
   "license": "MIT",
   "engines": {