Merge remote-tracking branch 'origin/main' into nightly

# Conflicts: # web/src/helpers/render.jsx # web/src/hooks/usage-logs/useUsageLogsData.jsx # web/src/i18n/locales/en.json
2026-04-09 17:12:21 +08:00
parent 0220df8429 0664bb3f65
commit 4d2993e4cc
100 changed files with 6875 additions and 2699 deletions
@@ -1625,6 +1625,18 @@ function renderPriceSimpleCore({
  return result;
 }

+export function renderTaskBillingProcess(other, content) {
+  if (other?.task_id != null) {
+    return renderBillingArticle(
+      [content].filter(Boolean),
+      { showReferenceNote: false },
+    );
+  }
+  return renderBillingArticle([
+    buildBillingText('任务预扣费（将在任务完成后按实际token重算）'),
+  ]);
+}
+
 export function renderModelPrice(opts) {
  const {
    prompt_tokens: inputTokens = 0,