@ai-setting/roy-agent-core 1.7.62 → 1.7.63

package/dist/shared/@ai-setting/{roy-agent-core-9nvyffxg.js → roy-agent-core-va4m04e8.js}

@@ -1,3 +1,6 @@
+import {
+  redactSecrets
+} from "./roy-agent-core-ntn32q7j.js";
 import {
   normalizeLarkAtMentions
 } from "./roy-agent-core-m880qz3y.js";
@@ -24,6 +27,15 @@ var UPSTREAM_RETRY_PATTERNS = [
   /network error/i,
   /overloaded/i
 ];
+var QUOTA_EXHAUSTED_PATTERNS = [
+  /free usage limit (reached|exceeded)/i,
+  /free (model )?(usage|quota).{0,20}(limit|exhaust)/i,
+  /usage limit (reached|exceeded)/i,
+  /quota (exceeded|exhausted|reached)/i,
+  /insufficient[_ ]?(quota|balance|credit)/i,
+  /(credit|balance) (is )?(exhausted|insufficient)/i,
+  /billing (hard )?limit/i
+];
 var TIMEOUT_PATTERNS = [
   /timeout/i,
   /timed out/i,
@@ -98,6 +110,69 @@ function collectErrorText(error, depth = 0) {
   return parts.join(`
 `);
 }
+function extractRetryAfterSeconds(error, depth = 0) {
+  if (!error || typeof error !== "object" || depth > 6)
+    return;
+  const e = error;
+  const candidates = [
+    e.retryAfter,
+    e.retry_after,
+    e.retryAfterSeconds,
+    e.headers?.["retry-after"],
+    e.headers?.["Retry-After"],
+    e.responseHeaders?.["retry-after"],
+    e.responseHeaders?.["Retry-After"],
+    e.headers?.get?.("retry-after"),
+    e.data?.error?.retry_after,
+    e.data?.error?.retryAfter
+  ];
+  for (const raw of candidates) {
+    const seconds = toSeconds(raw);
+    if (seconds !== undefined)
+      return seconds;
+  }
+  const nested = [e.lastError, e.cause];
+  if (Array.isArray(e.errors))
+    nested.push(...e.errors.slice(-2));
+  for (const inner of nested) {
+    const seconds = extractRetryAfterSeconds(inner, depth + 1);
+    if (seconds !== undefined)
+      return seconds;
+  }
+  return;
+}
+function toSeconds(raw) {
+  if (typeof raw === "number" && Number.isFinite(raw) && raw >= 0)
+    return raw;
+  if (typeof raw !== "string")
+    return;
+  const trimmed = raw.trim();
+  if (!trimmed)
+    return;
+  const asNumber = Number(trimmed);
+  if (Number.isFinite(asNumber) && asNumber >= 0)
+    return asNumber;
+  const asDate = Date.parse(trimmed);
+  if (!Number.isNaN(asDate)) {
+    const delta = Math.max(0, asDate - Date.now());
+    return Math.round(delta / 1000);
+  }
+  return;
+}
+function humanizeRetryAfter(seconds) {
+  if (seconds === undefined || !Number.isFinite(seconds) || seconds < 0)
+    return;
+  if (seconds < 90)
+    return "约 1 分钟内";
+  const minutes = seconds / 60;
+  if (minutes < 90)
+    return `约 ${Math.round(minutes)} 分钟后`;
+  const hours = minutes / 60;
+  if (hours < 36)
+    return `约 ${Math.round(hours)} 小时后`;
+  const days = hours / 24;
+  return `约 ${Math.round(days)} 天后`;
+}
 function truncate(text, max) {
   if (text.length <= max)
     return text;
@@ -134,6 +209,17 @@ var FAILURE_RULES = [
     reason: "本次执行等待响应超时（上游长时间未返回或网络卡住）。建议稍后重试，或把任务拆小一些。",
     retryable: true
   },
+  {
+    id: "quota_exhausted",
+    kind: "quota_exhausted",
+    names: ["FreeUsageLimitError"],
+    patterns: QUOTA_EXHAUSTED_PATTERNS,
+    notify: true,
+    title: "模型额度已用尽",
+    reason: "本次调用被上游拒绝：该模型的额度（或免费额度）已经用完。这不是你的操作问题，" + "也不是仓库代码的问题 —— 重发同一个模型不会恢复，需要换模型或等额度重置。",
+    retryable: false,
+    suggestion: "换一个模型（例如 `--model <provider>/<付费模型>`），或等额度重置后再试。"
+  },
   {
     id: "upstream_retry",
     kind: "upstream_retry",
@@ -191,16 +277,20 @@ function getFailureRuleIds() {
 function classifyReactFailure(error) {
   const text = collectErrorText(error);
   const name = error && typeof error === "object" ? String(error.name ?? "") : "";
-  const technical = text ? truncate(text.replace(/\s*\n\s*/g, " | "), 400) : undefined;
+  const technical = text ? truncate(redactSecrets(text.replace(/\s*\n\s*/g, " | ")), 400) : undefined;
   const rule = FAILURE_RULES.find((r) => ruleMatches(r, name, text)) ?? UNKNOWN_RULE;
+  const retryAfterSeconds = rule.kind === "quota_exhausted" ? extractRetryAfterSeconds(error) : undefined;
+  const window = humanizeRetryAfter(retryAfterSeconds);
   return {
     kind: rule.kind,
     ruleId: rule.id,
     title: rule.title,
-    reason: rule.reason,
+    reason: window ? `${rule.reason}上游提示：额度${window}恢复。` : rule.reason,
     retryable: rule.retryable,
     notify: rule.notify,
-    technical
+    technical,
+    ...retryAfterSeconds !== undefined ? { retryAfterSeconds } : {},
+    ...rule.suggestion ? { suggestion: rule.suggestion } : {}
   };
 }
 var MAX_QUERY_PREVIEW = 200;
@@ -214,11 +304,12 @@ function buildFailureReplyMarkdown(info, opts) {
     lines.push("");
     lines.push(`> 原始请求：${truncate(query.replace(/\s+/g, " "), MAX_QUERY_PREVIEW)}`);
   }
-  if (info.retryable) {
-    lines.push("");
+  lines.push("");
+  if (info.suggestion) {
+    lines.push(`**你可以：** ${info.suggestion}`);
+  } else if (info.retryable) {
     lines.push("**你可以：** 直接再发一次（重发即可，无需额外操作）。");
   } else {
-    lines.push("");
     lines.push("**你可以：** 新开一个会话，或先让我压缩当前会话。");
   }
   const technical = info.technical;
@@ -229,6 +320,25 @@ function buildFailureReplyMarkdown(info, opts) {
   return lines.join(`
 `);
 }
+function errorName(error) {
+  if (!error || typeof error !== "object")
+    return "";
+  const n = error.name;
+  return typeof n === "string" ? n : "";
+}
+function formatCliFailureLine(error) {
+  const info = classifyReactFailure(error);
+  if (info.kind === "quota_exhausted") {
+    const window = humanizeRetryAfter(info.retryAfterSeconds);
+    const head = `${info.title}（${window ? window.replace(/^约 /, "约 ") + "恢复" : "恢复时间未知"}）`;
+    const advice = info.suggestion ? ` 建议：${info.suggestion}` : "";
+    return `${head} —— 重发同一模型无效。${advice}`.trim();
+  }
+  const segments = (info.technical ?? "").split("|").map((seg) => seg.trim()).filter((seg) => seg.length > 0 && seg.toLowerCase() !== (errorName(error) || "").toLowerCase());
+  const informative = segments.find((seg) => /\d/.test(seg)) ?? [...segments].sort((a, b) => b.length - a.length)[0] ?? "";
+  const summary = informative.slice(0, 200);
+  return summary ? `${info.title}：${summary}` : info.title;
+}
 function extractReplyChannelFromEvent(envEvent) {
   if (!envEvent || typeof envEvent !== "object")
     return;
@@ -411,4 +521,4 @@ async function notifyReactFailure(options) {
   }
 }
 
-export { getFailureRuleIds, classifyReactFailure, buildFailureReplyMarkdown, __resetFailureReplyDedupForTest, notifyReactFailure };
+export { extractRetryAfterSeconds, humanizeRetryAfter, getFailureRuleIds, classifyReactFailure, buildFailureReplyMarkdown, formatCliFailureLine, __resetFailureReplyDedupForTest, notifyReactFailure };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ai-setting/roy-agent-core",
-  "version": "1.7.62",
+  "version": "1.7.63",
   "type": "module",
   "description": "Core SDK for roy-agent - Environment, Components, Tools, Sessions, Tasks",
   "main": "./dist/index.js",