@kairyou/agent-tools 0.7.2 → 0.8.0

package/README.md

@@ -75,8 +75,8 @@ npx -y @kairyou/agent-tools@latest <capability> -a <agent...>
 
 `--dry-run` previews, `--uninstall` unwires the integration from the agent, and
 re-running the install command updates. The installer only touches config
-entries it wrote itself; shared files under `~/.agent-tools` are kept on
-uninstall.
+entries it wrote itself, and `config.jsonc` updates only add missing default
+keys without touching your edits or comments.
 
 | Capability | Claude Code | Codex | OpenCode |
 | --- | --- | --- | --- |
@@ -90,24 +90,20 @@ uninstall.
 npx -y @kairyou/agent-tools@latest statusline -a claude
 ```
 
-The installer writes `statusLine` to `~/.claude/settings.json`. The default
-output is:
+The installer writes `statusLine` to `~/.claude/settings.json`. Example output:
 
 ```text
+# Pick and order the fields via statusline.fields in ~/.agent-tools/config.jsonc:
 ⎇ 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
 countdown; see [Provider usage](#provider-usage) below for relay quota
 compatibility and configuration.
 
-To choose what appears, edit `statusline.fields` in
-`~/.agent-tools/config.jsonc`. Installer updates only add missing default keys
-and never touch your edits or comments.
-
 ### Provider usage
 
 For API relay / gateway setups: shows the relay's balance / quota inside the
@@ -157,10 +153,10 @@ Output examples:
 
 ```text
 # Relay plan quota.
-API | D $0.0/$100 | W $0.0/$300 | Exp 07-08
+D $0.0/$100 | W $0.0/$300 | Exp 07-08
 
 # Wallet balance.
-API | balance $362 | today $61.7 | 30d $566
+balance $362 | today $61.7 | 30d $566
 ```
 
 Fields: `D/W/M` are daily/weekly/monthly spend against plan limits; `Exp` is
@@ -207,7 +203,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

@@ -72,7 +72,8 @@ npx -y @kairyou/agent-tools@latest <capability> -a <agent...>
 ```
 
 `--dry-run` 预览, `--uninstall` 解除对应集成, 重新执行安装命令即为更新.
-安装器只改动自己写入的配置项; 卸载会保留 `~/.agent-tools` 下的共享文件.
+安装器只改动自己写入的配置项, 更新 `config.jsonc` 时只补充缺失的默认键,
+不会动你的修改和注释.
 
 | Capability | Claude Code | Codex | OpenCode |
 | --- | --- | --- | --- |
@@ -86,21 +87,19 @@ npx -y @kairyou/agent-tools@latest <capability> -a <agent...>
 npx -y @kairyou/agent-tools@latest statusline -a claude
 ```
 
-安装器会把 `statusLine` 写入 `~/.claude/settings.json`. 默认显示:
+安装器会把 `statusLine` 写入 `~/.claude/settings.json`. 输出示例:
 
 ```text
+# 显示项与顺序由 ~/.agent-tools/config.jsonc 的 statusline.fields 控制:
 ⎇ 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 的滚动用量窗口, `⟳` 后面是重置倒计时;
 中转额度信息的兼容性与配置见下方 [Provider usage](#provider-usage).
 
-如需控制显示项, 修改 `~/.agent-tools/config.jsonc` 里的
-`statusline.fields`. 安装器更新时只会补充缺失的默认键, 不会动你的修改和注释.
-
 ### Provider usage
 
 面向使用 API 中转的场景: 在 agent 内直接显示中转网关的余额/额度, 按量付费或
@@ -145,10 +144,10 @@ provider 的 `base_url` 和密钥; Claude Code: 读取 `ANTHROPIC_BASE_URL` 与
 
 ```text
 # 中转套餐额度.
-API | D $0.0/$100 | W $0.0/$300 | Exp 07-08
+D $0.0/$100 | W $0.0/$300 | Exp 07-08
 
 # 钱包余额.
-API | balance $362 | today $61.7 | 30d $566
+balance $362 | today $61.7 | 30d $566
 ```
 
 字段含义: `D/W/M` 是日/周/月套餐消耗与上限, `Exp` 是套餐到期日,
@@ -193,7 +192,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

@@ -1276,9 +1276,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,26 +1325,26 @@ 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) {
+async function formatNewApiTokenLine(data) {
   const root = usageRoot(data);
   const unlimited = root?.unlimited_quota === true || root?.unlimitedQuota === true;
   const quota = pickNumber(root, ["quota", "limit", "total_quota", "totalQuota"]);
@@ -1359,7 +1356,7 @@ async function formatNewApiTokenLine(label, 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 (used !== void 0 && quota !== void 0) {
@@ -1369,13 +1366,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 +1380,18 @@ 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)}`;
+  return `balance ${formatMoney(Math.max(0, limit - used))} | used ${formatMoney(used)}/${formatMoney(limit)}`;
 }
