@kairyou/agent-tools 0.7.4 → 0.9.0

package/README.md

@@ -26,7 +26,9 @@ Generate a Conventional Commits message from staged changes and wait for user co
 npx -y skills@latest add kairyou/agent-tools --skill at-commit -g -y
 ```
 
-- Usage: `/at-commit [<language>]` — language for the commit description (Conventional Commits tokens stay in English)
+Usage:
+
+- `/at-commit [<language>]` — language for the commit description (Conventional Commits tokens stay in English)
 
 ### at-review
 
@@ -36,7 +38,9 @@ Review changes for correctness bugs, regressions, convention violations, and hig
 npx -y skills@latest add kairyou/agent-tools --skill at-review -g -y
 ```
 
-- Usage: `/at-review [--fix] [<pr|branch|path>]` — reports findings; `--fix` also applies them
+Usage:
+
+- `/at-review [--fix] [<pr|branch|path>]` — reports findings; `--fix` also applies them
 
 ### at-simplify
 
@@ -46,7 +50,9 @@ Refactor changes to reduce duplication, lower complexity, and improve code quali
 npx -y skills@latest add kairyou/agent-tools --skill at-simplify -g -y
 ```
 
-- Usage: `/at-simplify [<pr|branch|path>]`
+Usage:
+
+- `/at-simplify [<pr|branch|path>]`
 
 ### at-zentao
 
@@ -97,7 +103,7 @@ The installer writes `statusLine` to `~/.claude/settings.json`. Example output:
 ⎇ main | Opus 4.8 | 5h 7% ⟳2h54m | w 41% ⟳3d1h
 
 # With a compatible API relay, its quota info is shown instead, e.g.:
-⎇ main | Opus 4.8 | API | balance $362 | today $61.7 | 30d $566
+⎇ main | Opus 4.8 | balance $362 | today $61.7 | 30d $566
 ```
 
 Here `5h` and `w` are Claude's rolling usage windows and `⟳` is the reset
@@ -109,9 +115,10 @@ compatibility and configuration.
 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 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.
