@kairyou/agent-tools 0.10.0 → 0.10.1

package/README.md

@@ -153,21 +153,23 @@ Output examples:
 
 ```text
 # Plan limits (sub2api / openai-compatible).
-D $0.0/$100 | W $0.0/$300 | Exp 07-08
+D $0.0/$100 | W $0.0/$300 ⟳3d1h | Exp 07-08
 
 # Multi-window limits (claude-code-hub).
 5h $2.1/$10.0 | D $8.0/$20.0 | T $19.0/$100 | Exp 08-31
 
 # Balance and usage (one-api / one-hub / done-hub / new-api / openrouter).
-balance $15.0 | used $5.0/$20.0
+balance $15.0 | used $5.0/$20.0 | ⟳3d1h
 
 # Wallet and recent spend (sub2api).
 balance $362 | today $61.7 | 30d $566
 ```
 
 Fields: `5h/D/W/M/T` are five-hour/daily/weekly/monthly/total spend against
-limits; `Exp` is the plan expiry; `balance` is wallet credit; `used` is consumed
-credit; `today` and `30d` are today's and the last 30 days' API spend.
+limits; `⟳` is the time until a known limit reset; `Exp` is the plan expiry;
+`balance` is wallet credit; `used` is consumed credit; `today` and `30d` are
+today's and the last 30 days' API spend. A reset countdown is shown only when
+the gateway returns enough timing information to determine it reliably.
 
 #### Custom gateway routes
 

package/README.zh-CN.md

@@ -149,20 +149,22 @@ npx -y @kairyou/agent-tools@latest usage -a claude codex opencode
 
 ```text
 # 套餐限额 (sub2api / openai-compatible).
-D $0.0/$100 | W $0.0/$300 | Exp 07-08
+D $0.0/$100 | W $0.0/$300 ⟳3d1h | Exp 07-08
 
 # 多窗口限额 (claude-code-hub).
 5h $2.1/$10.0 | D $8.0/$20.0 | T $19.0/$100 | Exp 08-31
 
 # 余额与用量 (one-api / one-hub / done-hub / new-api / openrouter).
-balance $15.0 | used $5.0/$20.0
+balance $15.0 | used $5.0/$20.0 | ⟳3d1h
 
 # 钱包与近期消耗 (sub2api).
 balance $362 | today $61.7 | 30d $566
 ```
 
-字段含义: `5h/D/W/M/T` 是 5 小时/日/周/月/总消耗与上限, `Exp` 是套餐到期日,
-`balance` 是钱包余额, `used` 是已用额度, `today` / `30d` 是今日与近 30 天 API 消耗.
+字段含义: `5h/D/W/M/T` 是 5 小时/日/周/月/总消耗与上限, `⟳` 后面是已知限额的
+重置倒计时, `Exp` 是套餐到期日, `balance` 是钱包余额, `used` 是已用额度,
+`today` / `30d` 是今日与近 30 天 API 消耗. 只有网关返回的信息足以可靠确定
+重置时间时才会显示倒计时.
 
 #### 自定义网关路由
 

package/dist/usage/core.mjs