-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 +1408,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 +1420,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 +1429,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,7 +1459,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);
 }
 async function fetchNewApiTokenUsage(context) {
   const json = await requestJson(joinUrl(serviceRoot(context.baseUrl), "/api/usage/token/"), {
@@ -1491,7 +1488,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);
@@ -1537,7 +1534,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 });

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,4 +1,6 @@
 // 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";
 
@@ -20,10 +22,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 +90,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,21 +98,21 @@ 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 async function formatNewApiTokenLine(data) {
   const root = usageRoot(data);
   const unlimited = root?.unlimited_quota === true || root?.unlimitedQuota === true;
   const quota = pickNumber(root, ["quota", "limit", "total_quota", "totalQuota"]);
@@ -128,7 +126,7 @@ export async function formatNewApiTokenLine(label, data) {
     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 (used !== undefined && quota !== undefined) {
@@ -139,13 +137,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 +153,20 @@ 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)}`;
+  return `balance ${formatMoney(Math.max(0, limit - used))} | used ${formatMoney(used)}/${formatMoney(limit)}`;
 }
 
-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 +191,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 +207,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 +217,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

@@ -56,7 +56,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
@@ -88,7 +88,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
@@ -143,7 +143,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 });

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,8 +1,12 @@
 {
   "name": "@kairyou/agent-tools",
-  "version": "0.7.2",
+  "version": "0.8.0",
   "description": "Reusable Agent Skills and installable integrations (statusline, provider usage, vision) for Codex, Claude Code, and opencode.",
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/kairyou/agent-tools.git"
+  },
   "engines": {
     "node": ">=22"
   },
@@ -28,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/install.mjs

@@ -45,6 +45,7 @@
 //   -h, --help                Show this help.
 
 import { spawnSync } from "node:child_process";
+import { createHash } from "node:crypto";
 import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
@@ -93,6 +94,7 @@ const USAGE_SKILL_NAME = "at-usage";
 const USAGE_SKILL_SRC = path.join(REPO_ROOT, "integrations", "usage", "skills", USAGE_SKILL_NAME);
 const VISION_BUNDLED_MCP_SERVER = path.join(REPO_ROOT, "dist", "vision", "mcp-server.mjs");
 const VISION_BUNDLED_CLI = path.join(REPO_ROOT, "dist", "vision", "cli.mjs");
+const INSTALL_STATE_PATH = path.join(INSTALL_ROOT, "install-state.json");
 
 function fwd(p) {
   return p.replace(/\\/g, "/");
@@ -445,13 +447,12 @@ const VISION_RATE_LIMIT_STATE = path.join(INSTALL_ROOT, "cache", "vision-rate-li
 const VISION_DIST_DIR = path.join(REPO_ROOT, "dist", "vision");
 const VISION_RUNTIME_SERVER = path.join(VISION_RUNTIME_DIR, "mcp-server.mjs");
 const VISION_RUNTIME_CLI = path.join(VISION_RUNTIME_DIR, "cli.mjs");
-const SKILL_MARKER = ".agent-tools-managed.json";
-const VISION_SKILL_MARKER_DATA = Object.freeze({
+const VISION_SKILL_IDENTITY = Object.freeze({
   owner: "@kairyou/agent-tools",
   capability: "vision",
   artifact: "skill",
 });
-const USAGE_SKILL_MARKER_DATA = Object.freeze({
+const USAGE_SKILL_IDENTITY = Object.freeze({
   owner: "@kairyou/agent-tools",
   capability: "usage",
   artifact: "skill",
@@ -558,26 +559,110 @@ function installVisionRuntime(opts) {
   }
 }
 
-function isManagedSkillDir(dest, markerData) {
-  const marker = path.join(dest, SKILL_MARKER);
-  if (!fs.existsSync(marker)) return false;
+function skillManifestKey(dest) {
+  const resolved = fwd(path.resolve(dest));
+  return process.platform === "win32" ? resolved.toLowerCase() : resolved;
+}
+
+function skillHash(skillFile) {
+  if (!fs.existsSync(skillFile)) return "";
+  return createHash("sha256").update(fs.readFileSync(skillFile)).digest("hex");
+}
+
+function matchesIdentity(value, identity) {
+  return Object.entries(identity).every(([key, expected]) => value?.[key] === expected);
+}
+
+function readInstallState() {
+  const value = readJson(INSTALL_STATE_PATH);
+  if (Object.keys(value).length === 0) return { version: 1, artifacts: {} };
+  if (
+    value.version !== 1 ||
+    !value.artifacts ||
+    typeof value.artifacts !== "object" ||
+    Array.isArray(value.artifacts)
+  ) {
+    throw new Error(`Cannot parse ${INSTALL_STATE_PATH}: unsupported install state schema`);
+  }
+  return value;
+}
+
+function writeInstallState(state) {
+  if (Object.keys(state.artifacts).length === 0) {
+    fs.rmSync(INSTALL_STATE_PATH, { force: true });
+    return;
+  }
+  const text = JSON.stringify(state, null, 2) + "\n";
+  const suffix = `${process.pid}-${Date.now()}`;
+  const stage = `${INSTALL_STATE_PATH}.stage-${suffix}`;
+  const backup = `${INSTALL_STATE_PATH}.backup-${suffix}`;
+  let movedCurrent = false;
+  fs.mkdirSync(path.dirname(INSTALL_STATE_PATH), { recursive: true });
   try {
-    const value = JSON.parse(fs.readFileSync(marker, "utf8"));
-    return Object.entries(markerData).every(([key, expected]) => value?.[key] === expected);
-  } catch {
-    return false;
+    fs.writeFileSync(stage, text);
+    if (fs.existsSync(INSTALL_STATE_PATH)) {
+      fs.renameSync(INSTALL_STATE_PATH, backup);
+      movedCurrent = true;
+    }
+    fs.renameSync(stage, INSTALL_STATE_PATH);
+    fs.rmSync(backup, { force: true });
+  } catch (error) {
+    fs.rmSync(stage, { force: true });
+    if (movedCurrent && !fs.existsSync(INSTALL_STATE_PATH) && fs.existsSync(backup)) {
+      fs.renameSync(backup, INSTALL_STATE_PATH);
+    }
+    throw error;
+  } finally {
+    fs.rmSync(stage, { force: true });
+    if (fs.existsSync(INSTALL_STATE_PATH)) fs.rmSync(backup, { force: true });
   }
+  console.log(`  wrote ${INSTALL_STATE_PATH}`);
+}
+
+function managedSkillStatus(dest, identity) {
+  const entry = readInstallState().artifacts[skillManifestKey(dest)];
+  if (entry) {
+    if (!matchesIdentity(entry, identity)) return "other";
+    const currentHash = skillHash(path.join(dest, "SKILL.md"));
+    return currentHash && currentHash === entry.sha256 ? "managed" : "modified";
+  }
+  return "unmanaged";
+}
+
+function recordManagedSkill(dest, identity) {
+  const state = readInstallState();
+  state.artifacts[skillManifestKey(dest)] = {
+    path: fwd(path.resolve(dest)),
+    ...identity,
+    sha256: skillHash(path.join(dest, "SKILL.md")),
+  };
+  writeInstallState(state);
+}
+
+function forgetManagedSkill(dest) {
+  const state = readInstallState();
+  if (!state.artifacts[skillManifestKey(dest)]) return;
+  delete state.artifacts[skillManifestKey(dest)];
+  writeInstallState(state);
 }
 
 function installManagedSkillDir(
   skillsRoot,
-  { name, source, markerData, replacements, remove, dryRun }
+  { name, source, identity, replacements, remove, dryRun }
 ) {
   const dest = path.join(skillsRoot, name);
-  const isManaged = () => isManagedSkillDir(dest, markerData);
+  const status = fs.existsSync(dest) ? managedSkillStatus(dest, identity) : "missing";
   if (remove) {
-    if (!fs.existsSync(dest)) return;
-    if (!isManaged()) {
+    if (!fs.existsSync(dest)) {
+      if (!dryRun) forgetManagedSkill(dest);
+      return;
+    }
+    if (status === "modified") {
+      if (!dryRun) forgetManagedSkill(dest);
+      console.log(`  kept modified skill and released ownership ${dest}`);
+      return;
+    }
+    if (status !== "managed") {
       console.log(`  kept unmanaged ${dest}`);
       return;
     }
@@ -586,10 +671,18 @@ function installManagedSkillDir(
       return;
     }
     fs.rmSync(dest, { recursive: true, force: true });
+    forgetManagedSkill(dest);
     console.log(`  removed ${dest}`);
     return;
   }
-  if (fs.existsSync(dest) && !isManaged()) {
+  if (status === "modified") {
+    console.error(
+      `  Refusing to overwrite modified managed skill directory ${dest}. ` +
+        `Move or restore it, then re-run the install.`
+    );
+    process.exit(1);
+  }
+  if (fs.existsSync(dest) && status !== "managed") {
     console.error(
       `  Refusing to overwrite existing unowned skill directory ${dest}. ` +
         `Move or remove it, then re-run the install.`
@@ -612,10 +705,7 @@ function installManagedSkillDir(
     skill = skill.replaceAll(token, value);
   }
   fs.writeFileSync(skillFile, skill);
-  fs.writeFileSync(
-    path.join(dest, SKILL_MARKER),
-    JSON.stringify(markerData, null, 2) + "\n"
-  );
+  recordManagedSkill(dest, identity);
   console.log(`  wrote ${dest}`);
 }
 
@@ -623,7 +713,7 @@ function installVisionSkillDir(skillsRoot, { remove, dryRun }) {
   installManagedSkillDir(skillsRoot, {
     name: VISION_SKILL_NAME,
     source: VISION_SKILL_SRC,
-    markerData: VISION_SKILL_MARKER_DATA,
+    identity: VISION_SKILL_IDENTITY,
     replacements: { "{{VISION_CLI_PATH}}": fwd(VISION_RUNTIME_CLI) },
     remove,
     dryRun,
@@ -634,7 +724,7 @@ function installUsageSkillDir(skillsRoot, agent, { remove, dryRun }) {
   installManagedSkillDir(skillsRoot, {
     name: USAGE_SKILL_NAME,
     source: USAGE_SKILL_SRC,
-    markerData: USAGE_SKILL_MARKER_DATA,
+    identity: USAGE_SKILL_IDENTITY,
     replacements: {
       "{{USAGE_CLI_PATH}}": fwd(RUNTIME.usageCli),
       "{{USAGE_AGENT}}": agent,

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,125 +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/publish
-//
-// Steps: clean-tree check -> npm auth check -> npm test -> npm version -> npm publish -> git push
-//
-// 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 { readFileSync } from "node:fs";
+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"];
-const packageJson = JSON.parse(readFileSync(new URL("../package.json", import.meta.url), "utf8"));
-const PACKAGE_NAME = packageJson.name;
-
-if (typeof PACKAGE_NAME !== "string" || PACKAGE_NAME.trim() === "") {
-  console.error("package.json must define a non-empty name before releasing.");
-  process.exit(2);
-}
-
-function readNpmConfig(key) {
-  const npmExecPath = process.env.npm_execpath;
-  const result = npmExecPath
-    ? spawnSync(process.execPath, [npmExecPath, "config", "get", key], { encoding: "utf8" })
-    : spawnSync("npm", ["config", "get", key], { encoding: "utf8", shell: true });
-
-  if (result.status !== 0) {
-    const detail = result.stderr?.trim() || result.error?.message || "npm config exited unexpectedly";
-    console.error(`Unable to read npm config ${key}:\n${detail}`);
-    process.exit(result.status ?? 2);
-  }
-
-  const value = result.stdout?.trim();
-  return value && value !== "undefined" && value !== "null" ? value : undefined;
-}
-
-const packageScope = PACKAGE_NAME.match(/^(@[^/]+)\//)?.[1];
-const REGISTRY = (packageScope && readNpmConfig(`${packageScope}:registry`)) || readNpmConfig("registry");
-
-try {
-  const registryUrl = new URL(REGISTRY);
-  if (!["http:", "https:"].includes(registryUrl.protocol)) throw new Error("unsupported protocol");
-} catch {
-  console.error("npm registry config must be a valid HTTP(S) URL before releasing.");
-  process.exit(2);
-}
 
+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, opts = {}) {
-  const { onFailure, ...spawnOptions } = opts;
-  console.log(`\n> ${command}`);
-  const result = spawnSync(command, { stdio: "inherit", shell: true, ...spawnOptions });
+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);
   }
 }
 
-function printCommands(message, commands) {
-  console.error(`\n${message}\n`);
+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", { shell: true, encoding: "utf8" });
+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);
 }
 
-if (!dryRun) {
-  // Fail before npm version creates a commit and tag when the saved token is stale.
-  run(`npm whoami --registry=${REGISTRY}`, {
-    onFailure() {
-      printCommands("npm authentication is missing or expired. Log in, verify the account, then retry:", [
-        `npm login --registry=${REGISTRY}`,
-        `npm whoami --registry=${REGISTRY}`,
-        `npm run release -- ${bump}`,
-      ]);
-    },
+if (publishOnly) {
+  run(process.execPath, [PUBLISH_SCRIPT, ...publishArgs], {
+    label: `node scripts/publish.mjs ${publishArgs.join(" ")}`.trimEnd(),
   });
+  process.exit(0);
 }
 
-run("npm test");
+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 published.");
+  runNpm(["pack", "--dry-run"]);
+  console.log("\nDry run complete. No authentication, version bump, publish, or push.");
   process.exit(0);
 }
 
-run(`npm version ${bump}`);
-run("npm publish", {
-  onFailure() {
-    printCommands(
-      "npm publish failed after the version commit and tag were created. Do not run the release command again. Fix authentication/permissions, then resume:",
-      [
-        `npm login --registry=${REGISTRY}`,
-        `npm whoami --registry=${REGISTRY}`,
-        `npm owner ls ${PACKAGE_NAME}`,
-        "npm publish",
-        `npm view ${PACKAGE_NAME} version`,
-        "git push --follow-tags",
-      ],
-    );
-  },
-});
-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("\nRelease complete.");
+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.`);
+}