+Works with API-key usage endpoints exposed by relay software such as Sub2API,
+One API (including OneHub and DoneHub), New API, and Claude Code Hub. It also
+supports the OpenRouter platform. Compatibility depends on the gateway version
+and whether the corresponding usage endpoint is enabled.
 
 ```bash
 npx -y @kairyou/agent-tools@latest usage -a claude codex opencode
@@ -138,7 +145,9 @@ endpoint and key — and tune `providerUsage` in `~/.agent-tools/config.jsonc`:
 ```jsonc
 {
   "providerUsage": {
-    "preset": "auto", // auto | sub2api | one-api | new-api | openrouter | <custom-route-id>
+    // auto | sub2api | openai-compatible | one-api | one-hub |
+    // done-hub | new-api | claude-code-hub | openrouter | <custom-route-id>
+    "preset": "auto",
     "days": 30,       // how many recent days of spend to count
     "debug": false    // true: log probes to ~/.agent-tools/logs/usage-debug.log
   }
@@ -152,15 +161,22 @@ custom route id is also accepted.
 Output examples:
 
 ```text
-# Relay plan quota.
-API | D $0.0/$100 | W $0.0/$300 | Exp 07-08
+# Plan limits (sub2api / openai-compatible).
+D $0.0/$100 | W $0.0/$300 | 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
 
-# Wallet balance.
-API | balance $362 | today $61.7 | 30d $566
+# Wallet and recent spend (sub2api).
+balance $362 | today $61.7 | 30d $566
 ```
 
-Fields: `D/W/M` are daily/weekly/monthly spend against plan limits; `Exp` is
-the plan expiry; `balance` is wallet credit; `today` and `30d` are API spend.
+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; `today` and `30d`
+are API spend.
 
 #### Custom gateway routes
 
@@ -203,7 +219,7 @@ export async function run(context, { requestJson, agentConfig }) {
   const me = await requestJson(`${context.baseUrl}/api/user/self`, {
     headers: { authorization: `Bearer ${session?.data?.accessToken}` },
   });
-  return { text: `API | balance ¥${me?.data?.balance}` };
+  return { text: `balance ¥${me?.data?.balance}` };
 }
 ```
 

package/README.zh-CN.md

@@ -24,7 +24,9 @@ npx -y skills@latest add kairyou/agent-tools --skill <name...> -g -y
 npx -y skills@latest add kairyou/agent-tools --skill at-commit -g -y
 ```
 
-- 用法: `/at-commit [<语言>]` — 指定 commit description 的语言(Conventional Commits 语法部分保持英文)
+用法:
+
+- `/at-commit [<语言>]` — 指定 commit description 的语言(Conventional Commits 语法部分保持英文)
 
 ### at-review
 
@@ -34,7 +36,9 @@ npx -y skills@latest add kairyou/agent-tools --skill at-commit -g -y
 npx -y skills@latest add kairyou/agent-tools --skill at-review -g -y
 ```
 
-- 用法: `/at-review [--fix] [<pr|分支|路径>]` — 输出审查结果; 加 `--fix` 则同时应用修复
+用法:
+
+- `/at-review [--fix] [<pr|分支|路径>]` — 输出审查结果; 加 `--fix` 则同时应用修复
 
 ### at-simplify
 
@@ -44,7 +48,9 @@ npx -y skills@latest add kairyou/agent-tools --skill at-review -g -y
 npx -y skills@latest add kairyou/agent-tools --skill at-simplify -g -y
 ```
 
-- 用法: `/at-simplify [<pr|分支|路径>]`
+用法:
+
+- `/at-simplify [<pr|分支|路径>]`
 
 ### at-zentao
 
@@ -94,7 +100,7 @@ npx -y @kairyou/agent-tools@latest statusline -a claude
 ⎇ main | Opus 4.8 | 5h 7% ⟳2h54m | w 41% ⟳3d1h
 
 # 使用兼容的 API 中转时, 显示中转的额度信息, 比如:
-⎇ main | Opus 4.8 | API | balance $362 | today $61.7 | 30d $566
+⎇ main | Opus 4.8 | balance $362 | today $61.7 | 30d $566
 ```
 
 其中 `5h` / `w` 是 Claude 的滚动用量窗口, `⟳` 后面是重置倒计时;
@@ -104,8 +110,9 @@ npx -y @kairyou/agent-tools@latest statusline -a claude
 
 面向使用 API 中转的场景: 在 agent 内直接显示中转网关的余额/额度, 按量付费或
 有套餐限额时, 随时知道花了多少, 还剩多少, 不用切出去登录网关后台.
-支持 Sub2API, One API, New API 与 OpenRouter 提供的 API Key 用量接口.
-具体兼容性取决于网关版本及其是否开放相应接口.
+支持 Sub2API, One API (包括 OneHub 与 DoneHub), New API 与 Claude Code Hub
+等中转程序提供的 API Key 用量接口, 也支持 OpenRouter 平台. 具体兼容性取决于
+网关版本及其是否开放相应接口.
 
 ```bash
 npx -y @kairyou/agent-tools@latest usage -a claude codex opencode
@@ -130,7 +137,9 @@ provider 的 `base_url` 和密钥; Claude Code: 读取 `ANTHROPIC_BASE_URL` 与
 ```jsonc
 {
   "providerUsage": {
-    "preset": "auto", // auto | sub2api | one-api | new-api | openrouter | <自定义 route id>
+    // auto | sub2api | openai-compatible | one-api | one-hub |
+    // done-hub | new-api | claude-code-hub | openrouter | <自定义 route id>
+    "preset": "auto",
     "days": 30,       // 统计最近多少天的消耗
     "debug": false    // true: 探测过程写入 ~/.agent-tools/logs/usage-debug.log
   }
@@ -143,14 +152,20 @@ provider 的 `base_url` 和密钥; Claude Code: 读取 `ANTHROPIC_BASE_URL` 与
 显示效果示例:
 
 ```text
-# 中转套餐额度.
-API | D $0.0/$100 | W $0.0/$300 | Exp 07-08
+# 套餐限额 (sub2api / openai-compatible).
+D $0.0/$100 | W $0.0/$300 | 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
 
-# 钱包余额.
-API | balance $362 | today $61.7 | 30d $566
+# 钱包与近期消耗 (sub2api).
+balance $362 | today $61.7 | 30d $566
 ```
 
-字段含义: `D/W/M` 是日/周/月套餐消耗与上限, `Exp` 是套餐到期日,
+字段含义: `5h/D/W/M/T` 是 5 小时/日/周/月/总消耗与上限, `Exp` 是套餐到期日,
 `balance` 是钱包余额, `today` / `30d` 是今日与近 30 天 API 消耗.
 
 #### 自定义网关路由
@@ -192,7 +207,7 @@ export async function run(context, { requestJson, agentConfig }) {
   const me = await requestJson(`${context.baseUrl}/api/user/self`, {
     headers: { authorization: `Bearer ${session?.data?.accessToken}` },
   });
-  return { text: `API | balance ¥${me?.data?.balance}` };
+  return { text: `balance ¥${me?.data?.balance}` };
 }
 ```
 

package/dist/usage/core.mjs

@@ -1261,6 +1261,7 @@ async function requestJson(url, options = {}) {
 }
 
 // integrations/usage/lib/format.mjs
+var ONE_API_HARD_LIMIT_SENTINEL_USD = 1e6;
 function pickNumber(obj, keys) {
   for (const key of keys) {
     const value = obj?.[key];
@@ -1276,9 +1277,6 @@ function formatMaybeMoney(value, unit = "USD") {
   if (unit === "USD" || unit === "$") return formatMoney(value);
   return `${value.toLocaleString("en-US", { maximumFractionDigits: 1 })} ${unit}`;
 }
-function usageParts() {
-  return ["API"];
-}
 async function formatNewApiQuota(value) {
   const scale = await newApiQuotaScale();
   if (Number.isFinite(scale) && scale > 0) return formatMoney(value / scale);
@@ -1328,40 +1326,58 @@ function hasV1UsageFields(root) {
     "usage"
   ]) !== void 0 || pickNumber(root?.quota, ["limit", "quota", "used", "quota_used", "remaining"]) !== void 0 || pickNumber(root?.usage?.today, ["actual_cost", "cost"]) !== void 0 || Array.isArray(root?.daily_usage) && root.daily_usage.length > 0;
 }
-async function formatQuota(label, data) {
+async function formatQuota(data) {
   const root = usageRoot(data);
   const unit = root?.unit || "USD";
   const remaining = pickNumber(root, ["remaining"]);
   const hardLimit = pickNumber(root, ["hard_limit_usd", "hard_limit", "total_granted", "quota"]);
   const used = pickNumber(root, ["total_usage", "used", "usage"]);
   const balance = pickNumber(root, ["balance", "remaining", "remain", "available"]);
-  if (isQuotaLimitedUsage(root)) return formatQuotaLimitedLine(label, root);
-  if (isSubscriptionUsage(root)) return formatUsageLine(label, root);
-  if (isWalletUsage(root)) return await formatWalletLine(label, root);
-  if (remaining !== void 0) return formatUsageLine(label, root);
-  if (balance !== void 0) return `API | balance ${formatMaybeMoney(balance, unit)}`;
+  if (isQuotaLimitedUsage(root)) return formatQuotaLimitedLine(root);
+  if (isSubscriptionUsage(root)) return formatUsageLine(root);
+  if (isWalletUsage(root)) return await formatWalletLine(root);
+  if (remaining !== void 0) return formatUsageLine(root);
+  if (balance !== void 0) return `balance ${formatMaybeMoney(balance, unit)}`;
   if (hardLimit !== void 0 && used !== void 0) {
-    return `API | remaining ${formatMaybeMoney(Math.max(0, hardLimit - used), unit)}`;
+    return `remaining ${formatMaybeMoney(Math.max(0, hardLimit - used), unit)}`;
   }
-  if (hardLimit !== void 0) return `API | total ${formatMaybeMoney(hardLimit, unit)}`;
+  if (hardLimit !== void 0) return `total ${formatMaybeMoney(hardLimit, unit)}`;
   const keys = Object.keys(root || {}).slice(0, 4).join(", ");
-  return keys ? `API | received (${keys})` : `API | checked ${unit}`;
+  return keys ? `received (${keys})` : `checked ${unit}`;
 }
-async function formatNewApiTokenLine(label, data) {
+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 === void 0 && quota !== void 0 && used !== void 0) {
     remaining = Math.max(0, quota - used);
   }
+  return { unlimited, quota, used, remaining };
+}
+async function formatNewApiTokenLine(data) {
+  const { unlimited, quota, used, remaining } = newApiTokenQuota(data);
   if (!unlimited && quota === void 0 && used === void 0 && remaining === void 0) {
     throw new Error("NewAPI token usage payload has no quota fields");
   }
-  const parts = usageParts();
+  const parts = [];
   if (unlimited) parts.push("unlimited");
-  if (remaining !== void 0) parts.push(`balance ${await formatNewApiQuota(remaining)}`);
+  if (!unlimited && remaining !== void 0) parts.push(`balance ${await formatNewApiQuota(remaining)}`);
   if (used !== void 0 && quota !== void 0) {
     parts.push(`used ${await formatNewApiQuota(used)}/${await formatNewApiQuota(quota)}`);
   } else if (used !== void 0) {
@@ -1369,13 +1385,13 @@ async function formatNewApiTokenLine(label, data) {
   }
   return parts.join(" | ");
 }
-function formatOpenRouterLine(label, data) {
+function formatOpenRouterLine(data) {
   const root = usageRoot(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 parts = usageParts();
+  const parts = [];
   if (remaining !== void 0) parts.push(`balance ${formatMoney(remaining)}`);
   if (used !== void 0 && limit !== void 0 && limit !== remaining) {
     parts.push(`used ${formatMoney(used)}/${formatMoney(limit)}`);
@@ -1383,18 +1399,61 @@ function formatOpenRouterLine(label, data) {
     parts.push(`used ${formatMoney(used)}`);
   }
   if (reset) parts.push(`Reset ${reset}`);
-  if (parts.length === 1) throw new Error("OpenRouter payload has no usage fields");
+  if (parts.length === 0) throw new Error("OpenRouter payload has no usage fields");
   return parts.join(" | ");
 }
 function formatOneApiBillingLine(limit, used) {
-  return `API | balance ${formatMoney(Math.max(0, limit - used))} | used ${formatMoney(used)}/${formatMoney(limit)}`;
+  if (!hasSpendableOneApiLimit(limit)) return `used ${formatMoney(used)}`;
+  return `balance ${formatMoney(Math.max(0, limit - used))} | used ${formatMoney(used)}/${formatMoney(limit)}`;
+}
+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 !== void 0 && keyLimit > 0) {
+    return { limit: keyLimit, used: pickNumber(root, [`keyCurrent${suffix}Usd`]) };
+  }
+  const userLimit = pickNumber(root, [`userLimit${suffix}Usd`]);
+  return {
+    limit: userLimit !== void 0 && userLimit > 0 ? userLimit : void 0,
+    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;
+}
+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 !== void 0 && used !== void 0) {
+      parts.push(`${label} ${formatMoney(used)}/${formatMoney(limit)}`);
+    }
+  }
+  if (parts.length === 0) {
+    const totalUsed = pickNumber(root, ["keyCurrentTotalUsd", "userCurrentTotalUsd"]);
+    if (totalUsed !== void 0) 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(label, root) {
+function formatQuotaLimitedLine(root) {
   const quota = root?.quota || {};
   const limit = pickNumber(quota, ["limit", "quota"]);
   const used = pickNumber(quota, ["used", "quota_used"]);
   const remaining = pickNumber(quota, ["remaining"]) ?? pickNumber(root, ["remaining"]);
-  const parts = usageParts();
+  const parts = [];
   if (limit !== void 0 && used !== void 0) {
     parts.push(`Q ${formatMoney(used)}/${formatMoney(limit)}`);
   } else if (remaining !== void 0) {
@@ -1411,11 +1470,11 @@ function formatQuotaLimitedLine(label, root) {
   }
   return parts.join(" | ");
 }
-async function formatWalletLine(label, root) {
+async function formatWalletLine(root) {
   const balance = pickNumber(root, ["balance", "remaining", "remain", "available"]);
   const todayCost = pickNumber(root?.usage?.today, ["actual_cost", "cost"]);
   const recentUsage = Array.isArray(root?.daily_usage) ? root.daily_usage.reduce((sum, day) => sum + (pickNumber(day, ["actual_cost", "cost"]) || 0), 0) : void 0;
-  const parts = usageParts();
+  const parts = [];
   if (balance !== void 0) parts.push(`balance ${formatMoney(balance)}`);
   if (todayCost !== void 0) parts.push(`today ${formatMoney(todayCost)}`);
   if (recentUsage !== void 0 && root.daily_usage.length > 0) {
@@ -1423,7 +1482,7 @@ async function formatWalletLine(label, root) {
   }
   return parts.join(" | ");
 }
-function formatUsageLine(label, root) {
+function formatUsageLine(root) {
   const sub = root?.subscription || {};
   const dailyLimit = pickNumber(sub, ["daily_limit_usd"]);
   const dailyUsage = pickNumber(sub, ["daily_usage_usd"]);
@@ -1432,7 +1491,7 @@ function formatUsageLine(label, root) {
   const monthlyLimit = pickNumber(sub, ["monthly_limit_usd"]);
   const monthlyUsage = pickNumber(sub, ["monthly_usage_usd"]);
   const expires = shortDate(sub.expires_at);
-  const parts = usageParts();
+  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 (monthlyLimit > 0 && monthlyUsage !== void 0) parts.push(`M ${formatMoney(monthlyUsage)}/${formatMoney(monthlyLimit)}`);
@@ -1462,20 +1521,14 @@ async function fetchV1Usage(context) {
     name: "v1 usage"
   });
   if (!hasV1UsageFields(usageRoot(json))) throw new Error("v1 usage payload has no usage fields");
-  return usageResult(context, "v1-usage", await formatQuota(context.label, json), json);
+  return usageResult(context, "v1-usage", await formatQuota(json), json);
 }
 async function fetchNewApiTokenUsage(context) {
   const json = await requestJson(joinUrl(serviceRoot(context.baseUrl), "/api/usage/token/"), {
     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 === void 0 && quota !== void 0 && used !== void 0) {
-    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;
@@ -1491,7 +1544,7 @@ async function fetchNewApiTokenUsage(context) {
     source: "newapi-token",
     raw: json
   };
-  return usageResult(context, "newapi-token", await formatNewApiTokenLine(context.label, json), normalized);
+  return usageResult(context, "newapi-token", await formatNewApiTokenLine(json), normalized);
 }
 async function fetchOneApiBillingUsage(context) {
   const base = serviceRoot(context.baseUrl);
@@ -1509,13 +1562,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 }
@@ -1527,6 +1583,19 @@ async function fetchOneApiBillingUsage(context) {
     normalized
   );
 }
+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
+  );
+}
 async function fetchOpenRouterUsage(context) {
   const base = cleanBaseUrl(context.baseUrl).includes("/api/v1") ? cleanBaseUrl(context.baseUrl) : joinUrl(serviceRoot(context.baseUrl), "/api/v1");
   const endpoints = [
@@ -1537,7 +1606,7 @@ async function fetchOpenRouterUsage(context) {
   for (const endpoint of endpoints) {
     try {
       const json = await requestJson(endpoint.url, { key: context.key, name: endpoint.source });
-      return usageResult(context, endpoint.source, formatOpenRouterLine("OpenRouter", json), json);
+      return usageResult(context, endpoint.source, formatOpenRouterLine(json), json);
     } catch (error) {
       lastError = error;
       await debugLog({ source: endpoint.source, error: error.message });
@@ -1565,6 +1634,11 @@ var USAGE_ROUTES = {
     id: "openrouter",
     path: "/api/v1/key",
     run: fetchOpenRouterUsage
+  },
+  "claude-code-hub": {
+    id: "claude-code-hub",
+    path: "/api/v1/me/quota",
+    run: fetchClaudeCodeHubUsage
   }
 };
 var CUSTOM_ROUTE_HELPERS = { requestJson, agentConfig };
@@ -1637,12 +1711,15 @@ async function usageRouteIds(context) {
     "openai-compatible": ["v1-usage"],
     "new-api": ["newapi-token"],
     "one-api": ["oneapi-billing"],
-    "openrouter": ["openrouter"]
+    "one-hub": ["oneapi-billing"],
+    "done-hub": ["oneapi-billing"],
+    "openrouter": ["openrouter"],
+    "claude-code-hub": ["claude-code-hub"]
   };
   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", "newapi-token", "oneapi-billing"];
+  const builtinIds = hostIncludes(context.baseUrl, "openrouter.ai") ? ["openrouter"] : ["v1-usage", "newapi-token", "oneapi-billing", "claude-code-hub"];
   return [.../* @__PURE__ */ new Set([...customIds, ...builtinIds])];
 }
 async function cachedUsageRoute(context, registry) {

package/dist/usage/opencode-plugin.mjs

@@ -1,9 +1,6 @@
 // integrations/usage/opencode-plugin.mjs
 import { queryProviderUsage } from "./core.mjs";
 var DEFAULT_REFRESH_MS = 6e4;
-function toastMessage(text) {
-  return text.replace(/^API \| /, "");
-}
 function firstString(value, keys) {
   for (const key of keys) {
     if (typeof value?.[key] === "string" && value[key].trim()) return value[key].trim();
@@ -38,7 +35,7 @@ var AgentToolsUsage = async ({ client }, options = {}) => {
       await client.tui.showToast({
         body: {
           title: "Provider usage",
-          message: toastMessage(text),
+          message: text,
           variant: "info",
           duration: 8e3
         }

package/dist/usage/opencode-tui.mjs

@@ -4,9 +4,6 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 var AGENT_TOOLS_HOME = process.env.AGENT_TOOLS_HOME || join(homedir(), ".agent-tools");
 var SNAPSHOT_PATH = join(AGENT_TOOLS_HOME, "cache", "usage-snapshot.json");
-function toastMessage(text) {
-  return text.replace(/^API \| /, "");
-}
 function latestUsage() {
   try {
     const data = JSON.parse(readFileSync(SNAPSHOT_PATH, "utf8"));
@@ -28,7 +25,7 @@ var tui = async (api) => {
           const message = latestUsage();
           api.ui.toast({
             title: "Provider usage",
-            message: message ? toastMessage(message) : "Provider usage is not available yet",
+            message: message || "Provider usage is not available yet",
             variant: message ? "info" : "warning",
             duration: 8e3
           });

package/integrations/usage/lib/format.mjs

@@ -1,7 +1,11 @@
 // Turns gateway payloads into the compact one-line usage message.
+// Lines carry no branding prefix; each display surface adds its own context
+// (hook name, statusline position, toast title) if it needs any.
 
 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];
@@ -20,10 +24,6 @@ function formatMaybeMoney(value, unit = "USD") {
   return `${value.toLocaleString("en-US", { maximumFractionDigits: 1 })} ${unit}`;
 }
 
-function usageParts() {
-  return ["API"];
-}
-
 async function formatNewApiQuota(value) {
   const scale = await newApiQuotaScale();
   if (Number.isFinite(scale) && scale > 0) return formatMoney(value / scale);
@@ -92,7 +92,7 @@ export function hasV1UsageFields(root) {
   );
 }
 
-export async function formatQuota(label, data) {
+export async function formatQuota(data) {
   const root = usageRoot(data);
   const unit = root?.unit || "USD";
   const remaining = pickNumber(root, ["remaining"]);
@@ -100,37 +100,56 @@ export async function formatQuota(label, data) {
   const used = pickNumber(root, ["total_usage", "used", "usage"]);
   const balance = pickNumber(root, ["balance", "remaining", "remain", "available"]);
 
-  if (isQuotaLimitedUsage(root)) return formatQuotaLimitedLine(label, root);
-  if (isSubscriptionUsage(root)) return formatUsageLine(label, root);
-  if (isWalletUsage(root)) return await formatWalletLine(label, root);
-  if (remaining !== undefined) return formatUsageLine(label, root);
-  if (balance !== undefined) return `API | balance ${formatMaybeMoney(balance, unit)}`;
+  if (isQuotaLimitedUsage(root)) return formatQuotaLimitedLine(root);
+  if (isSubscriptionUsage(root)) return formatUsageLine(root);
+  if (isWalletUsage(root)) return await formatWalletLine(root);
+  if (remaining !== undefined) return formatUsageLine(root);
+  if (balance !== undefined) return `balance ${formatMaybeMoney(balance, unit)}`;
   if (hardLimit !== undefined && used !== undefined) {
-    return `API | remaining ${formatMaybeMoney(Math.max(0, hardLimit - used), unit)}`;
+    return `remaining ${formatMaybeMoney(Math.max(0, hardLimit - used), unit)}`;
   }
-  if (hardLimit !== undefined) return `API | total ${formatMaybeMoney(hardLimit, unit)}`;
+  if (hardLimit !== undefined) return `total ${formatMaybeMoney(hardLimit, unit)}`;
 
   const keys = Object.keys(root || {}).slice(0, 4).join(", ");
-  return keys ? `API | received (${keys})` : `API | checked ${unit}`;
+  return keys ? `received (${keys})` : `checked ${unit}`;
 }
 
-export async function formatNewApiTokenLine(label, 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");
   }
 
-  const parts = usageParts();
+  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) {
@@ -139,13 +158,13 @@ export async function formatNewApiTokenLine(label, data) {
   return parts.join(" | ");
 }
 
-export function formatOpenRouterLine(label, data) {
+export function formatOpenRouterLine(data) {
   const root = usageRoot(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 parts = usageParts();
+  const parts = [];
 
   if (remaining !== undefined) parts.push(`balance ${formatMoney(remaining)}`);
   if (used !== undefined && limit !== undefined && limit !== remaining) {
@@ -155,20 +174,73 @@ export function formatOpenRouterLine(label, data) {
   }
   if (reset) parts.push(`Reset ${reset}`);
 
-  if (parts.length === 1) throw new Error("OpenRouter payload has no usage fields");
+  if (parts.length === 0) throw new Error("OpenRouter payload has no usage fields");
   return parts.join(" | ");
 }
 
 export function formatOneApiBillingLine(limit, used) {
-  return `API | balance ${formatMoney(Math.max(0, limit - used))} | used ${formatMoney(used)}/${formatMoney(limit)}`;
+  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(label, root) {
+function formatQuotaLimitedLine(root) {
   const quota = root?.quota || {};
   const limit = pickNumber(quota, ["limit", "quota"]);
   const used = pickNumber(quota, ["used", "quota_used"]);
   const remaining = pickNumber(quota, ["remaining"]) ?? pickNumber(root, ["remaining"]);
-  const parts = usageParts();
+  const parts = [];
 
   if (limit !== undefined && used !== undefined) {
     parts.push(`Q ${formatMoney(used)}/${formatMoney(limit)}`);
@@ -193,14 +265,14 @@ function formatQuotaLimitedLine(label, root) {
   return parts.join(" | ");
 }
 
-async function formatWalletLine(label, root) {
+async function formatWalletLine(root) {
   const balance = pickNumber(root, ["balance", "remaining", "remain", "available"]);
   const todayCost = pickNumber(root?.usage?.today, ["actual_cost", "cost"]);
   const recentUsage = Array.isArray(root?.daily_usage)
     ? root.daily_usage.reduce((sum, day) => sum + (pickNumber(day, ["actual_cost", "cost"]) || 0), 0)
     : undefined;
 
-  const parts = usageParts();
+  const parts = [];
   if (balance !== undefined) parts.push(`balance ${formatMoney(balance)}`);
   if (todayCost !== undefined) parts.push(`today ${formatMoney(todayCost)}`);
   if (recentUsage !== undefined && root.daily_usage.length > 0) {
@@ -209,7 +281,7 @@ async function formatWalletLine(label, root) {
   return parts.join(" | ");
 }
 
-function formatUsageLine(label, root) {
+function formatUsageLine(root) {
   const sub = root?.subscription || {};
   const dailyLimit = pickNumber(sub, ["daily_limit_usd"]);
   const dailyUsage = pickNumber(sub, ["daily_usage_usd"]);
@@ -219,7 +291,7 @@ function formatUsageLine(label, root) {
   const monthlyUsage = pickNumber(sub, ["monthly_usage_usd"]);
   const expires = shortDate(sub.expires_at);
 
-  const parts = usageParts();
+  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 (monthlyLimit > 0 && monthlyUsage !== undefined) parts.push(`M ${formatMoney(monthlyUsage)}/${formatMoney(monthlyLimit)}`);

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";
 
@@ -56,7 +59,7 @@ async function fetchV1Usage(context) {
     name: "v1 usage",
   });
   if (!hasV1UsageFields(usageRoot(json))) throw new Error("v1 usage payload has no usage fields");
-  return usageResult(context, "v1-usage", await formatQuota(context.label, json), json);
+  return usageResult(context, "v1-usage", await formatQuota(json), json);
 }
 
 // New API exposes a read-only usage endpoint authenticated by the same relay
@@ -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;
@@ -88,7 +85,7 @@ async function fetchNewApiTokenUsage(context) {
     source: "newapi-token",
     raw: json,
   };
-  return usageResult(context, "newapi-token", await formatNewApiTokenLine(context.label, json), normalized);
+  return usageResult(context, "newapi-token", await formatNewApiTokenLine(json), normalized);
 }
 
 // One API's legacy OpenAI billing endpoints use the same relay API key as
@@ -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.
@@ -143,7 +161,7 @@ async function fetchOpenRouterUsage(context) {
   for (const endpoint of endpoints) {
     try {
       const json = await requestJson(endpoint.url, { key: context.key, name: endpoint.source });
-      return usageResult(context, endpoint.source, formatOpenRouterLine("OpenRouter", json), json);
+      return usageResult(context, endpoint.source, formatOpenRouterLine(json), json);
     } catch (error) {
       lastError = error;
       await debugLog({ source: endpoint.source, error: error.message });
@@ -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/integrations/usage/opencode-plugin.mjs

@@ -2,10 +2,6 @@ import { queryProviderUsage } from "./core.mjs";
 
 const DEFAULT_REFRESH_MS = 60_000;
 
-function toastMessage(text) {
-  return text.replace(/^API \| /, "");
-}
-
 function firstString(value, keys) {
   for (const key of keys) {
     if (typeof value?.[key] === "string" && value[key].trim()) return value[key].trim();
@@ -49,7 +45,7 @@ export const AgentToolsUsage = async ({ client }, options = {}) => {
       await client.tui.showToast({
         body: {
           title: "Provider usage",
-          message: toastMessage(text),
+          message: text,
           variant: "info",
           duration: 8000,
         },

package/integrations/usage/opencode-tui.mjs

@@ -5,10 +5,6 @@ import { join } from "node:path";
 const AGENT_TOOLS_HOME = process.env.AGENT_TOOLS_HOME || join(homedir(), ".agent-tools");
 const SNAPSHOT_PATH = join(AGENT_TOOLS_HOME, "cache", "usage-snapshot.json");
 
-function toastMessage(text) {
-  return text.replace(/^API \| /, "");
-}
-
 function latestUsage() {
   try {
     const data = JSON.parse(readFileSync(SNAPSHOT_PATH, "utf8"));
@@ -33,7 +29,7 @@ const tui = async (api) => {
           const message = latestUsage();
           api.ui.toast({
             title: "Provider usage",
-            message: message ? toastMessage(message) : "Provider usage is not available yet",
+            message: message || "Provider usage is not available yet",
             variant: message ? "info" : "warning",
             duration: 8000,
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kairyou/agent-tools",
-  "version": "0.7.4",
+  "version": "0.9.0",
   "description": "Reusable Agent Skills and installable integrations (statusline, provider usage, vision) for Codex, Claude Code, and opencode.",
   "license": "MIT",
   "repository": {
@@ -32,7 +32,8 @@
     "build": "node scripts/build.mjs",
     "prepare": "npm run build",
     "test": "node --test tests/*.test.mjs",
-    "release": "node scripts/release.mjs"
+    "release": "node scripts/release.mjs --target=registry",
+    "release:github": "node scripts/release.mjs --target=github"
   },
   "bin": {
     "agent-tools": "./scripts/install.mjs"

package/scripts/publish.mjs

@@ -0,0 +1,108 @@
+#!/usr/bin/env node
+// Internal registry publisher used by release.mjs.
+// Publishes to npmjs or an npm-compatible private registry without changing the version.
+// Credentials persist in ~/.agent-tools/publish.npmrc, leaving ~/.npmrc untouched.
+
+import { spawnSync } from "node:child_process";
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const ROOT = fileURLToPath(new URL("..", import.meta.url));
+const packageJson = JSON.parse(fs.readFileSync(path.join(ROOT, "package.json"), "utf8"));
+const PACKAGE_NAME = packageJson.name;
+const PUBLISH_NPMRC = path.join(
+  process.env.AGENT_TOOLS_HOME || path.join(os.homedir(), ".agent-tools"),
+  "publish.npmrc"
+);
+
+let registryOverride;
+let authType;
+let dryRun = false;
+let authOnly = false;
+for (const arg of process.argv.slice(2)) {
+  if (arg === "--dry-run") dryRun = true;
+  else if (arg === "--auth-only") authOnly = true;
+  else if (arg.startsWith("--registry=")) registryOverride = arg.slice("--registry=".length);
+  else if (arg.startsWith("--auth-type=")) authType = arg.slice("--auth-type=".length);
+  else {
+    console.error(
+      `Unknown argument: ${arg} ` +
+        `(expected --registry=<url>, --auth-type=<type>, --auth-only, or --dry-run)`
+    );
+    process.exit(2);
+  }
+}
+
+if (typeof PACKAGE_NAME !== "string" || PACKAGE_NAME.trim() === "") {
+  console.error("package.json must define a non-empty name before publishing.");
+  process.exit(2);
+}
+
+function runNpm(args, { capture = false, allowFailure = false } = {}) {
+  const npmExecPath = process.env.npm_execpath;
+  const command = npmExecPath ? process.execPath : process.platform === "win32" ? "npm.cmd" : "npm";
+  const commandArgs = npmExecPath ? [npmExecPath, ...args] : args;
+  const result = spawnSync(command, commandArgs, {
+    cwd: ROOT,
+    encoding: capture ? "utf8" : undefined,
+    stdio: capture ? "pipe" : "inherit",
+  });
+  if (result.error) throw result.error;
+  if (!allowFailure && result.status !== 0) process.exit(result.status ?? 1);
+  return result;
+}
+
+function readNpmConfig(key) {
+  const result = runNpm(["config", "get", key], { capture: true });
+  const value = result.stdout.trim();
+  return value && value !== "undefined" && value !== "null" ? value : undefined;
+}
+
+const packageScope = PACKAGE_NAME.match(/^(@[^/]+)\//)?.[1];
+const registry =
+  registryOverride ||
+  packageJson.publishConfig?.registry ||
+  (packageScope && readNpmConfig(`${packageScope}:registry`)) ||
+  readNpmConfig("registry");
+
+try {
+  const url = new URL(registry);
+  if (!["http:", "https:"].includes(url.protocol)) throw new Error("unsupported protocol");
+} catch {
+  console.error("The resolved npm registry must be a valid HTTP(S) URL.");
+  process.exit(2);
+}
+
+console.log(`Package:  ${PACKAGE_NAME}@${packageJson.version}`);
+console.log(`Registry: ${registry}`);
+if (new URL(registry).hostname === "registry.npmjs.org") {
+  console.log("Note: npmjs releases normally go through `npm run release:github` (OIDC).");
+}
+
+if (dryRun) {
+  runNpm(["pack", "--dry-run"]);
+  process.exit(0);
+}
+
+fs.mkdirSync(path.dirname(PUBLISH_NPMRC), { recursive: true, mode: 0o700 });
+if (!fs.existsSync(PUBLISH_NPMRC)) fs.writeFileSync(PUBLISH_NPMRC, "", { mode: 0o600 });
+
+const npmConfigArgs = [`--registry=${registry}`, `--userconfig=${PUBLISH_NPMRC}`];
+const whoami = runNpm(["whoami", ...npmConfigArgs], { capture: true, allowFailure: true });
+if (whoami.status !== 0) {
+  console.log(`Authentication required. Credentials will be saved to ${PUBLISH_NPMRC}`);
+  const loginArgs = ["login", ...npmConfigArgs];
+  if (authType) loginArgs.push(`--auth-type=${authType}`);
+  runNpm(loginArgs);
+  runNpm(["whoami", ...npmConfigArgs]);
+}
+
+if (authOnly) {
+  console.log(`Authenticated for ${registry}`);
+  process.exit(0);
+}
+
+runNpm(["publish", ...npmConfigArgs]);
+console.log(`\nPublished ${PACKAGE_NAME}@${packageJson.version} to ${registry}`);

package/scripts/release.mjs

@@ -2,60 +2,153 @@
 // Release helper for this package.
 //
 // Usage:
-//   npm run release [-- minor|major]   # default: patch
-//   npm run release -- --dry-run       # npm test + preview tarball, no bump/push
-//
-// Local steps: clean-tree check -> npm test -> npm version -> git push --follow-tags.
-// Publishing runs on GitHub Actions via npm trusted publishing (OIDC, no
-// tokens, no npm login): .github/workflows/release.yml publishes when the
-// version tag lands.
-//
-// Release when scripts/ integrations/ config.default.jsonc or
-// package.json deps change — npx users only get these from the published package.
-// (skills/ ships from GitHub via `npx skills add`; no release needed.)
+//   npm run release [-- patch|minor|major]
+//     Test, bump, publish to the configured npm registry, then push the commit and v* tag.
+//   npm run release:github [-- patch|minor|major]
+//     Test, bump, and push the commit and v* tag; GitHub Actions publishes the package.
+//   npm run release -- --publish-only [--registry=<url>] [--auth-type=legacy]
+//     Publish the current version only; do not test, bump, commit, tag, or push.
+//   npm run release -- --dry-run
+//     Test and preview the package; do not authenticate, bump, publish, or push.
 
 import { spawnSync } from "node:child_process";
+import fs from "node:fs";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
 
+const ROOT = fileURLToPath(new URL("..", import.meta.url));
+const PUBLISH_SCRIPT = path.join(ROOT, "scripts", "publish.mjs");
 const BUMPS = ["patch", "minor", "major"];
 
+let target = "registry";
 let bump = "patch";
+let bumpSpecified = false;
 let dryRun = false;
+let publishOnly = false;
+const publishArgs = [];
 for (const arg of process.argv.slice(2)) {
   if (arg === "--dry-run") dryRun = true;
-  else if (BUMPS.includes(arg)) bump = arg;
-  else {
-    console.error(`Unknown argument: ${arg} (expected ${BUMPS.join("|")} or --dry-run)`);
+  else if (arg === "--publish-only") publishOnly = true;
+  else if (arg.startsWith("--target=")) target = arg.slice("--target=".length);
+  else if (arg.startsWith("--registry=") || arg.startsWith("--auth-type=")) {
+    publishArgs.push(arg);
+  } else if (BUMPS.includes(arg)) {
+    bump = arg;
+    bumpSpecified = true;
+  } else {
+    console.error(
+      `Unknown argument: ${arg} ` +
+        `(expected ${BUMPS.join("|")}, --publish-only, --dry-run, ` +
+        `--registry=<url>, or --auth-type=<type>)`
+    );
     process.exit(2);
   }
 }
 
-function run(command) {
-  console.log(`\n> ${command}`);
-  const result = spawnSync(command, { stdio: "inherit", shell: true });
+if (!["registry", "github"].includes(target)) {
+  console.error(`Unknown release target: ${target} (expected registry or github)`);
+  process.exit(2);
+}
+if (target === "github" && publishArgs.length > 0) {
+  console.error("--registry and --auth-type only apply to registry releases.");
+  process.exit(2);
+}
+if (target === "github" && publishOnly) {
+  console.error("--publish-only only applies to registry releases.");
+  process.exit(2);
+}
+if (publishOnly && (dryRun || bumpSpecified)) {
+  console.error("--publish-only cannot be combined with a version bump or --dry-run.");
+  process.exit(2);
+}
+
+function run(command, args, { label, onFailure } = {}) {
+  console.log(`\n> ${label || [command, ...args].join(" ")}`);
+  const result = spawnSync(command, args, { cwd: ROOT, stdio: "inherit" });
+  if (result.error) {
+    console.error(`\nAborted: ${result.error.message}`);
+    onFailure?.();
+    process.exit(1);
+  }
   if (result.status !== 0) {
-    console.error(`\nAborted: \`${command}\` exited with ${result.status}.`);
+    console.error(`\nAborted: command exited with ${result.status}.`);
+    onFailure?.();
     process.exit(result.status ?? 1);
   }
 }
 
-const status = spawnSync("git status --porcelain", { shell: true, encoding: "utf8" });
+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);
+  }
+}
+
+function printRecovery(commands) {
+  console.error("\nResume without creating another version:");
+  for (const command of commands) console.error(`  ${command}`);
+}
+
+const status = spawnSync("git", ["status", "--porcelain"], { cwd: ROOT, encoding: "utf8" });
+if (status.error || status.status !== 0) {
+  console.error(status.error?.message || status.stderr || "Unable to read git status.");
+  process.exit(status.status ?? 1);
+}
 if (!dryRun && status.stdout.trim() !== "") {
-  console.error("Working tree is not clean — commit or stash first:\n" + status.stdout);
+  console.error("Working tree is not clean - commit or stash first:\n" + status.stdout);
   process.exit(1);
 }
 
-run("npm test");
+if (publishOnly) {
+  run(process.execPath, [PUBLISH_SCRIPT, ...publishArgs], {
+    label: `node scripts/publish.mjs ${publishArgs.join(" ")}`.trimEnd(),
+  });
+  process.exit(0);
+}
+
+if (!dryRun && target === "registry") {
+  run(process.execPath, [PUBLISH_SCRIPT, "--auth-only", ...publishArgs], {
+    label: `node scripts/publish.mjs --auth-only ${publishArgs.join(" ")}`.trimEnd(),
+  });
+}
+runNpm(["test"]);
 
 if (dryRun) {
-  // Shows exactly which files would ship; verify nothing is missing/extra.
-  run("npm pack --dry-run");
-  console.log("\nDry run complete. No version bump, nothing pushed.");
+  runNpm(["pack", "--dry-run"]);
+  console.log("\nDry run complete. No authentication, version bump, publish, or push.");
   process.exit(0);
 }
 
-run(`npm version ${bump}`);
-run("git push --follow-tags");
+const versionArgs = ["version", bump, "--tag-version-prefix=v"];
+if (target === "registry") versionArgs.push("--message=%s [skip ci]");
+runNpm(versionArgs);
+const version = JSON.parse(fs.readFileSync(path.join(ROOT, "package.json"), "utf8")).version;
+const tag = `v${version}`;
 
-console.log(
-  "\nTag pushed. GitHub Actions publishes it: https://github.com/kairyou/agent-tools/actions"
-);
+if (target === "registry") {
+  run(process.execPath, [PUBLISH_SCRIPT, ...publishArgs], {
+    label: `node scripts/publish.mjs ${publishArgs.join(" ")}`.trimEnd(),
+    onFailure() {
+      const suffix = publishArgs.length > 0 ? ` ${publishArgs.join(" ")}` : "";
+      printRecovery([
+        `npm run release -- --publish-only${suffix}`,
+        "git push --follow-tags",
+      ]);
+    },
+  });
+  run("git", ["push", "--follow-tags"], {
+    onFailure() {
+      printRecovery(["git push --follow-tags"]);
+    },
+  });
+  console.log(`\nReleased ${tag} to the configured npm registry.`);
+} else {
+  run("git", ["push", "--follow-tags"], {
+    onFailure() {
+      printRecovery(["git push --follow-tags"]);
+    },
+  });
+  console.log(`\nPushed ${tag}. GitHub Actions will publish it.`);
+}