@@ -1309,6 +1309,14 @@ async function requestJson(url, options = {}) {
 
 // integrations/usage/lib/format.mjs
 var ONE_API_HARD_LIMIT_SENTINEL_USD = 1e6;
+var RESET_TIME_FIELDS = Object.freeze({
+  // Sub2API rate-limit entries returned alongside quota usage.
+  SUB2API_RATE_LIMIT: "reset_at",
+  // Sub2API /v1/usage response: subscription weekly-window anchor.
+  SUB2API_SUBSCRIPTION_WEEKLY_START: "weekly_window_start",
+  // OpenRouter /api/v1/key response: absolute key-limit reset.
+  OPENROUTER_KEY_LIMIT: "limit_reset"
+});
 function pickNumber(obj, keys) {
   for (const key of keys) {
     const value = obj?.[key];
@@ -1337,6 +1345,39 @@ function shortDate(value) {
   const match = String(value).match(/^(\d{4})-(\d{2})-(\d{2})/);
   return match ? `${match[2]}-${match[3]}` : "";
 }
+function timestampMs(value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value < 1e12 ? value * 1e3 : value;
+  }
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? parsed : void 0;
+}
+function compactDurationUntil(value) {
+  const resetMs = timestampMs(value);
+  if (resetMs === void 0) return "";
+  const remainingMs = resetMs - Date.now();
+  if (remainingMs <= 0) return "";
+  let seconds = Math.floor(remainingMs / 1e3);
+  if (seconds <= 0) return "0m";
+  const days = Math.floor(seconds / 86400);
+  seconds %= 86400;
+  const hours = Math.floor(seconds / 3600);
+  seconds %= 3600;
+  const minutes = Math.floor(seconds / 60);
+  if (days) return `${days}d${hours}h`;
+  if (hours) return `${hours}h${minutes}m`;
+  return `${minutes}m`;
+}
+function rateLimitResetAt(entry) {
+  const value = entry?.[RESET_TIME_FIELDS.SUB2API_RATE_LIMIT];
+  return timestampMs(value) === void 0 ? void 0 : value;
+}
+function weeklyResetAt(subscription) {
+  const startMs = timestampMs(
+    subscription?.[RESET_TIME_FIELDS.SUB2API_SUBSCRIPTION_WEEKLY_START]
+  );
+  return startMs === void 0 ? void 0 : startMs + 7 * 86400 * 1e3;
+}
 function hasSubscriptionLimits(root) {
   const sub = root?.subscription || {};
   return [
@@ -1437,7 +1478,7 @@ function formatOpenRouterLine(data) {
   const limit = pickNumber(root, ["limit", "limit_remaining", "total_credits"]);
   const remaining = pickNumber(root, ["limit_remaining", "remaining_credits"]);
   const used = pickNumber(root, ["usage", "total_usage", "spend"]);
-  const reset = root?.limit_reset || root?.reset_at ? shortDate(root.limit_reset || root.reset_at) : "";
+  const reset = compactDurationUntil(root?.[RESET_TIME_FIELDS.OPENROUTER_KEY_LIMIT]);
   const parts = [];
   if (remaining !== void 0) parts.push(`balance ${formatMoney(remaining)}`);
   if (used !== void 0 && limit !== void 0 && limit !== remaining) {
@@ -1445,7 +1486,7 @@ function formatOpenRouterLine(data) {
   } else if (used !== void 0) {
     parts.push(`used ${formatMoney(used)}`);
   }
-  if (reset) parts.push(`Reset ${reset}`);
+  if (reset) parts.push(`\u27F3${reset}`);
   if (parts.length === 0) throw new Error("OpenRouter payload has no usage fields");
   return parts.join(" | ");
 }
@@ -1511,7 +1552,8 @@ function formatQuotaLimitedLine(root) {
       const window = entry?.window;
       const rateLimit = pickNumber(entry, ["limit"]);
       const rateUsed = pickNumber(entry, ["used"]);
-      return window && rateLimit !== void 0 && rateUsed !== void 0 ? `${window} ${formatMoney(rateUsed)}/${formatMoney(rateLimit)}` : "";
+      const reset = compactDurationUntil(rateLimitResetAt(entry));
+      return window && rateLimit !== void 0 && rateUsed !== void 0 ? `${window} ${formatMoney(rateUsed)}/${formatMoney(rateLimit)}${reset ? ` \u27F3${reset}` : ""}` : "";
     }).filter(Boolean);
     if (rateParts.length > 0) parts.push(rateParts.join(", "));
   }
@@ -1538,9 +1580,12 @@ function formatUsageLine(root) {
   const monthlyLimit = pickNumber(sub, ["monthly_limit_usd"]);
   const monthlyUsage = pickNumber(sub, ["monthly_usage_usd"]);
   const expires = shortDate(sub.expires_at);
+  const weeklyReset = compactDurationUntil(weeklyResetAt(sub));
   const parts = [];
   if (dailyLimit > 0 && dailyUsage !== void 0) parts.push(`D ${formatMoney(dailyUsage)}/${formatMoney(dailyLimit)}`);
-  if (weeklyLimit > 0 && weeklyUsage !== void 0) parts.push(`W ${formatMoney(weeklyUsage)}/${formatMoney(weeklyLimit)}`);
+  if (weeklyLimit > 0 && weeklyUsage !== void 0) {
+    parts.push(`W ${formatMoney(weeklyUsage)}/${formatMoney(weeklyLimit)}${weeklyReset ? ` \u27F3${weeklyReset}` : ""}`);
+  }
   if (monthlyLimit > 0 && monthlyUsage !== void 0) parts.push(`M ${formatMoney(monthlyUsage)}/${formatMoney(monthlyLimit)}`);
   if (expires) parts.push(`Exp ${expires}`);
   return parts.join(" | ");

package/integrations/usage/lib/format.mjs

@@ -6,6 +6,15 @@ import { newApiQuotaScale, providerUsageDays } from "./config.mjs";
 
 const ONE_API_HARD_LIMIT_SENTINEL_USD = 1_000_000;
 
+const RESET_TIME_FIELDS = Object.freeze({
+  // Sub2API rate-limit entries returned alongside quota usage.
+  SUB2API_RATE_LIMIT: "reset_at",
+  // Sub2API /v1/usage response: subscription weekly-window anchor.
+  SUB2API_SUBSCRIPTION_WEEKLY_START: "weekly_window_start",
+  // OpenRouter /api/v1/key response: absolute key-limit reset.
+  OPENROUTER_KEY_LIMIT: "limit_reset",
+});
+
 export function pickNumber(obj, keys) {
   for (const key of keys) {
     const value = obj?.[key];
@@ -40,6 +49,45 @@ function shortDate(value) {
   return match ? `${match[2]}-${match[3]}` : "";
 }
 
+function timestampMs(value) {
+  if (typeof value === "number" && Number.isFinite(value)) {
+    return value < 1e12 ? value * 1000 : value;
+  }
+  const parsed = Date.parse(value);
+  return Number.isFinite(parsed) ? parsed : undefined;
+}
+
+function compactDurationUntil(value) {
+  const resetMs = timestampMs(value);
+  if (resetMs === undefined) return "";
+
+  const remainingMs = resetMs - Date.now();
+  if (remainingMs <= 0) return "";
+
+  let seconds = Math.floor(remainingMs / 1000);
+  if (seconds <= 0) return "0m";
+  const days = Math.floor(seconds / 86400);
+  seconds %= 86400;
+  const hours = Math.floor(seconds / 3600);
+  seconds %= 3600;
+  const minutes = Math.floor(seconds / 60);
+  if (days) return `${days}d${hours}h`;
+  if (hours) return `${hours}h${minutes}m`;
+  return `${minutes}m`;
+}
+
+function rateLimitResetAt(entry) {
+  const value = entry?.[RESET_TIME_FIELDS.SUB2API_RATE_LIMIT];
+  return timestampMs(value) === undefined ? undefined : value;
+}
+
+function weeklyResetAt(subscription) {
+  const startMs = timestampMs(
+    subscription?.[RESET_TIME_FIELDS.SUB2API_SUBSCRIPTION_WEEKLY_START]
+  );
+  return startMs === undefined ? undefined : startMs + 7 * 86400 * 1000;
+}
+
 function hasSubscriptionLimits(root) {
   const sub = root?.subscription || {};
   return [
@@ -163,7 +211,7 @@ export function formatOpenRouterLine(data) {
   const limit = pickNumber(root, ["limit", "limit_remaining", "total_credits"]);
   const remaining = pickNumber(root, ["limit_remaining", "remaining_credits"]);
   const used = pickNumber(root, ["usage", "total_usage", "spend"]);
-  const reset = root?.limit_reset || root?.reset_at ? shortDate(root.limit_reset || root.reset_at) : "";
+  const reset = compactDurationUntil(root?.[RESET_TIME_FIELDS.OPENROUTER_KEY_LIMIT]);
   const parts = [];
 
   if (remaining !== undefined) parts.push(`balance ${formatMoney(remaining)}`);
@@ -172,7 +220,7 @@ export function formatOpenRouterLine(data) {
   } else if (used !== undefined) {
     parts.push(`used ${formatMoney(used)}`);
   }
-  if (reset) parts.push(`Reset ${reset}`);
+  if (reset) parts.push(`⟳${reset}`);
 
   if (parts.length === 0) throw new Error("OpenRouter payload has no usage fields");
   return parts.join(" | ");
@@ -254,8 +302,9 @@ function formatQuotaLimitedLine(root) {
         const window = entry?.window;
         const rateLimit = pickNumber(entry, ["limit"]);
         const rateUsed = pickNumber(entry, ["used"]);
+        const reset = compactDurationUntil(rateLimitResetAt(entry));
         return window && rateLimit !== undefined && rateUsed !== undefined
-          ? `${window} ${formatMoney(rateUsed)}/${formatMoney(rateLimit)}`
+          ? `${window} ${formatMoney(rateUsed)}/${formatMoney(rateLimit)}${reset ? ` ⟳${reset}` : ""}`
           : "";
       })
       .filter(Boolean);
@@ -290,10 +339,13 @@ function formatUsageLine(root) {
   const monthlyLimit = pickNumber(sub, ["monthly_limit_usd"]);
   const monthlyUsage = pickNumber(sub, ["monthly_usage_usd"]);
   const expires = shortDate(sub.expires_at);
+  const weeklyReset = compactDurationUntil(weeklyResetAt(sub));
 
   const parts = [];
   if (dailyLimit > 0 && dailyUsage !== undefined) parts.push(`D ${formatMoney(dailyUsage)}/${formatMoney(dailyLimit)}`);
-  if (weeklyLimit > 0 && weeklyUsage !== undefined) parts.push(`W ${formatMoney(weeklyUsage)}/${formatMoney(weeklyLimit)}`);
+  if (weeklyLimit > 0 && weeklyUsage !== undefined) {
+    parts.push(`W ${formatMoney(weeklyUsage)}/${formatMoney(weeklyLimit)}${weeklyReset ? ` ⟳${weeklyReset}` : ""}`);
+  }
   if (monthlyLimit > 0 && monthlyUsage !== undefined) parts.push(`M ${formatMoney(monthlyUsage)}/${formatMoney(monthlyLimit)}`);
   if (expires) parts.push(`Exp ${expires}`);
   return parts.join(" | ");

package/package.json

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