creditdaddy 0.8.1 → 0.9.1

package/README.md

@@ -11,7 +11,7 @@
 ## 功能
 
 - **仪表盘 + 分产品标签页**：首页仪表盘汇总账号数、今日签到进度、剩余积分、下次自动签到，各产品概况、需要处理的账号（token 失效 / 即将过期、签到失败）与最近签到记录；Qoder / WorkBuddy / ZCode 各自一个标签页，卡片式账号列表（参考 WorkDaddy），可按国际 / 国内版筛选，显示签到状态、连签天数、剩余积分、积分包到期、token 有效期，支持亮色 / 暗色
-- **10Router 集成**：配置 10Router 地址 + 虚拟 key（sk-…）后，「10Router」标签页渲染 10Router 里其他供应商（Claude / Codex / Kiro / GLM …）的额度卡片，额度告急 / 查询失败会进仪表盘「需要处理」；并内置 10router-sync 插件的用量同步能力，每小时把本机 ZCode / OpenCode / mirasim / 小米 MiMo 的用量导入 10Router 的用量统计
+- **10Router 集成**：配置 10Router 地址 + 虚拟 key（sk-…）后，「10Router」标签页**按供应商聚类**渲染 10Router 里其他供应商（CodeBuddy / Qoder / Claude / GLM …）的额度卡片（CodeBuddy / Qoder / GLM 系连接带**国内版 / 国际版**徽标，与账号卡同一语义），默认只显示主额度，其余收进一行摘要（明细可展开）；额度告急 / 查询失败会进仪表盘「需要处理」，工具栏显示 10Router 健康（存储驱动降级有提示）；并内置 10router-sync 插件的用量同步能力，每小时把本机 ZCode / OpenCode / mirasim / 小米 MiMo 的用量导入 10Router 的用量统计
 - **本机导入**：一键读取本机 Qoder / Qoder CN 客户端（本地解密 `auth.v1.dat`）与 WorkBuddy 客户端（当前 + 历史会话）已登录的账号，token 不出机器；同一用户 token 续期时自动更新
 - **WorkBuddy / ZCode 账号切换**：一键把客户端切换到选中的账号（WorkBuddy 自动应用；ZCode 需先退出客户端），切换前先保全当前登录，绝不丢号，每个账号独立设备指纹
 - **隐私（无痕）登录窗口**：桌面版内置一次性会话的登录窗口，网页授权不带出系统浏览器里已登录的账号、Cookie 也不落盘，适合同一产品登录多个账号
@@ -33,15 +33,15 @@
 - **浏览器登录**：`POST {域名}/v2/plugin/auth/state?platform=WorkBuddy` 取授权地址，用户登录后轮询 `/v2/plugin/auth/token?state=`（11217 = 等待）拿 token，再轮询 `/v2/plugin/login/account?state=`（12151 = 等待）与 `/v2/plugin/accounts` 补齐账号信息，组装成与 `workbuddy-desktop.info` 同结构的会话；国内版走 www.codebuddy.cn，国际版走 www.codebuddy.ai
 - **token 刷新**：只在 token 过期或接口返回 401 时用 refreshToken 刷新（`/v2/plugin/auth/token/refresh`）；若该账号正是 WorkBuddy 客户端当前登录的账号，会把新 token 同步写回客户端，避免客户端掉线。refreshToken 也失效时（如在别处登出），需要在 WorkBuddy 重新登录后再「本机导入」同步
 - **切换账号**：写入 `workbuddy-desktop.info` 并清除登出标记，WorkBuddy 监听该文件并自动应用；切换前会先把客户端当前会话的最新 token 保存到 CreditDaddy
-- 国际版（workbuddy.ai / codebuddy.ai）的签到接口沿用同一路径，尚未经真实账号验证
+- **国际版「活跃领取」**：国际版没有签到接口，官方规则为「当天有 ≥1 次有效对话请求即视为活跃用户，发放每日赠送积分」。调度器每天为每个国际版账号发一条免费档模型（rateMultiplier 0，~0 消耗）的极短流式请求（`POST {域名}/v2/chat/completions`，system 提示 + typed blocks 是网关必需格式），2xx 即当日活跃达成；额度耗尽时会得到「等官方发放后再试」的明确提示
 
 ## ZCode 说明
 
 - **账号来源**：ZCode 桌面客户端把当前登录存在 `~/.zcode/v2/credentials.json`（值用客户端私有的 `enc:v1:` AES-256-GCM 加密，密钥从机器信息派生），CreditDaddy 本地解密读取，token 不出机器
 - **浏览器登录**：与客户端的 CLI 轮询登录同一协议 —— `POST https://zcode.z.ai/api/v1/oauth/cli/init`（本地随机 poll token）拿授权地址（回调指向 zcode.z.ai 服务端，无需 `zcode://` 协议，任何浏览器都能用），用户登录后轮询 `/api/v1/oauth/cli/poll/{flow_id}`；Z.ai 账号再用 `api.z.ai/api/auth/z/login` 换业务 token。拿到的凭据按 `credentials.json` 格式用本机密钥加密保存，可直接切换到 ZCode 客户端
-- **没有每日签到，支持活动领取**：ZCode 积分靠「活动领取」（billing/preview → billing/claim）。点卡片上的领取按钮，弹窗列出当期活动并可领取 —— 领取时面板会跑阿里云验证码（先静默验证，触发风控时弹出验证码手动完成，任何浏览器环境都能用），故不做后台无人值守的自动签到
+- **没有每日签到，活动领取可自动轮询（开关默认关）**：ZCode 积分靠「活动领取」（billing/preview → billing/claim）。标签页打开「自动领取」后，每轮签到结束会轮询可领活动：先试免验证码领取，需要验证码时 —— 桌面版用隐藏窗口跑阿里云验证码 SDK 静默验证（触发风控时弹出窗口让人工完成，2 分钟超时），NAS / 纯 CLI 环境标记「需手动领取」；平时保持关闭即可，活动期前再开。也可点卡片上的领取按钮手动领取。ZCode 卡片不显示任何签到 / 领取徽标，结果只看运行日志与仪表盘最近记录
 - **客户端版本跟随本机**：billing 类接口校验客户端版本（过低直接 3001），请求头里上报的版本取本机已安装 ZCode 的版本（Windows 注册表读取），没有客户端时用兜底值
-- **出口可切换**：ZCode 上游请求默认「直连优先、代理兜底」，标签页提示条里可切「代理优先、直连兜底」（代理取 `HTTPS_PROXY` 环境变量，http 代理 + CONNECT 隧道，纯 Node 内置实现；`NO_PROXY` 与 loopback 始终直连）
+- **出口可切换**：ZCode 上游请求默认「直连优先、代理兜底」，标签页提示条里可切「代理优先、直连兜底」。代理地址可在面板配置（`zcode-net.json`，0600，优先），未配置时取 `HTTPS_PROXY` 环境变量；http 代理 + CONNECT 隧道，纯 Node 内置实现；`NO_PROXY` 与 loopback 始终直连
 - **额度展示**：查询 BigModel Coding Plan（quota/limit + subscription/list）与 Z.ai / Start Plan（billing/balance）；balances 为空时从生效套餐的权益派生展示额度（未到生效时间的权益显示「xx 生效」）；无有效套餐时显示「仅免费额度」
 - **账号切换**：写回 `credentials.json` / `config.json`，并为每个账号写入独立的设备 ID（`telemetry-state.json` 的 deviceMid），避免账号间被风控关联；需先退出 ZCode 客户端（运行中会覆盖回内存里的旧登录）。切换前当前登录会先保存进 CreditDaddy，不会丢号
 - 协议移植自 [zcode-switch](https://github.com/pjpv/zcode-switch)（MIT）
@@ -167,7 +167,8 @@ Qoder 侧（国际版 openapi.qoder.sh，国内版 openapi.qoder.com.cn）：
     src/workbuddyClient.js  WorkBuddy API：签到、积分、token 刷新
     src/workbuddyLocal.js   本机 WorkBuddy 会话读取与账号切换
     src/zcrypto.js          ZCode 本机凭据加解密（enc:v1: AES-256-GCM）
-    src/zcodeClient.js      ZCode 额度查询 + 活动领取（billing preview/claim、验证码配置）
+    src/zcodeClient.js      ZCode 额度查询 + 活动领取（billing preview/claim、验证码配置、出口切换）
+    src/zcodeAutoClaim.js   ZCode 活动自动轮询领取（免验证码 → 静默验证码 → 需手动）
     src/zcodeLocal.js       本机 ZCode 凭据读取与账号切换
     desktop/preload.js      桌面版 preload：暴露隐私登录窗口能力
     src/checkin.js       调度器（2h tick + 当日去重 + 本机限领 + 串行执行）

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "creditdaddy",
-  "version": "0.8.1",
+  "version": "0.9.1",
   "description": "CreditDaddy — Qoder / WorkBuddy / ZCode 多账号本地管理与每日积分自动签到助手",
   "homepage": "https://github.com/techysy/CreditDaddy",
   "repository": {

package/src/checkin.js

@@ -14,6 +14,8 @@ import { productImpl } from './providers.js';
 import { productOf } from './constants.js';
 import { startUsageSyncScheduler } from './tenrouter.js';
 import { refreshContext } from './accounts.js';
+import { zcodeAutoClaim } from './zcodeAutoClaim.js';
+import { autoClaimEnabled } from './zcodeClient.js';
 import { logger } from './logger.js';
 
 const TICK_MS = 2 * 60 * 60 * 1000;        // 2 小时
@@ -70,15 +72,24 @@ async function runTickNow(opts) {
 }
 
 async function runTickInner(opts) {
+  const allAccounts = await loadAccounts();
   // 没有每日签到能力的产品（如 ZCode：积分靠需验证码的活动领取）不参与签到轮
-  const accounts = (await loadAccounts()).filter(
+  const accounts = allAccounts.filter(
     (a) => (!opts.provider || a.provider === opts.provider)
         && (!opts.product || productOf(a.provider) === opts.product)
         && (!opts.onlyAccountId || a.id === opts.onlyAccountId)
         && typeof productImpl(a.provider)?.checkin === 'function'
   );
 
-  if (accounts.length === 0) {
+  // ZCode 活动轮询领取：开关打开（标签页可切换，默认关）且未被筛选参数排除时参与
+  const zAccounts = (autoClaimEnabled()
+      && !opts.onlyAccountId
+      && (!opts.provider || opts.provider === 'zcode')
+      && (!opts.product || opts.product === 'zcode'))
+    ? allAccounts.filter((a) => a.provider === 'zcode')
+    : [];
+
+  if (accounts.length === 0 && zAccounts.length === 0) {
     return { results: [], summary: '没有匹配的账号' };
   }
 
@@ -152,6 +163,24 @@ async function runTickInner(opts) {
   });
   await saveState({ ...state, qoderDailyDone: memo, deviceClaim });
 
+  // ZCode 活动自动领取：每轮签到后顺带轮询（preview 为空时零请求副作用；需开关打开）。
+  // 桌面版已注册隐藏窗口验证码提供者，可静默过验证码；其它环境需要验证码时标记「需手动领取」。
+  for (const za of zAccounts) {
+    const label = za.name || za.uid || za.id;
+    try {
+      const r = await zcodeAutoClaim(za);
+      if (!r) continue;
+      results.push({ accountId: za.id, account: label, provider: 'zcode', status: r.status, message: r.message });
+      const lastResult = { status: r.status, message: r.message, amount: 0, at: new Date().toISOString() };
+      await withAccounts((list) => {
+        const cur = list.find((a) => a.id === za.id);
+        if (cur) cur.lastResult = lastResult;
+      });
+    } catch (e) {
+      logger.warn('ZCODE-CLAIM', `${label} 自动领取异常：${e.message}`);
+    }
+  }
+
   const claimed = results.filter((r) => r.status === 'checked-in');
   const failed = results.filter((r) => r.status === 'failed');
   const none = results.filter((r) => r.status === 'no-activity');

package/src/daemon.js

@@ -50,7 +50,7 @@ import { addAccount, importAccounts, refreshContext } from './accounts.js';
 import { productImpl } from './providers.js';
 import { readWorkbuddySessions, writeWorkbuddySession, workbuddyAuthDir, currentWorkbuddyUid } from './workbuddyLocal.js';
 import { liveToAccount as zcodeLiveAccount, switchTo as zcodeSwitchTo, currentZcodeUid, currentZcodeIdentity, detectZcode, ensureVirtualDeviceMid, terminateZcode } from './zcodeLocal.js';
-import { fetchClaimPlans, claimPlan, fetchCaptchaConfig, proxyFirst, setProxyFirst } from './zcodeClient.js';
+import { fetchClaimPlans, claimPlan, fetchCaptchaConfig, proxyFirst, setProxyFirst, proxyUrl, setProxyUrl, autoClaimEnabled, setAutoClaimEnabled } from './zcodeClient.js';
 import { exportAccounts, parseImport, TransferError } from './transfer.js';
 import { runCheckinTick, getSchedulerInfo, dayKey } from './checkin.js';
 import { detectQoderApps, readQoderAppAccounts, riskIdentityAvailable, riskIdentitySource } from './qoderApp.js';
@@ -246,6 +246,10 @@ async function handleApi(req, res, url) {
         region: typeof body.region === 'string' ? body.region : '',
       });
       logger.info('DAEMON', `ZCode ${account.name || account.id} 领取成功：${outcome.planName}`);
+      await withAccounts((list) => {
+        const cur = list.find((a) => a.id === account.id);
+        if (cur) cur.lastResult = { status: 'checked-in', message: `已领取：${outcome.planName}`, amount: 0, at: new Date().toISOString() };
+      });
       return json(res, 200, outcome);
     } catch (e) {
       logger.warn('DAEMON', `ZCode ${account.name || account.id} 领取失败：${e.message}`);
@@ -259,15 +263,21 @@ async function handleApi(req, res, url) {
       return json(res, 502, { error: e.message });
     }
   }
-  // ZCode 出口偏好：默认「直连优先、代理兜底」，可切「代理优先、直连兜底」（存数据目录 zcode-net.json）
+  // ZCode 出口偏好：默认「直连优先、代理兜底」，可切「代理优先、直连兜底」；代理地址可面板配置（存 zcode-net.json，0600）
   if (p === '/api/zcode/net' && method === 'GET') {
-    return json(res, 200, { proxyFirst: proxyFirst() });
+    const u = proxyUrl();
+    const masked = u ? (() => { try { const x = new URL(u); x.password = x.password ? '*'.repeat(4) : ''; return x.toString(); } catch { return '***'; } })() : null;
+    return json(res, 200, { proxyFirst: proxyFirst(), proxyUrlMasked: masked, autoClaim: autoClaimEnabled(), hasEnvProxy: Boolean(process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy) });
   }
   if (p === '/api/zcode/net' && method === 'PUT') {
     const body = await readBody(req).catch(() => ({}));
-    setProxyFirst(body?.proxyFirst === true);
-    logger.info('DAEMON', `ZCode 出口切换为：${proxyFirst() ? '代理优先' : '直连优先'}`);
-    return json(res, 200, { proxyFirst: proxyFirst() });
+    try {
+      if (body?.proxyFirst !== undefined) setProxyFirst(body.proxyFirst === true);
+      if (body?.proxyUrl !== undefined) setProxyUrl(body.proxyUrl);
+      if (body?.autoClaim !== undefined) setAutoClaimEnabled(body.autoClaim === true);
+    } catch (e) { return json(res, 400, { error: e.message }); }
+    logger.info('DAEMON', `ZCode 出口：${proxyFirst() ? '代理优先' : '直连优先'}，自动领取：${autoClaimEnabled() ? '开' : '关'}，代理 ${proxyUrl() || '(环境变量/未设置)'}`);
+    return json(res, 200, { proxyFirst: proxyFirst(), autoClaim: autoClaimEnabled() });
   }
 
   // 切换 WorkBuddy / ZCode 客户端当前登录账号

package/src/panel.html

@@ -89,18 +89,18 @@
   html[data-theme="dark"] .badge.prod.workbuddy { color: #5eead4; }
   .badge.prod.zcode { color: #1d4ed8; background: rgba(37,99,235,.1); }
   html[data-theme="dark"] .badge.prod.zcode { color: #93c5fd; }
-  .pill.cur { background: rgba(20,184,166,.12); color: #0f766e; }
-  html[data-theme="dark"] .pill.cur { color: #5eead4; }
   .seg-ctl { display: inline-flex; gap: 2px; padding: 2px; border-radius: 9px; background: var(--hover); }
   .seg-ctl button { border: none; background: transparent; color: var(--text-2); font-size: 12px; font-weight: 600; padding: 4px 10px; border-radius: 7px; cursor: pointer; }
   .seg-ctl button.active { background: var(--surface); color: var(--text); box-shadow: 0 1px 3px rgba(0,0,0,.08); }
   html[data-theme="dark"] .seg-ctl button.active { background: rgba(255,255,255,.1); }
-  .pill { display: inline-flex; align-items: center; height: 22px; padding: 1px 8px; border-radius: 999px; font-size: 11px; font-weight: 600; white-space: nowrap; border: 1px solid transparent; }
-  .pill.ok { background: var(--text); color: var(--surface); }
-  html[data-theme="dark"] .pill.ok { background: rgba(255,255,255,.085); color: var(--text); border-color: rgba(255,255,255,.12); }
-  .pill.pending { background: var(--tertiary); color: var(--text-3); }
-  .pill.limited { background: var(--warn-soft); color: var(--warn); }
-  .pill.fail { background: var(--err-soft); color: var(--err); }
+  /* 胶囊徽章：不要类型背景色，细边框 + 彩色文字即可 */
+  .pill { display: inline-flex; align-items: center; height: 22px; padding: 1px 8px; border-radius: 999px; font-size: 11px; font-weight: 600; white-space: nowrap; border: 1px solid var(--border); background: transparent; color: var(--text-2); }
+  .pill.ok { color: var(--text); border-color: var(--text); }
+  .pill.pending { color: var(--text-3); }
+  .pill.limited { color: var(--warn); border-color: var(--warn-soft); }
+  .pill.fail { color: var(--err); border-color: var(--err-soft); }
+  .pill.cur { color: #0f766e; border-color: rgba(20,184,166,.5); }
+  html[data-theme="dark"] .pill.cur { color: #5eead4; }
   .ops { display: flex; gap: 6px; flex-shrink: 0; }
 
   .meta { display: flex; align-items: center; justify-content: space-between; gap: 12px; margin-bottom: 8px; font-size: 12px; }
@@ -184,6 +184,7 @@
   .kpi-label { color: var(--text-3); font-size: 12px; font-weight: 500; }
   .kpi-value { font-size: 26px; font-weight: 700; letter-spacing: -.5px; margin-top: 4px; font-variant-numeric: tabular-nums; line-height: 1.2; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
   .kpi-value small { font-size: 14px; color: var(--text-3); font-weight: 600; letter-spacing: 0; }
+  .kpi-value .kpi-side { font-size: 13px; color: var(--text-2); font-weight: 600; letter-spacing: 0; }
   .kpi-sub { color: var(--text-3); font-size: 11px; margin-top: 4px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
   .prods { display: grid; grid-template-columns: repeat(auto-fit, minmax(240px, 1fr)); gap: 10px; margin-bottom: 10px; }
   .prodcard { background: var(--surface); border: 1px solid var(--border-subtle); border-radius: 14px; padding: 14px 16px; cursor: pointer; transition: border-color .15s, box-shadow .15s; display: flex; flex-direction: column; gap: 10px; min-width: 0; }
@@ -215,9 +216,15 @@
   .badge.prod.tenrouter { color: #b45309; background: rgba(245,158,11,.14); }
   html[data-theme="dark"] .badge.prod.tenrouter { color: #fcd34d; }
   /* 瀑布流：卡片高低差异大（积分包多的卡很长），按列填充避免大片空白 */
-  .tr-grid { columns: 3 320px; column-gap: 10px; padding: 12px; }
-  .tr-grid > .empty { column-span: all; }
-  .tr-card { border: 1px solid var(--border-subtle); border-radius: 12px; padding: 11px 12px 12px; background: var(--surface); min-width: 0; break-inside: avoid; margin-bottom: 10px; display: inline-block; width: 100%; }
+  .tr-grid { padding: 12px; display: flex; flex-direction: column; gap: 14px; }
+  .tr-vrow { }
+  .tr-vhead { display: flex; align-items: center; gap: 8px; margin-bottom: 8px; font-size: 13px; }
+  .tr-vhead .dim { font-size: 12px; }
+  .tr-tabs { display: flex; gap: 6px; flex-wrap: wrap; margin: 2px 12px 4px; }
+  .tr-vcards { display: grid; grid-template-columns: repeat(3, minmax(0, 1fr)); gap: 10px; align-items: stretch; }
+  @media (max-width: 1180px) { .tr-vcards { grid-template-columns: repeat(2, minmax(0, 1fr)); } }
+  @media (max-width: 820px) { .tr-vcards { grid-template-columns: 1fr; } }
+  .tr-card { border: 1px solid var(--border-subtle); border-radius: 12px; padding: 11px 12px 12px; background: var(--surface); min-width: 0; }
   .tr-card.off { opacity: .6; }
   .tr-head { display: flex; align-items: center; justify-content: space-between; gap: 8px; margin-bottom: 8px; }
   .tr-title { display: flex; align-items: center; gap: 6px; min-width: 0; flex-wrap: wrap; }
@@ -230,6 +237,9 @@
   .tr-meter { height: 5px; border-radius: 3px; background: color-mix(in srgb, var(--tertiary) 80%, transparent); overflow: hidden; }
   .tr-meter span { display: block; height: 100%; border-radius: 3px; background: rgb(var(--accent-rgb)); }
   .tr-meter span.low { background: var(--err); }
+  .tr-meter span.mid { background: #d97706; }
+  .tr-reset { color: var(--text-3); font-weight: 400; }
+  .tr-reset.soon { color: var(--err); font-weight: 600; }
   .tr-reset { font-size: 11px; color: var(--text-3); margin-top: 3px; }
   .tr-primary { margin: 2px 0 6px; }
   .tr-primary .lbl { max-width: 55%; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; }
@@ -241,6 +251,8 @@
   .tr-p-val.low b { color: var(--err); }
   .tr-meter.big { height: 7px; }
   .tr-line { display: flex; align-items: baseline; justify-content: space-between; gap: 10px; font-size: 12px; margin-top: 6px; }
+  .tr-summary { display: flex; align-items: baseline; gap: 6px; font-size: 12px; margin-top: 6px; }
+  .tr-sum-txt { flex: 1 1 auto; min-width: 0; overflow: hidden; white-space: nowrap; text-overflow: ellipsis; }
   .low-text { color: var(--err); font-weight: 600; }
   .tr-q-when { color: var(--text-3); font-weight: 400; }
   .tr-q.spent .tr-q-name, .tr-q.spent .tr-q-val { color: var(--text-3); }
@@ -270,7 +282,7 @@
       <img class="logo" alt="" src="data:image/svg+xml;base64,PHN2ZyBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDI0IiBoZWlnaHQ9IjEwMjQiPjxwYXRoIGQ9Ik0zNzIuNDggMTM4LjY2NjY2N0ExMjggMTI4IDAgMCAwIDI5OC42NjY2NjcgMTAxLjU0NjY2N2ExMTcuNzYgMTE3Ljc2IDAgMCAwLTYyLjA4IDAgMTAuODggMTAuODggMCAwIDAtNS4xMiAxNi44NTMzMzNsNzEuMjUzMzMzIDkxLjUyLTgxLjI4IDI4LjM3MzMzM2ExMC42NjY2NjcgMTAuNjY2NjY3IDAgMCAwLTIuMzQ2NjY3IDE4Ljk4NjY2NyAyNDIuNTYgMjQyLjU2IDAgMCAwIDY5Ljc2IDMyLjg1MzMzMyAyNzMuNzA2NjY3IDI3My43MDY2NjcgMCAwIDAgNTYuOTYgOC4zMnoiIGZpbGw9IiNGRjhBMTQiPjwvcGF0aD48cGF0aCBkPSJNMjQ1Ljc2IDEzOC4wMjY2NjdhMTMwLjk4NjY2NyAxMzAuOTg2NjY3IDAgMCAxIDUyLjA1MzMzMyAyLjEzMzMzM0ExNDguMDUzMzMzIDE0OC4wNTMzMzMgMCAwIDEgMzY2LjcyIDE3MC42NjY2NjdsNS43Ni0zMi44NTMzMzRBMTI4IDEyOCAwIDAgMCAyOTguNjY2NjY3IDEwMS41NDY2NjdhMTE3Ljk3MzMzMyAxMTcuOTczMzMzIDAgMCAwLTYyLjA4IDAgMTAuODggMTAuODggMCAwIDAtNS4xMiAxNi44NTMzMzN6IiBmaWxsPSIjRkZBQTU0Ij48L3BhdGg+PHBhdGggZD0iTTIzNC42NjY2NjcgOTcwLjY2NjY2N2EyNzcuMzMzMzMzIDMyIDAgMSAwIDU1NC42NjY2NjYgMCAyNzcuMzMzMzMzIDMyIDAgMSAwLTU1NC42NjY2NjYgMFoiIGZpbGw9IiM0NTQxM0MiIG9wYWNpdHk9Ii4xNSI+PC9wYXRoPjxwYXRoIGQ9Ik02MjAuMzczMzMzIDQ2MC41ODY2NjdzMTUxLjA0LTkwLjY2NjY2NyAxODEuMzMzMzM0LTc0LjY2NjY2Ny0xMi41ODY2NjcgMTc0LjI5MzMzMy0xMDYuNjY2NjY3IDIxMy4zMzMzMzMtNzQuNjY2NjY3LTEzOC42NjY2NjctNzQuNjY2NjY3LTEzOC42NjY2NjZ6IiBmaWxsPSIjRkZFNTAwIj48L3BhdGg+PHBhdGggZD0iTTYyMC4zNzMzMzMgNTEzLjkyczE1MS4wNC05MC42NjY2NjcgMTgxLjMzMzMzNC03NC42NjY2NjdhMTQuNzIgMTQuNzIgMCAwIDEgNS4zMzMzMzMgNS45NzMzMzRjNi44MjY2NjctMjkuODY2NjY3IDUuMzMzMzMzLTUzLjU0NjY2Ny01LjMzMzMzMy01OS4zMDY2NjctMzAuMjkzMzMzLTE2LTE4MS4zMzMzMzMgNzQuNjY2NjY3LTE4MS4zMzMzMzQgNzQuNjY2NjY3YTM4Ni45ODY2NjcgMzg2Ljk4NjY2NyAwIDAgMCAwIDYxLjg2NjY2NmMtMC40MjY2NjctNS4zMzMzMzMgMC04LjUzMzMzMyAwLTguNTMzMzMzeiIgZmlsbD0iI0ZGRjQ4QyI+PC9wYXRoPjxwYXRoIGQ9Ik00MDMuNjI2NjY3IDQ2MC41ODY2NjdzLTE1MS4wNC05MC42NjY2NjctMTgxLjMzMzMzNC03NC42NjY2NjcgMTIuMzczMzMzIDE3NC4yOTMzMzMgMTA2LjY2NjY2NyAyMTMuMzMzMzMzIDc0LjY2NjY2Ny0xMzguNjY2NjY3IDc0LjY2NjY2Ny0xMzguNjY2NjY2eiIgZmlsbD0iI0ZGRTUwMCI+PC9wYXRoPjxwYXRoIGQ9Ik0yMjIuMjkzMzMzIDQzOS4yNTMzMzNjMzAuMjkzMzMzLTE2IDE4MS4zMzMzMzMgNzQuNjY2NjY3IDE4MS4zMzMzMzQgNzQuNjY2NjY3djguNTMzMzMzYTM3My41NDY2NjcgMzczLjU0NjY2NyAwIDAgMCAwLTYxLjg2NjY2NnMtMTUxLjA0LTkwLjY2NjY2Ny0xODEuMzMzMzM0LTc0LjY2NjY2N2MtMTAuNjY2NjY3IDUuNzYtMTIuMTYgMjkuNDQtNS4zMzMzMzMgNTkuMzA2NjY3YTEzLjQ0IDEzLjQ0IDAgMCAxIDUuMzMzMzMzLTUuOTczMzM0eiIgZmlsbD0iI0ZGRjQ4QyI+PC9wYXRoPjxwYXRoIGQ9Ik0yODggNjUwLjY2NjY2N2EyNjYuNjY2NjY3IDIyNCA5MCAxIDAgNDQ4IDAgMjY2LjY2NjY2NyAyMjQgOTAgMSAwLTQ0OCAwWiIgZmlsbD0iI0ZGRTUwMCI+PC9wYXRoPjxwYXRoIGQ9Ik02ODAuMTA2NjY3IDQ3NC4yNGEyMjQgMjI0IDAgMCAxLTMzNi4yMTMzMzQgMEEyMTAuNTYgMjEwLjU2IDAgMCAxIDUxMiAzODRhMjEwLjU2IDIxMC41NiAwIDAgMSAxNjguMTA2NjY3IDkwLjI0eiIgZmlsbD0iI0VCQ0IwMCI+PC9wYXRoPjxwYXRoIGQ9Ik01MTIgMjY2LjY2NjY2N20tMjI0IDBhMjI0IDIyNCAwIDEgMCA0NDggMCAyMjQgMjI0IDAgMSAwLTQ0OCAwWiIgZmlsbD0iI0ZGRTUwMCI+PC9wYXRoPjxwYXRoIGQ9Ik01MTIgMTAxLjk3MzMzM2EyMjQuMjEzMzMzIDIyNC4yMTMzMzMgMCAwIDEgMjIxLjg2NjY2NyAxOTQuMzQ2NjY3IDIyNCAyMjQgMCAxIDAtNDQzLjczMzMzNCAwQTIyMy43ODY2NjcgMjIzLjc4NjY2NyAwIDAgMSA1MTIgMTAxLjk3MzMzM3oiIGZpbGw9IiNGRkY0OEMiPjwvcGF0aD48cGF0aCBkPSJNODMzLjQ5MzMzMyA1OTguODI2NjY3bC03MC40IDcwLjRhMTguMzQ2NjY3IDE4LjM0NjY2NyAwIDAgMS0yNS44MTMzMzMgMEw2NDQuMDUzMzMzIDU3NkExOC4zNDY2NjcgMTguMzQ2NjY3IDAgMCAwIDYxOC42NjY2NjcgNTc2bC05My4wMTMzMzQgOTMuMjI2NjY3YTE4Ljc3MzMzMyAxOC43NzMzMzMgMCAwIDEtMjYuMDI2NjY2IDBMNDA1LjMzMzMzMyA1NzZhMTguMTMzMzMzIDE4LjEzMzMzMyAwIDAgMC0yNS44MTMzMzMgMGwtOTMuMjI2NjY3IDkzLjIyNjY2N2ExOC4zNDY2NjcgMTguMzQ2NjY3IDAgMCAxLTI1LjgxMzMzMyAwbC03MC40LTcwLjRhOS4xNzMzMzMgOS4xNzMzMzMgMCAwIDAtMTUuNzg2NjY3IDYuODI2NjY2QzE4OS44NjY2NjcgODQxLjgxMzMzMyAzMzQuOTMzMzMzIDk2MCA1MTIgOTYwczMyMi4xMzMzMzMtMTE4LjE4NjY2NyAzMzcuMjgtMzU0LjM0NjY2N2E5LjE3MzMzMyA5LjE3MzMzMyAwIDAgMC0xNS43ODY2NjctNi44MjY2NjZ6IiBmaWxsPSIjRjBGMEYwIj48L3BhdGg+PHBhdGggZD0iTTE5MC41MDY2NjcgNjY1LjgxMzMzM2w3MC40IDYxLjIyNjY2N2EyMS4zMzMzMzMgMjEuMzMzMzMzIDAgMCAwIDI1LjgxMzMzMyAwbDkzLjIyNjY2Ny04MS4wNjY2NjdhMjEuMzMzMzMzIDIxLjMzMzMzMyAwIDAgMSAyNS44MTMzMzMgMGw5My4yMjY2NjcgODEuMDY2NjY3YTIxLjMzMzMzMyAyMS4zMzMzMzMgMCAwIDAgMjYuMDI2NjY2IDBsOTMuNjUzMzM0LTgxLjA2NjY2N2EyMS4zMzMzMzMgMjEuMzMzMzMzIDAgMCAxIDI2LjAyNjY2NiAwbDkzLjIyNjY2NyA4MS4wNjY2NjdhMjEuMzMzMzMzIDIxLjMzMzMzMyAwIDAgMCAyNS44MTMzMzMgMGw3MC40LTYxLjIyNjY2N2E5LjgxMzMzMyA5LjgxMzMzMyAwIDAgMSA4LjUzMzMzNC0xLjkyIDUzNi4xMDY2NjcgNTM2LjEwNjY2NyAwIDAgMCA3LjI1MzMzMy01OC4yNCA5LjE3MzMzMyA5LjE3MzMzMyAwIDAgMC0xNS43ODY2NjctNi44MjY2NjZsLTcwLjQgNzAuNGExOC4zNDY2NjcgMTguMzQ2NjY3IDAgMCAxLTI1LjgxMzMzMyAwTDY0NC4wNTMzMzMgNTc2QTE4LjM0NjY2NyAxOC4zNDY2NjcgMCAwIDAgNjE4LjY2NjY2NyA1NzZsLTkzLjAxMzMzNCA5My4yMjY2NjdhMTguNzczMzMzIDE4Ljc3MzMzMyAwIDAgMS0yNi4wMjY2NjYgMEw0MDUuMzMzMzMzIDU3NmExOC4xMzMzMzMgMTguMTMzMzMzIDAgMCAwLTI1LjgxMzMzMyAwbC05My4yMjY2NjcgOTMuMjI2NjY3YTE4LjM0NjY2NyAxOC4zNDY2NjcgMCAwIDEtMjUuODEzMzMzIDBsLTcwLjQtNzAuNGE5LjE3MzMzMyA5LjE3MzMzMyAwIDAgMC0xNS43ODY2NjcgNi44MjY2NjYgNTM3LjE3MzMzMyA1MzcuMTczMzMzIDAgMCAwIDcuMDQgNTguMjQgMTAuMDI2NjY3IDEwLjAyNjY2NyAwIDAgMSA5LjE3MzMzNCAxLjkyeiIgZmlsbD0iI0ZGRkZGRiI+PC9wYXRoPjxwYXRoIGQ9Ik00OTguMTMzMzMzIDE4NC41MzMzMzNtLTI5LjAxMzMzMyAwYTI5LjAxMzMzMyAyOS4wMTMzMzMgMCAxIDAgNTguMDI2NjY3IDAgMjkuMDEzMzMzIDI5LjAxMzMzMyAwIDEgMC01OC4wMjY2NjcgMFoiIGZpbGw9IiM0NTQxM0MiPjwvcGF0aD48cGF0aCBkPSJNNTc2IDI5MC45ODY2NjdjMCAxMS43MzMzMzMtMTUuNzg2NjY3IDIxLjMzMzMzMy0zNC45ODY2NjcgMjEuMzMzMzMzcy0zNS4yLTkuNi0zNS4yLTIxLjMzMzMzMyAxNS43ODY2NjctMjEuMzMzMzMzIDM1LjItMjEuMzMzMzM0IDM0Ljk4NjY2NyA5LjYgMzQuOTg2NjY3IDIxLjMzMzMzNHoiIGZpbGw9IiNGRkY0OEMiPjwvcGF0aD48L3N2Zz4=">
       <div>
         <div class="title">CreditDaddy</div>
-        <div class="ver" id="ver">Qoder / WorkBuddy / ZCode 多账号管理 · 每日积分自动签到</div>
+        <div class="ver" id="ver">Qoder / WorkBuddy / ZCode 多账号管理 · 每日积分自动领取</div>
       </div>
     </div>
     <div class="head-right">
@@ -302,8 +314,8 @@
     <div class="kpis" id="kpis"></div>
     <div class="prods" id="prods"></div>
     <div class="dash-cols">
+      <section class="pcard"><div class="pcard-title"><span>最近记录</span><span class="hint" id="last-tick"></span></div><div id="recent"></div></section>
       <section class="pcard"><div class="pcard-title"><span>需要处理</span><span class="hint" id="att-count"></span></div><div id="attention"></div></section>
-      <section class="pcard"><div class="pcard-title"><span>最近签到</span><span class="hint" id="last-tick"></span></div><div id="recent"></div></section>
     </div>
   </section>
 
@@ -315,7 +327,7 @@
           <div class="stat"><span>账号</span><strong id="s-count">0</strong></div>
           <div class="divider"></div>
           <div id="s-done-wrap" style="display:contents">
-            <div class="stat"><span>今日已签</span><strong id="s-done">0</strong></div>
+            <div class="stat"><span>今日已领</span><strong id="s-done">0</strong></div>
             <div class="divider"></div>
           </div>
           <div class="stat"><span id="s-credits-label">剩余积分</span><strong id="s-credits">-</strong></div>
@@ -434,6 +446,9 @@
       <div id="tr-sources" style="margin-top:6px"></div>
       <div class="hint" style="margin-top:4px">ZCode 只同步官方渠道；经 10Router 中转的 mirasim 调用会跳过，避免重复计数。10Router 按行签名去重，重复同步不会产生重复数据。</div>
     </div>
+    <div class="field"><label>显示</label>
+      <div><label class="check"><input type="checkbox" id="tr-hide-empty"> 「全部」视图隐藏没有额度 / 余额为 0 的供应商汇总卡</label></div>
+    </div>
     <div class="hint" id="tr-test-msg"></div>
     <div class="modal-actions">
       <button class="btn" id="tr-disconnect" style="margin-right:auto">断开</button>
@@ -583,6 +598,9 @@ async function api(p, opts = {}, attempt = 0) {
   return data;
 }
 
+// 10Router 汇总卡「隐藏无额度」偏好（面板本地）
+try { state.trHideEmpty = localStorage.getItem('qd_tr_hideempty') === '1'; } catch (e) {}
+
 // ── 主题 ──
 function applyTheme(t) {
   document.documentElement.dataset.theme = t;
@@ -601,22 +619,25 @@ function initTheme() {
 }
 
 // ── 状态 / 渲染 ──
+// 统一「领鸡蛋」语义：Qoder / WorkBuddy 国内/国际 = 领取积分；workbuddy-intl = 保持活跃（不保证奖励）
 function statusOf(a) {
-  // ZCode 没有每日签到（只有活动领取），不显示签到徽标
-  if (!CHECKIN_PRODUCTS.has(a.product)) return { cls: '', text: '', msg: '' };
+  if (!CHECKIN_PRODUCTS.has(a.product)) return { cls: '', text: '', msg: '' };  // ZCode 无每日领取，不显示徽标
+  const intl = a.provider === 'workbuddy-intl';
   const today = state.status && state.status.today;
   const done = state.status && state.status.todayDone && state.status.todayDone[a.id] === today;
   const r = a.lastResult;
   const fresh = r && r.at && state.status && (Date.now() - new Date(r.at).getTime() < 26 * 3600e3);
   if (r && fresh && r.status === 'limited' && done) return { cls: 'limited', text: '本机已领', msg: r.message };
   if (done) {
+    if (intl) return { cls: 'ok', text: '今日活跃', msg: r && r.message ? r.message : '' };
     const amt = r && r.status === 'checked-in' && fresh && r.amount ? ' +' + fmtNum(r.amount) : '';
-    const streak = r && fresh && r.streakDays ? ' · 连签 ' + r.streakDays + ' 天' : '';
-    return { cls: 'ok', text: '今日已签' + amt + streak, msg: r && r.message && !['checked-in', 'already'].includes(r.status) ? r.message : '' };
+    const streak = r && !intl && r.streakDays ? ' · 连续 ' + r.streakDays + ' 天' : '';
+    return { cls: 'ok', text: '今日已领' + amt + streak, msg: r && r.message && !['checked-in', 'already'].includes(r.status) ? r.message : '' };
   }
-  if (r && fresh && r.status === 'failed') return { cls: 'fail', text: '签到失败', msg: r.message, err: true };
-  if (r && fresh && r.status === 'no-activity') return { cls: 'pending', text: '待领取', msg: r.message };
-  return { cls: 'pending', text: '未签到', msg: '' };
+  const failText = intl ? '活跃失败' : '领取失败';
+  if (r && fresh && r.status === 'failed') return { cls: 'fail', text: failText, msg: r.message, err: true };
+  if (r && fresh && r.status === 'no-activity') return { cls: 'pending', text: intl ? '待活跃' : '待领取', msg: r.message };
+  return { cls: 'pending', text: intl ? '未活跃' : '未领取', msg: '' };
 }
 
 function expiryCell(a) {
@@ -675,7 +696,7 @@ function cardHtml(a) {
     + (st.text ? '<span class="pill ' + st.cls + '" title="' + esc(a.lastResult ? fmtTime(a.lastResult.at) + ' ' + (a.lastResult.message || a.lastResult.status) : '') + '">' + esc(st.text) + '</span>' : '')
     + '</div><div class="ops">'
     + (a.product === 'zcode' ? '<button class="icon-btn" data-act="claim" title="活动领取（billing/preview → claim，可能需过一次验证码）">' + I.gift + '</button>' : '')
-    + (canCheckin ? '<button class="icon-btn' + (state.busy[a.id] ? ' busy' : '') + '" data-act="checkin" title="立即签到">' + (state.busy[a.id] ? I.refresh : I.play) + '</button>' : '')
+    + (canCheckin ? '<button class="icon-btn' + (state.busy[a.id] ? ' busy' : '') + '" data-act="checkin" title="' + (a.provider === 'workbuddy-intl' ? '发送活跃请求' : '立即领取') + '">' + (state.busy[a.id] ? I.refresh : I.play) + '</button>' : '')
     + (CLIENT_LABEL[a.product] && a.canSwitch && !isCurrent && st.cls !== 'fail' ? '<button class="icon-btn" data-act="switch" title="切换 ' + CLIENT_LABEL[a.product] + ' 客户端到此账号">' + I.swap + '</button>' : '')
     + '<button class="icon-btn" data-act="quota" title="刷新积分">' + I.refresh + '</button>'
     + '<button class="icon-btn del" data-act="del" title="删除（点两次确认）">' + I.trash + '</button>'
@@ -741,7 +762,17 @@ function renderProd() {
   const canCheckin = CHECKIN_PRODUCTS.has(prod);
   $('s-count').textContent = acc.length;
   $('s-done-wrap').style.display = canCheckin ? 'contents' : 'none';
-  $('s-done').textContent = acc.filter(isDone).length + ' / ' + acc.length;
+  if (prod === 'workbuddy') {
+    // 国内版 = 每日签到送积分；国际版 = 保持活跃（活跃不等于必有奖励）
+    const cnAcc = acc.filter((a) => a.provider === 'workbuddy');
+    const intlAcc = acc.filter((a) => a.provider === 'workbuddy-intl');
+    $('s-done-wrap').innerHTML = (cnAcc.length ? '<div class="stat"><span>领取（国内）</span><strong>' + cnAcc.filter(isDone).length + ' / ' + cnAcc.length + '</strong></div><div class="divider"></div>' : '')
+      + (intlAcc.length ? '<div class="stat"><span>活跃（国际）</span><strong>' + intlAcc.filter(isDone).length + ' / ' + intlAcc.length + '</strong></div><div class="divider"></div>' : '');
+  } else {
+    // 从 WorkBuddy 页切回来时 s-done 可能被 innerHTML 换没了，先重建结构再写值
+    if (!$('s-done')) $('s-done-wrap').innerHTML = '<div class="stat"><span>今日已领</span><strong id="s-done"></strong></div><div class="divider"></div>';
+    $('s-done').textContent = acc.filter(isDone).length + ' / ' + acc.length;
+  }
   const c = creditSum(acc);
   $('s-credits-label').textContent = prod === 'zcode' ? '有套餐' : '剩余积分';
   $('s-credits').textContent = prod === 'zcode'
@@ -752,7 +783,10 @@ function renderProd() {
   $('region-div').style.display = hasRegions ? '' : 'none';
   document.querySelectorAll('#region button').forEach((x) => x.classList.toggle('active', x.dataset.r === state.region));
   $('btn-checkin').style.display = canCheckin ? '' : 'none';
-  if (!$('btn-checkin').disabled) $('btn-checkin').innerHTML = I.play + '签到全部 ' + prodLabel(prod);
+  if (!$('btn-checkin').disabled) {
+    const hasIntl = acc.some((a) => a.provider === 'workbuddy-intl');
+    $('btn-checkin').innerHTML = I.play + (prod === 'workbuddy' && hasIntl ? '领取 / 活跃全部' : '领取全部 ' + prodLabel(prod));
+  }
 }
 
 function kpi(label, value, sub) {
@@ -769,12 +803,21 @@ function renderDash() {
   const credit = creditSum(state.accounts.filter((a) => a.product !== 'zcode'));
   const byProd = PRODUCTS.map((p) => p.label + ' ' + ofProduct(p.id).length).join(' · ');
   const creditByProd = ['qoder', 'workbuddy'].map((id) => { const c = creditSum(ofProduct(id)); return prodLabel(id) + ' ' + (c.known ? fmtNum(c.sum) : '-'); }).join(' · ');
+  // 今日进度拆「国内领取 / 国际活跃」：国际版 WorkBuddy 是保持活跃（活跃不等于必有奖励）
+  const intlAcc = signable.filter((a) => a.provider === 'workbuddy-intl');
+  const domAcc = signable.filter((a) => a.provider !== 'workbuddy-intl');
+  const doneDom = domAcc.filter(isDone).length;
+  const doneIntl = intlAcc.filter(isDone).length;
   $('kpis').innerHTML =
     kpi('账号', state.accounts.length, byProd)
-    + kpi('今日已签', done + ' <small>/ ' + signable.length + '</small>',
-      !signable.length ? '暂无可签到的账号' : done === signable.length ? '今天全部签完' : '待签 ' + (signable.length - done) + (failed ? ' · 失败 ' + failed : ''))
+    + kpi('今日领取' + (intlAcc.length ? ' / 活跃' : ''), intlAcc.length
+        ? doneDom + ' <small>/ ' + domAcc.length + '</small><small class="kpi-side"> · 活跃 ' + doneIntl + ' / ' + intlAcc.length + '</small>'
+        : done + ' <small>/ ' + signable.length + '</small>',
+      !signable.length ? '暂无可领取的账号'
+        : (doneDom === domAcc.length && doneIntl === intlAcc.length ? (intlAcc.length ? '今天全部完成（国际为活跃请求，不保证奖励）' : '今天全部签完')
+        : '待办 ' + (signable.length - done) + (failed ? ' · 失败 ' + failed : '')))
     + kpi('剩余积分', credit.known ? fmtNum(credit.sum) : '-', credit.loading ? '读取中（' + credit.loading + ' 个账号）…' : creditByProd)
-    + kpi('下次自动签到', sch.ticking ? '签到中…' : sch.nextTickAt ? fmtTime(sch.nextTickAt).slice(11) : '-',
+    + kpi('下次自动领取', sch.ticking ? '领取中…' : sch.nextTickAt ? fmtTime(sch.nextTickAt).slice(11) : '-',
       sch.lastTick ? '上一轮 ' + fmtTime(sch.lastTick.at).slice(5) + ' · ' + esc(sch.lastTick.summary || '') : '每 ~2 小时一轮');
 
   $('prods').innerHTML = PRODUCTS.map((p) => {
@@ -785,12 +828,21 @@ function renderDash() {
     } else if (CHECKIN_PRODUCTS.has(p.id)) {
       const d = list.filter(isDone).length;
       const c = creditSum(list);
-      rows = '<span class="lbl">今日签到</span><span class="val">' + d + ' / ' + list.length + '</span>'
-        + '<span style="grid-column:1 / -1">' + meter(d, list.length) + '</span>'
+      if (p.id === 'workbuddy') {
+        // 国内 = 每日签到；国际 = 保持活跃（活跃不等于必有奖励）
+        const cnList = list.filter((a) => a.provider === 'workbuddy');
+        const intlList = list.filter((a) => a.provider === 'workbuddy-intl');
+        if (cnList.length) rows += '<span class="lbl">领取（国内）</span><span class="val">' + cnList.filter(isDone).length + ' / ' + cnList.length + '</span>';
+        if (intlList.length) rows += '<span class="lbl">活跃（国际）</span><span class="val">' + intlList.filter(isDone).length + ' / ' + intlList.length + '（不保证奖励）</span>';
+      } else {
+        rows = '<span class="lbl">今日领取</span><span class="val">' + d + ' / ' + list.length + '</span>';
+      }
+      rows += '<span style="grid-column:1 / -1">' + meter(d, list.length) + '</span>'
         + '<span class="lbl">剩余积分</span><span class="val">' + (c.known ? fmtNum(c.sum) : '-') + '</span>';
     } else {
       const planned = list.filter((a) => { const q = state.quotas[a.id]; return q && !q.error && !q.empty; }).length;
-      rows = '<span class="lbl">每日签到</span><span class="val dim">无（活动领取需验证码）</span>'
+      // ZCode 没有每日签到：不展示签到语义的行
+      rows = '<span class="lbl">活动领取</span><span class="val dim">手动领取，或在标签页开自动轮询</span>'
         + '<span class="lbl">有效套餐</span><span class="val">' + planned + ' / ' + list.length + '</span>';
     }
     if (p.id === 'qoder' && list.some((a) => a.provider === 'qoder')) {
@@ -808,7 +860,7 @@ function renderDash() {
       + '<span class="badge">' + list.length + ' 个账号</span></span><span class="prod-go">查看 →</span></div><div class="prod-rows">' + rows + '</div></div>';
   }).join('') + trDashCard();
 
-  // 需要处理：token 失效 / 即将过期、签到失败、国际版缺风控身份、10Router 额度告急 / 查询失败
+  // 需要处理：token 失效 / 即将过期、领取失败、国际版缺风控身份、10Router 额度告急 / 查询失败
   const att = [];
   if (!s.riskIdentity && state.accounts.some((a) => a.provider === 'qoder')) {
     att.push({ view: 'qoder', name: 'Qoder 国际版', badges: '', pill: 'limited', text: umidOffer(s) ? '安装设备身份组件后才能领取' : '未检测到 Qoder 客户端，国际版无法领取' });
@@ -820,7 +872,7 @@ function renderDash() {
     if (a.verified === false) att.push(Object.assign({ pill: 'fail', text: 'token 无效' }, base));
     else if (ex.label === '已过期') att.push(Object.assign({ pill: 'fail', text: 'token 已过期' }, base));
     else if (ex.warn) att.push(Object.assign({ pill: 'limited', text: ex.label.slice(5, 10) + ' 过期' }, base));
-    if (st.cls === 'fail') att.push(Object.assign({ pill: 'fail', text: '签到失败', title: st.msg }, base));
+    if (st.cls === 'fail') att.push(Object.assign({ pill: 'fail', text: a.provider === 'workbuddy-intl' ? '活跃失败' : '领取失败', title: st.msg }, base));
   }
   for (const c of (tr.quotas && tr.quotas.connections) || []) {
     const base = { view: 'tenrouter', name: c.name || c.email || c.providerName, badges: '<span class="badge prod tenrouter">' + esc(c.providerName) + '</span>' };
@@ -834,19 +886,21 @@ function renderDash() {
       + (att.length > 8 ? '<div class="muted-empty">还有 ' + (att.length - 8) + ' 项</div>' : '')
     : '<div class="muted-empty">' + (state.accounts.length ? '✓ 一切正常' : '还没有账号') + '</div>';
 
-  // 最近签到结果
+  // 最近领取记录
   const RES = { 'checked-in': ['ok', '领取成功'], already: ['ok', '已领过'], limited: ['limited', '本机已领'], 'no-activity': ['pending', '无可领活动'], failed: ['fail', '失败'] };
   const recent = state.accounts.filter((a) => a.lastResult && a.lastResult.at).sort((x, y) => String(y.lastResult.at).localeCompare(String(x.lastResult.at))).slice(0, 8);
   $('last-tick').textContent = sch.lastTick ? '上一轮 ' + fmtTime(sch.lastTick.at).slice(5) : '';
   $('recent').innerHTML = recent.length
     ? recent.map((a) => {
       const r = a.lastResult;
-      const [cls, txt] = RES[r.status] || ['pending', r.status];
+      let [cls, txt] = RES[r.status] || ['pending', r.status];
+      // 国际版 WorkBuddy 是保持活跃（不保证奖励），不叫「领取」
+      if (a.provider === 'workbuddy-intl' && r.status === 'checked-in') txt = '活跃达成';
       const label = r.status === 'checked-in' && r.amount ? txt + ' +' + fmtNum(r.amount) : txt;
       return '<div class="item" data-view="' + a.product + '" title="' + esc(r.message || '') + '"><span class="item-main"><span class="item-name">' + esc(a.name || a.email || a.id) + '</span>' + provBadges(a.provider) + '</span>'
         + '<span class="item-side"><span class="pill ' + cls + '">' + esc(label) + '</span><span class="item-time">' + fmtTime(r.at).slice(5) + '</span></span></div>';
     }).join('')
-    : '<div class="muted-empty">还没有签到记录</div>';
+    : '<div class="muted-empty">还没有领取记录</div>';
 }
 
 function renderStatus() {
@@ -856,8 +910,8 @@ function renderStatus() {
   document.title = 'CreditDaddy v' + s.version;
   if (s.homepage) $('btn-home').href = s.homepage;
   const sch = s.scheduler || {};
-  $('sched').textContent = sch.ticking ? '正在签到…'
-    : sch.nextTickAt ? '下次自动签到 ' + fmtTime(sch.nextTickAt).slice(11) : '';
+  $('sched').textContent = sch.ticking ? '正在领取…'
+    : sch.nextTickAt ? '下次自动领取 ' + fmtTime(sch.nextTickAt).slice(11) : '';
   $('sched').title = sch.lastTick ? '上一轮 ' + fmtTime(sch.lastTick.at) + '：' + sch.lastTick.summary : '';
   // 产品相关提示只在对应标签页出现
   const hasIntl = state.view === 'qoder' && state.region !== 'cn' && state.accounts.some((a) => a.provider === 'qoder');
@@ -866,17 +920,21 @@ function renderStatus() {
   if (state.view === 'zcode') {
     n.style.display = '';
     const pf = state.zProxyFirst === true;
-    n.innerHTML = 'ZCode 没有每日签到，积分靠「活动领取」：点卡片上的礼物图标领取当期活动（可能需过一次验证码，通常静默通过）。这里也用于多账号管理、额度查看与一键切换（切换前需先退出 ZCode）。'
-      + ' <button class="btn" id="btn-znet" style="margin-left:6px" title="ZCode 上游接口的访问顺序：直连失败 / 被拦时会自动回退另一条。代理取 HTTPS_PROXY 环境变量">出口：' + (pf ? '代理优先' : '直连优先') + '</button>';
+    const pu = state.zProxyUrl;
+    const ac = state.zAutoClaim === true;
+    n.innerHTML = 'ZCode 没有每日签到，积分靠「活动领取」。打开「自动领取」后，每轮签到结束会轮询可领活动并尝试领取（桌面版静默过验证码，需要人工时弹验证码窗口）；平时保持关闭即可，活动期前再开。也可点卡片上的礼物图标手动领取。'
+      + ' <button class="btn" id="btn-zac" style="margin-left:6px" title="ZCode 活动自动轮询领取（每轮签到后执行一次）">' + (ac ? '自动领取：开' : '自动领取：关') + '</button>'
+      + ' <button class="btn" id="btn-znet" style="margin-left:4px" title="ZCode 上游接口的访问顺序：失败 / 被拦时自动回退另一条">出口：' + (pf ? '代理优先' : '直连优先') + '</button>'
+      + ' <button class="btn" id="btn-zproxy" style="margin-left:4px" title="设置 ZCode 出口用的 http 代理（留空则清除；不设置时使用 HTTPS_PROXY 环境变量）">代理：' + esc(pu || (state.zHasEnvProxy ? '环境变量' : '未设置')) + '</button>';
   } else if (hasIntl && !s.riskIdentity && umidOffer(s)) {
     n.style.display = '';
     const busy = s.umid.installing || umidBusy;
     n.innerHTML = 'Qoder 国际版只向带设备风控身份的请求下发「每天领 100 Credits」。这台 Linux / NAS 上没有 Qoder 客户端，'
-      + '可以安装「设备身份组件」：从 npm 官方包 @qoder-ai/qodercli 提取其内置的 UMID 程序（约 30MB 下载，校验 npm 完整性），装好后国际版即可签到（本机每天限领一个账号）。'
+      + '可以安装「设备身份组件」：从 npm 官方包 @qoder-ai/qodercli 提取其内置的 UMID 程序（约 30MB 下载，校验 npm 完整性），装好后国际版即可领取（本机每天限领一个账号）。'
       + ' <button class="btn primary" id="btn-umid" style="margin-left:6px"' + (busy ? ' disabled' : '') + '>' + (busy ? '安装中…' : '安装设备身份组件') + '</button>';
   } else if (hasIntl && !s.riskIdentity) {
     n.style.display = '';
-    n.textContent = 'Qoder 国际版签到需要本机安装 Qoder 客户端：Qoder 只向带设备风控身份（由客户端生成）的请求下发「每天领 100 Credits」。当前未检测到客户端，国际版账号将无法领取。';
+    n.textContent = 'Qoder 国际版领取需要本机安装 Qoder 客户端：Qoder 只向带设备风控身份（由客户端生成）的请求下发「每天领 100 Credits」。当前未检测到客户端，国际版账号将无法领取。';
   } else if (hasIntl) {
     n.style.display = '';
     n.textContent = '提示：Qoder 国际版每台设备每天只能有一个账号领取每日 100 Credits（服务端按设备限领），其余国际版账号会显示「本机已领」。'
@@ -893,23 +951,51 @@ async function installUmid() {
   umidBusy = true; renderStatus();
   try {
     const r = await api('/api/qoder/umid/install', { method: 'POST' });
-    toast('设备身份组件已安装（qodercli ' + r.installed.version + '），Qoder 国际版可以签到了');
+    toast('设备身份组件已安装（qodercli ' + r.installed.version + '），Qoder 国际版可以领取了');
   } catch (e) { toast(e.message, false); }
   umidBusy = false;
   await loadStatus(); render(); loadLogs();
 }
 $('notice').addEventListener('click', (e) => { if (e.target.closest('#btn-umid')) installUmid(); });
 $('notice').addEventListener('click', async (e) => {
-  if (!e.target.closest('#btn-znet')) return;
-  try {
-    const r = await api('/api/zcode/net', { method: 'PUT', json: { proxyFirst: state.zProxyFirst !== true } });
-    state.zProxyFirst = r.proxyFirst;
-    renderStatus();
-    toast('ZCode 出口：' + (r.proxyFirst ? '代理优先（直连兜底）' : '直连优先（代理兜底）'));
-  } catch (err) { toast(err.message, false); }
+  if (e.target.closest('#btn-zac')) {
+    try {
+      const r = await api('/api/zcode/net', { method: 'PUT', json: { autoClaim: state.zAutoClaim !== true } });
+      state.zAutoClaim = r.autoClaim;
+      renderStatus();
+      toast('ZCode 自动轮询领取：' + (r.autoClaim ? '已开启（每轮签到后执行）' : '已关闭'));
+    } catch (err) { toast(err.message, false); }
+    return;
+  }
+  if (e.target.closest('#btn-znet')) {
+    try {
+      const r = await api('/api/zcode/net', { method: 'PUT', json: { proxyFirst: state.zProxyFirst !== true } });
+      state.zProxyFirst = r.proxyFirst;
+      renderStatus();
+      toast('ZCode 出口：' + (r.proxyFirst ? '代理优先（直连兜底）' : '直连优先（代理兜底）'));
+    } catch (err) { toast(err.message, false); }
+    return;
+  }
+  if (e.target.closest('#btn-zproxy')) {
+    const cur = state.zProxyUrl || '';
+    const v = await uiPrompt('ZCode 出口代理（http://host:port，支持口令 http://user:pass@host:port）\n留空 = 清除，退回 HTTPS_PROXY 环境变量', cur, { okText: '保存' });
+    if (v === null) return;
+    try {
+      await api('/api/zcode/net', { method: 'PUT', json: { proxyUrl: v.trim() } });
+      await loadZNet(); renderStatus();
+      toast(v.trim() ? '代理已保存' : '代理已清除');
+    } catch (err) { toast(err.message, false); }
+  }
 });
 async function loadZNet() {
-  try { state.zProxyFirst = (await api('/api/zcode/net')).proxyFirst === true; if (state.view === 'zcode') renderStatus(); } catch (e) {}
+  try {
+    const d = await api('/api/zcode/net');
+    state.zProxyFirst = d.proxyFirst === true;
+    state.zProxyUrl = d.proxyUrlMasked || null;
+    state.zAutoClaim = d.autoClaim === true;
+    state.zHasEnvProxy = d.hasEnvProxy === true;
+    if (state.view === 'zcode') renderStatus();
+  } catch (e) {}
 }
 
 // ── 10Router ──
@@ -948,38 +1034,61 @@ function quotaValue(q) {
 }
 const resetLabel = (q) => (q.resetAt ? fmtTime(q.resetAt).slice(5) + (q.recurring === false ? ' 到期' : ' 重置') : '');
 
+// 相对重置标签（CLIProxyAPI 管理中心风格）：「3 天 后重置」「45 分钟 后到期」；一小时内标红，悬停看绝对时间
+function relReset(q) {
+  if (!q.resetAt) return null;
+  const ms = new Date(q.resetAt).getTime() - Date.now();
+  if (!Number.isFinite(ms)) return null;
+  if (ms <= 0) return { text: '即将' + (q.recurring === false ? '到期' : '重置'), soon: true };
+  const m = Math.ceil(ms / 60000);
+  const d = Math.floor(m / 1440), h = Math.floor((m % 1440) / 60), mm = m % 60;
+  const dur = d > 0 ? d + ' 天' + (h ? h + ' 小时' : '') : h > 0 ? h + ' 小时' + (mm ? mm + ' 分' : '') : Math.max(1, mm) + ' 分钟';
+  return { text: dur + ' 后' + (q.recurring === false ? '到期' : '重置'), soon: ms < 3600e3 };
+}
+function relResetHtml(q) {
+  const r = relReset(q);
+  return r ? '<span class="tr-reset' + (r.soon ? ' soon' : '') + '" title="' + esc(fmtTime(q.resetAt)) + '">' + esc(r.text) + '</span>' : '';
+}
+// 三档着色水位条（≥70 绿 / ≥30 琥珀 / <30 红）
+const meterCls = (pct) => (pct >= 70 ? 'hi' : pct >= 30 ? 'mid' : 'low');
+function trMeter(pct) {
+  if (pct === null) return '';
+  const w = Math.min(100, Math.max(0, pct)).toFixed(1);
+  return '<div class="tr-meter"><span class="' + meterCls(pct) + '" style="width:' + w + '%"></span></div>';
+}
+// 明细整行：名称 + 数值/相对重置 + 水位条（CLIProxyAPI quotaRow 版式）
+function trRow(q) {
+  return trLine(q.name, lineVal(q)) + trMeter(quotaPct(q));
+}
+
 // 紧凑行（周期额度 / 聚合积分包）：名称在左、数值在右，不带进度条
 function trLine(name, valHtml, title) {
   return '<div class="tr-line"><span class="tr-q-name"' + (title ? ' title="' + esc(title) + '"' : '') + '>' + esc(name) + '</span><span class="tr-q-val">' + valHtml + '</span></div>';
 }
 function lineVal(q) {
   const pct = quotaPct(q);
-  const low = pct !== null && pct < LOW_PCT && q.percentScale;
   const txt = (q.percentScale || !(q.total > 0))
     ? '剩 ' + (pct !== null ? fmtNum(pct) + '%' : fmtNum(quotaRemaining(q)))
     : '剩 ' + fmtNum(quotaRemaining(q)) + ' / ' + fmtNum(q.total || 0) + (q.unit ? ' ' + q.unit : '');
-  return '<span' + (low ? ' class="low-text"' : '') + '>' + esc(txt) + '</span>' + (q.resetAt ? '<span class="tr-q-when"> · ' + esc(resetLabel(q)) + '</span>' : '');
+  return '<span>' + esc(txt) + '</span> ' + relResetHtml(q);
 }
 
-// 主额度行：与账号主卡同款 credit-line + bar
+// 主额度行：名称 + 大值 + 相对重置 + 三档水位条
 function trPrimaryHtml(q) {
   const v = quotaValue(q);
-  const low = v.pct !== null && v.pct < LOW_PCT;
-  const pct01 = v.pct !== null ? Math.max(0, Math.min(1, v.pct / 100)) : null;
-  return '<div class="tr-primary"><div class="credit-line"><span class="credit"><span class="lbl">' + esc(q.name) + '</span><b' + (low ? ' style="color:var(--err)"' : '') + '>' + esc(v.big) + '</b> <small class="dim">' + esc(v.small) + '</small></span>'
-    + '<span class="credit dim">' + (q.resetAt ? esc(resetLabel(q)) : '') + '</span></div>'
-    + (pct01 !== null ? '<div class="bar"><span class="seg" style="flex:' + pct01.toFixed(4) + ' 1 0"></span><span class="seg used" style="flex:' + (1 - pct01).toFixed(4) + ' 1 0"></span></div>' : '')
+  return '<div class="tr-primary"><div class="credit-line"><span class="credit"><span class="lbl">' + esc(q.name) + '</span><b>' + esc(v.big) + '</b> <small class="dim">' + esc(v.small) + '</small></span>'
+    + '<span class="credit dim">' + relResetHtml(q) + '</span></div>'
+    + (v.pct !== null ? trMeter(v.pct) : '')
     + '</div>';
 }
 
 function trQuotaHtml(q, { dimWhenEmpty = false } = {}) {
   const v = quotaValue(q);
   const used = v.pct !== null && v.pct <= 0;
-  const low = !used && v.pct !== null && v.pct < LOW_PCT && q.percentScale;
   const val = used && dimWhenEmpty ? '已用完' : (q.percentScale || !(q.total > 0) ? '剩余 ' + v.big : '剩余 ' + v.big + ' ' + v.small);
   return '<div class="tr-q' + (used && dimWhenEmpty ? ' spent' : '') + '"><div class="tr-q-line"><span class="tr-q-name" title="' + esc(q.name) + '">' + esc(q.name) + '</span>'
-    + '<span class="tr-q-val' + (low ? ' low' : '') + '">' + esc(val) + (q.resetAt ? '<span class="tr-q-when"> · ' + esc(resetLabel(q)) + '</span>' : '') + '</span></div>'
-    + (v.pct !== null && !(used && dimWhenEmpty) ? '<div class="tr-meter"><span class="' + (low ? 'low' : '') + '" style="width:' + v.pct.toFixed(1) + '%"></span></div>' : '')
+    + '<span class="tr-q-val">' + esc(val) + relResetHtml(q) + '</span></div>'
+    + (!(used && dimWhenEmpty) ? trMeter(v.pct) : '')
     + '</div>';
 }
 
@@ -1034,19 +1143,15 @@ function trCardHtml(c) {
     if (!(primary || windows.length || packs.length)) {
       body = '<div class="msg">' + esc(/no separate quota|billed at standard/i.test(c.message || '') ? '按量计费，无额度可显示' : (c.message || '该供应商未返回额度数据')) + '</div>';
     } else {
-      const resets = [primary, ...windows, ...packs].filter(Boolean).map((q) => q.resetAt).filter(Boolean).sort();
-      const quotaCount = (primary ? 1 : 0) + windows.length + packs.length;
-      body = '<div class="meta">'
-        + '<div class="mi"><span class="lbl">额度</span><span class="val">' + quotaCount + ' 项</span></div>'
-        + '<div class="mi right"><span class="lbl">最早到期</span><span class="val' + (resets[0] && new Date(resets[0]) - Date.now() < 7 * 86400e3 ? ' warn' : '') + '">' + (resets[0] ? fmtTime(resets[0]).slice(5, 10) : '—') + '</span></div>'
-        + '</div>'
-        + (primary ? trPrimaryHtml(primary) : '')
-        + windows.map((q) => trLine(q.name, lineVal(q))).join('')
+      // 与汇总卡同款默认视图：主额度 + 每个周 / 月窗口额度一条（带进度条）；积分包走聚合行，「逐包明细」展开单包
+      body = (primary ? trPrimaryHtml(primary) : '')
+        + windows.map((q) => trRow(q)).join('')
         + trPacksHtml(c, packs);
     }
   }
   return '<div class="tr-card' + (c.isActive ? '' : ' off') + '"><div class="row1"><div class="name-group">'
     + '<span class="badge prod tenrouter">' + esc(c.providerName) + '</span>'
+    + (TR_REGION[c.provider] ? '<span class="badge ' + TR_REGION[c.provider][1] + '">' + TR_REGION[c.provider][0] + '</span>' : '')
     + '<span class="tr-name" title="' + esc([c.name, c.email].filter(Boolean).join(' · ')) + '">' + esc(who) + '</span>'
     + (showPlan ? '<span class="badge">' + esc(c.plan) + '</span>' : '')
     + (c.isActive ? '' : '<span class="pill pending">已停用</span>')
@@ -1059,6 +1164,119 @@ function trCardHtml(c) {
 const trSorted = (list) => list.slice().sort((a, b) => (b.isActive - a.isActive)
   || String(a.providerName).localeCompare(String(b.providerName)) || String(a.name || a.email || '').localeCompare(String(b.name || b.email || '')));
 
+// 按供应商聚类：同一供应商的账号排在一行网格里，组内保持 trSorted 顺序
+function trGroups(list) {
+  const map = new Map();
+  for (const c of trSorted(list)) {
+    const k = c.providerName || c.provider || '其他';
+    if (!map.has(k)) map.set(k, []);
+    map.get(k).push(c);
+  }
+  return [...map.entries()].map(([name, items]) => ({ name, items }));
+}
+
+// 10Router 连接的国内 / 国际版标签（沿用账号卡的徽标语义）
+const TR_REGION = {
+  qoder: ['国际版', 'intl'], 'qoder-cn': ['国内版', 'cn'],
+  'codebuddy-intl': ['国际版', 'intl'], 'codebuddy-cn': ['国内版', 'cn'],
+  'glm-cn': ['国内版', 'cn'],
+};
+
+// 「全部」视图：一个供应商一张汇总卡。同名额度跨连接求和；百分比窗口（如限时窗口）取平均。
+// 命名含 Cycle/Capacity 的包本身是「全包汇总」，连接级聚合时跳过以避免重复计数（Total Points 这类）。
+const isAggregatePack = (name) => /cycle|capacity/i.test(String(name || ''));
+function trVendorCardHtml(g) {
+  const items = g.items;
+  const prov = items[0].provider;
+  const lows = items.filter((x) => x.isActive && !x.error && quotaLow(x)).length;
+  const errs = items.filter((x) => x.error).length;
+
+  const splitOf = items.map((x) => ({ x, s: splitQuotas(x) }));
+  // Total Points / 含 Cycle|Capacity 的包是全包汇总：连接级聚合跳过它们，避免与子包重复计数
+  const isAgg = (q) => isAggregatePack(q && q.name);
+  const primaries = splitOf.filter(({ s }) => s.primary && !isAgg(s.primary)).map(({ s }) => s.primary);
+  let primary = null;
+  if (primaries.length) {
+    const name = primaries[0].name;
+    const same = primaries.filter((p) => p.name === name);
+    const total = same.reduce((n, p) => n + (p.total > 0 ? p.total : 0), 0);
+    const isPct = !(total > 0);
+    if (isPct) {
+      // 限时百分比窗口（如 Claude 5h）：跨连接取平均百分比，而不是加总
+      const pcts = same.map((p) => quotaPct(p)).filter((x) => x !== null);
+      primary = {
+        name,
+        total: 0,
+        remaining: 0,
+        used: 0,
+        unit: '',
+        percentScale: true,
+        remainingPercentage: pcts.length ? pcts.reduce((a, b) => a + b, 0) / pcts.length : null,
+        recurring: same[0].recurring,
+        resetAt: same.map((p) => p.resetAt).filter(Boolean).sort()[0] || null,
+      };
+    } else {
+      primary = {
+        name,
+        total,
+        remaining: same.reduce((n, p) => n + quotaRemaining(p), 0),
+        used: same.reduce((n, p) => n + (p.used || 0), 0),
+        unit: same[0].unit || '',
+        percentScale: false,
+        recurring: same[0].recurring,
+        resetAt: same.map((p) => p.resetAt).filter(Boolean).sort()[0] || null,
+      };
+    }
+  }
+
+  // 周期窗口：同名求和；无固定总额的按百分比平均
+  const winMap = new Map();
+  const packs = [];
+  for (const { s } of splitOf) {
+    for (const q of s.windows.filter((x) => !isAgg(x))) {
+      if (!winMap.has(q.name)) winMap.set(q.name, { name: q.name, total: 0, rem: 0, anyTotal: false, resetAt: null, pcts: [] });
+      const w = winMap.get(q.name);
+      if (q.total > 0) { w.anyTotal = true; w.total += q.total; w.rem += quotaRemaining(q); }
+      else { const pct = quotaPct(q); if (pct !== null) w.pcts.push(pct); }
+      if (q.resetAt && (!w.resetAt || String(q.resetAt) < String(w.resetAt))) w.resetAt = q.resetAt;
+    }
+    packs.push(...s.packs.filter((x) => !isAgg(x)));
+  }
+  const wins = [...winMap.values()];
+  const alivePacks = packs.filter((q) => quotaRemaining(q) > 0);
+  const packRem = alivePacks.reduce((n, q) => n + quotaRemaining(q), 0);
+
+  // 周 / 月度等窗口额度也给进度条（同名跨连接已聚合好）：有固定总额的加总，百分比窗口取平均
+  const winRows = wins.map((w) => trRow(w.anyTotal
+    ? { name: w.name, total: w.total, remaining: w.rem, used: w.total - w.rem, unit: '', percentScale: false, resetAt: w.resetAt, recurring: true }
+    : { name: w.name, total: 0, remainingPercentage: w.pcts.length ? w.pcts.reduce((a, b) => a + b, 0) / w.pcts.length : null, percentScale: true, resetAt: w.resetAt, recurring: true })).join('');
+
+  const briefs = [];
+  if (alivePacks.length) briefs.push('积分包×' + alivePacks.length + ' 剩 ' + fmtNum(packRem));
+  else if (packs.length) briefs.push('积分包已用完');
+  const hasQuotas = Boolean(primary || wins.length || packs.length);
+  let quotaHtml;
+  if (errs === items.length) {
+    quotaHtml = '<div class="msg err">全部连接查询失败</div>';
+  } else if (!hasQuotas) {
+    quotaHtml = '<div class="msg">该供应商没有可汇总的额度</div>';
+  } else {
+    // 「全部」视角不显示「最早到期」：每行自带相对重置时间，足够判断
+    quotaHtml = (primary ? trPrimaryHtml(primary) : '')
+      + winRows
+      + (briefs.length
+        ? '<div class="tr-summary dim"><span class="tr-sum-txt">' + briefs.join(' · ') + '</span></div>'
+        : '');
+  }
+  return '<div class="tr-card"><div class="row1"><div class="name-group">'
+    + '<span class="badge prod tenrouter">' + esc(g.name) + '</span>'
+    + (TR_REGION[prov] ? '<span class="badge ' + TR_REGION[prov][1] + '">' + TR_REGION[prov][0] + '</span>' : '')
+    + '<span class="badge">' + items.length + ' 个账号</span>'
+    + (lows ? '<span class="pill limited">告急 ×' + lows + '</span>' : '')
+    + (errs ? '<span class="pill fail" title="部分连接查询失败">失败 ×' + errs + '</span>' : '')
+    + '</div></div>' + quotaHtml + '</div>';
+}
+
 function trSetupHtml() {
   return '<div class="setup"><h3>接入 10Router</h3>'
     + '<div class="hint">填 10Router 的地址和一个<b>虚拟 key</b>（10Router 仪表盘 → API Keys 创建的 sk-…），就能在这里：</div>'
@@ -1081,10 +1299,41 @@ function renderTenrouter() {
     return '<span class="chip' + (on ? ' on' : '') + '" title="' + (x.found ? (x.supported ? '已检测到' : '需要 Node 22.5+') : '本机未检测到') + '">' + esc(x.label) + (x.found ? '' : ' ·无') + '</span>';
   }).join('');
   let grid;
+  let tabStrip = '';
+  const groups = list.length ? trGroups(list) : [];
+  const vendor = state.trVendor || '';
+  // 「隐藏 0 / 无额度」与列表共用同一过滤：被隐藏的供应商不出现在标签条
+  const shown = state.trHideEmpty
+    ? groups.filter((g) => {
+        if (g.items.every((x) => x.error)) return true;
+        for (const x of g.items) {
+          if (x.error) continue;
+          const s = splitQuotas(x);
+          if (s.primary && quotaRemaining(s.primary) > 0) return true;
+          if (s.windows.some((q) => quotaRemaining(q) > 0 || (quotaPct(q) || 0) > 0)) return true;
+          if (s.packs.some((q) => quotaRemaining(q) > 0)) return true;
+        }
+        return false;
+      })
+    : groups;
+  const activeVendor = vendor && shown.some((g) => g.name === vendor) ? vendor : '';
+  if (groups.length) {
+    tabStrip = '<div class="tr-tabs">'
+      + '<button class="btn' + (!activeVendor ? ' primary' : '') + '" data-tr="vendor" data-v="">全部</button>'
+      + shown.map((g) => '<button class="btn' + (activeVendor === g.name ? ' primary' : '') + '" data-tr="vendor" data-v="' + esc(g.name) + '">' + esc(g.name) + ' ' + g.items.length + '</button>').join('')
+      + '</div>';
+  }
   if (tr.error) grid = '<div class="empty">' + esc(tr.error) + '</div>';
   else if (!tr.quotas) grid = '<div class="empty">正在读取 10Router 供应商额度…</div>';
   else if (!list.length) grid = '<div class="empty">10Router 里还没有可查额度的供应商连接（OAuth 或支持额度查询的 API Key）。</div>';
-  else grid = trSorted(list).map(trCardHtml).join('');
+  else if (activeVendor) {
+    const g = groups.find((x) => x.name === activeVendor) || { items: [] };
+    grid = '<div class="tr-vcards">' + g.items.map(trCardHtml).join('') + '</div>';
+  } else {
+    grid = shown.length
+      ? '<div class="tr-vcards">' + shown.map(trVendorCardHtml).join('') + '</div>'
+      : '<div class="empty">没有可显示的供应商（可在「设置」里关掉隐藏）</div>';
+  }
   const h = tr.health;
   const healthStrong = !h ? '…' : h.ok ? '正常' : '异常';
   const healthDetail = !h ? '' : h.ok
@@ -1105,6 +1354,7 @@ function renderTenrouter() {
     + '<span style="margin-left:auto" title="' + esc(ls ? ls.summary : '') + '">' + (ls ? '上次同步 ' + esc(fmtTime(ls.at).slice(5)) + ' · ' + esc(ls.summary.slice(0, 40)) : '还没有同步过') + '</span>'
     + (tr.quotas ? '<span>额度更新于 ' + esc(fmtTime(tr.quotas.generatedAt).slice(11)) + '</span>' : '')
     + '</div>'
+    + tabStrip
     + '<div class="tr-grid">' + grid + '</div>';
 }
 
@@ -1152,6 +1402,7 @@ function openTrSettings() {
   $('tr-key').value = '';
   $('tr-key').placeholder = c.keyMasked ? '已保存 ' + c.keyMasked + '（留空保持不变）' : 'sk-…';
   $('tr-auto').checked = c.configured ? c.sync.enabled : true;
+  $('tr-hide-empty').checked = state.trHideEmpty === true;
   $('tr-sources').innerHTML = (c.sources || []).map((x) => '<label class="check"><input type="checkbox" data-src="' + x.id + '"'
     + ((c.configured ? c.sync.sources.includes(x.id) : true) ? ' checked' : '') + (x.supported ? '' : ' disabled') + '> ' + esc(x.label)
     + '<span class="dim">' + (x.found ? '' : '（本机未检测到）') + (x.supported ? '' : '（需要 Node 22.5+）') + '</span></label>').join('');
@@ -1183,6 +1434,9 @@ async function trSave() {
   const f = trForm();
   if (!f.endpoint) return toast('请填写 10Router 地址', false);
   if (!f.key && !(tr.config && tr.config.keyMasked)) return toast('请填写虚拟 key', false);
+  // 显示偏好只存在面板本地（localStorage），不上服务端
+  state.trHideEmpty = $('tr-hide-empty').checked;
+  try { localStorage.setItem('qd_tr_hideempty', state.trHideEmpty ? '1' : '0'); } catch (e) {}
   try {
     tr.config = await api('/api/tenrouter', { method: 'PUT', json: f });
     closeModal('m-10r');
@@ -1203,6 +1457,12 @@ $('tr-panel').addEventListener('click', (e) => {
   if (b.dataset.tr === 'settings') openTrSettings();
   else if (b.dataset.tr === 'refresh') loadTrQuotas(true);
   else if (b.dataset.tr === 'sync') trSync();
+  else if (b.dataset.tr === 'vendor') {
+    const v = b.dataset.v || '';
+    state.trVendor = v;
+    history.replaceState(null, '', v ? '#tenrouter/' + encodeURIComponent(v) : '#tenrouter');
+    render();
+  }
 });
 $('tr-test').onclick = trTest;
 $('tr-save').onclick = trSave;
@@ -1257,7 +1517,7 @@ async function checkinOne(id) {
 }
 async function checkinAll(btn, product) {
   const label = btn.innerHTML;
-  btn.disabled = true; btn.innerHTML = I.refresh + '签到中…';
+  btn.disabled = true; btn.innerHTML = I.refresh + '领取中…';
   try {
     const d = await api('/api/checkin', { json: { skipIfCheckedToday: false, product } });
     toast(d.summary);
@@ -1700,7 +1960,7 @@ async function submitImport(password) {
 }
 
 // ── 绑定 ──
-$('btn-checkin-all').innerHTML = I.play + '全部签到';
+$('btn-checkin-all').innerHTML = I.play + '全部领取';
 for (const id of ['btn-add', 'btn-add-dash']) $(id).innerHTML = I.plus + '添加账号';
 for (const id of ['btn-import', 'btn-import-dash']) { $(id).innerHTML = I.upload + '导入'; $(id).onclick = pickImport; }
 for (const id of ['btn-export', 'btn-export-dash']) $(id).innerHTML = I.download + '导出';
@@ -1722,9 +1982,12 @@ $('f-token').addEventListener('keydown', (e) => { if (e.key === 'Enter') addToke
 $('list').addEventListener('click', onCardClick);
 // 标签页：用 URL hash 记住（刷新 / 前进后退保持）
 function applyView() {
-  const v = location.hash.slice(1);
+  const raw = location.hash.slice(1);
+  const [v, sub] = raw.split('/');
   state.view = VIEWS.includes(v) ? v : 'dash';
   state.region = '';
+  // 10Router 供应商标签可用 hash 直达：#tenrouter/<供应商名>
+  state.trVendor = state.view === 'tenrouter' && sub ? decodeURIComponent(sub) : '';
   document.querySelectorAll('#nav button').forEach((x) => x.classList.toggle('active', x.dataset.view === state.view));
   $('view-dash').classList.toggle('active', state.view === 'dash');
   $('view-prod').classList.toggle('active', state.view !== 'dash' && state.view !== 'tenrouter');

package/src/providers.js

@@ -10,7 +10,7 @@
 
 import { productOf } from './constants.js';
 import { checkinOne as checkinQoder, fetchQuotaUsage, fetchUserinfo } from './qoderClient.js';
-import { checkinWorkbuddy, fetchWorkbuddyQuota, inspectToken } from './workbuddyClient.js';
+import { checkinWorkbuddy, checkinWorkbuddyIntl, fetchWorkbuddyQuota, inspectToken } from './workbuddyClient.js';
 import { fetchZcodeQuota } from './zcodeClient.js';
 
 /** 从 userinfo 响应中挑一个可读的显示名 */
@@ -51,7 +51,8 @@ const PRODUCTS = {
   },
   workbuddy: {
     label: 'WorkBuddy',
-    checkin: (account, ctx) => checkinWorkbuddy(account, ctx),
+    // 国内版走 billing daily-checkin 签到；国际版没有签到接口，走「活跃领取」（免费档对话探测）
+    checkin: (account, ctx) => (account.provider === 'workbuddy-intl' ? checkinWorkbuddyIntl(account, ctx) : checkinWorkbuddy(account, ctx)),
     quota: (account, ctx) => fetchWorkbuddyQuota(account, ctx),
     verify: async (account) => {
       const info = inspectToken(account.token);

package/src/store.js

@@ -44,14 +44,39 @@ async function ensureDir() {
   await fs.mkdir(dataDir(), { recursive: true, mode: 0o700 });
 }
 
-/** 原子写：临时文件 + rename，失败不留半截文件 */
-export async function atomicWrite(file, content) {
+// Windows 上 rename 覆盖已有文件时，外部程序（杀软扫描、同步盘、另一守护进程）瞬时占用
+// 会直接抛 EPERM/EBUSY/EACCES：先按递增间隔重试，仍失败则兜底直写目标（牺牲原子性换可用性）。
+const RENAME_TRANSIENT = new Set(['EPERM', 'EBUSY', 'EACCES']);
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+
+let renameImpl = null;
+export function _setRenameForTests(fn) { renameImpl = fn || null; }
+
+/** 原子写：临时文件 + rename（带故障重试与直写兜底） */
+export async function atomicWrite(file, content, { retries = 6 } = {}) {
   const tmp = path.join(
     path.dirname(file),
     `.tmp-${path.basename(file)}-${crypto.randomBytes(4).toString('hex')}`
   );
   await fs.writeFile(tmp, content, { mode: 0o600 });
-  await fs.rename(tmp, file);
+  const doRename = renameImpl || ((a, b) => fs.rename(a, b));
+  let transientRetries = 0;
+  try {
+    for (let i = 0; i <= retries; i++) {
+      try { await doRename(tmp, file); return; } catch (e) {
+        if (!RENAME_TRANSIENT.has(e?.code)) throw e;   // 非占用类错误立即走兜底（如 EXDEV）
+        transientRetries++;
+        if (i < retries) await sleep(120 * (i + 1));
+      }
+    }
+  } catch { /* 落入兜底 */ }
+  // 兜底：读回临时文件直接覆盖写目标，并清理临时文件（避免 .tmp-* 残留）
+  try {
+    const data = await fs.readFile(tmp, 'utf8');
+    await fs.writeFile(file, data, { mode: 0o600 });
+  } finally {
+    await fs.unlink(tmp).catch(() => {});
+  }
 }
 
 async function readJson(file, fallback) {

package/src/workbuddyClient.js

@@ -91,6 +91,51 @@ async function post(account, path, token) {
   return { status: res.status, body, text };
 }
 
+// 国际版「活跃领取」探测：官方规则为「当天有 ≥1 次有效对话请求即视为活跃用户，发放每日赠送积分」。
+// 没有签到接口，所以每天发一条免费档模型（rateMultiplier 0，~0 消耗）的极短流式请求。
+// 对齐 10router src/sse/services/codebuddyCheckin.js 的 intl 探测（stream 网关的系统提示与 typed blocks 是必需的，否则 11101）。
+const INTL_PROBE_MODEL = 'hy4-preview';
+async function postIntlProbe(account, token) {
+  const res = await fetch(`https://${apiHost(account)}/v2/chat/completions`, {
+    method: 'POST',
+    headers: { ...headersFor(account, token), 'Content-Type': 'application/json', Accept: 'text/event-stream' },
+    body: JSON.stringify({
+      model: INTL_PROBE_MODEL,
+      stream: true,
+      max_tokens: 16,
+      messages: [
+        { role: 'system', content: 'You are CodeBuddy Code.' },
+        { role: 'user', content: [{ type: 'text', text: 'hi' }] },
+      ],
+    }),
+    signal: AbortSignal.timeout(Math.max(FETCH_TIMEOUT_MS, 25_000)),
+  });
+  // 2xx = 会话建立成功，把 SSE 流排干（最多几个 token）
+  const text = await res.text().catch(() => '');
+  return { status: res.status, text };
+}
+
+/**
+ * 国际版「活跃领取」：一次免费档对话请求使账号成为当日活跃用户。
+ * 返回与每日签到一致的结果对象（session-ok → checked-in，claimedAmount 0 表示额度随官方结算发放）。
+ */
+export async function checkinWorkbuddyIntl(account, { onRefresh } = {}) {
+  const label = account.name || account.id;
+  const base = { accountId: account.id, account: label, provider: account.provider };
+  try {
+    const r = await withToken(account, (t) => postIntlProbe(account, t), onRefresh);
+    if (r.status === 401) return { ...base, status: 'failed', error: '鉴权失败（401），token 已失效，请在客户端重新登录后重新导入' };
+    if (r.status === 429) return { ...base, status: 'no-activity', message: '今日额度已耗尽，活跃请求暂不可达（等官方发放后再试）', claimedAmount: 0 };
+    if (r.status >= 200 && r.status < 300) {
+      return { ...base, uid: account.uid, status: 'checked-in', claimedAmount: 0, message: '已发送活跃请求（保持活跃，活跃不等于必有奖励）' };
+    }
+    const m = (() => { try { return JSON.parse(r.text)?.error?.data?.msg || ''; } catch { return ''; } })();
+    return { ...base, status: 'failed', error: `活跃请求失败：HTTP ${r.status} ${m || r.text.slice(0, 120)}`.trim() };
+  } catch (e) {
+    return { ...base, status: 'failed', error: e?.message || '网络错误' };
+  }
+}
+
 export function isExpired(account, now = Date.now()) {
   const exp = account.expiresAt || inspectToken(account.token).expiresAt;
   return Boolean(exp) && new Date(exp).getTime() - EXPIRY_SKEW_MS <= now;

package/src/zcodeAutoClaim.js

@@ -0,0 +1,96 @@
+/**
+ * ZCode 活动自动领取 — 签到调度器每轮调用。
+ *
+ * 策略（对齐用户手动路径，逐级尝试）：
+ *   1. billing/preview 查可领活动；为空 → 无事可做（返回 null，不留痕迹）
+ *   2. 先直接 claim（不带验证码：服务端未风控时可直接成功）
+ *   3. 返回 3007/3001（需要验证码 / 参数被拒）且有验证码提供者 → 拉 captcha 配置，
+ *      让提供者（桌面版的隐藏窗口跑阿里云验证码 SDK 静默验证）拿 captchaVerifyParam 后重试
+ *   4. 没有提供者（NAS / 纯 CLI）或验证码需要人工 → 标记「需手动领取」，卡片上提示
+ *   - 1003（已领取过）按成功口径处理并记忆
+ * 结果写入账号 lastResult（签到日历记忆用的是 status checked-in/already，第二天照常重查 preview）
+ */
+
+import { logger } from './logger.js';
+import { fetchClaimPlans, claimPlan, fetchCaptchaConfig } from './zcodeClient.js';
+
+// 桌面版（Electron 主进程）注册的隐藏窗口验证码实现；NAS / CLI 为 null（走「需手动领取」分支）
+let captchaProvider = null;
+export function setZcodeCaptchaProvider(fn) { captchaProvider = typeof fn === 'function' ? fn : null; }
+export function hasZcodeCaptchaProvider() { return Boolean(captchaProvider); }
+
+const grantsText = (plan) => (plan.grants && plan.grants.length ? plan.grants.join('；') : '');
+
+/**
+ * 为单个 ZCode 账号执行一次自动领取。
+ * @returns {null | { status, message, claims: Array }} null = preview 为空或查询失败（已记日志，不上卡片）
+ */
+export async function zcodeAutoClaim(account) {
+  const label = account.name || account.uid || account.id;
+  let plans;
+  try {
+    plans = (await fetchClaimPlans(account)).plans;
+  } catch (e) {
+    logger.debug('ZCODE-CLAIM', `${label} 活动查询失败：${e.message}`);
+    return null;
+  }
+  if (!plans.length) return null;
+
+  const claims = [];
+  let anySuccess = false;
+  let needManual = false;
+
+  for (const plan of plans) {
+    const planName = plan.name || plan.planId;
+    // 第 2 步：先试不带验证码
+    try {
+      const r = await claimPlan(account, plan.planId, {});
+      claims.push({ plan: planName, via: 'direct', ok: true });
+      anySuccess = true;
+      logger.info('ZCODE-CLAIM', `${label} 已领取「${planName}」（免验证码）${grantsText(plan) ? '：' + grantsText(plan) : ''}`);
+      continue;
+    } catch (e) {
+      if (e.code === 1003) {
+        claims.push({ plan: planName, ok: true, already: true });
+        logger.info('ZCODE-CLAIM', `${label}「${planName}」已领取过`);
+        continue;
+      }
+      if (e.code !== 3007 && e.code !== 3001) {
+        claims.push({ plan: planName, ok: false, message: e.message });
+        logger.warn('ZCODE-CLAIM', `${label} 领取「${planName}」失败：${e.message}`);
+        continue;
+      }
+    }
+    // 第 3 步：需要验证码
+    if (!captchaProvider) {
+      needManual = true;
+      claims.push({ plan: planName, ok: false, needManual: true });
+      logger.info('ZCODE-CLAIM', `${label}「${planName}」需要验证码，本环境无法自动通过，请在面板手动领取`);
+      continue;
+    }
+    try {
+      const cfg = await fetchCaptchaConfig();
+      if (!cfg.enabled || !cfg.sceneId) throw new Error('验证码配置不可用');
+      const { captchaParam, region } = await captchaProvider(cfg);
+      await claimPlan(account, plan.planId, { captchaParam, region });
+      claims.push({ plan: planName, via: 'captcha', ok: true });
+      anySuccess = true;
+      logger.info('ZCODE-CLAIM', `${label} 已领取「${planName}」（静默验证码）${grantsText(plan) ? '：' + grantsText(plan) : ''}`);
+    } catch (e2) {
+      needManual = true;
+      claims.push({ plan: planName, ok: false, needManual: true, message: e2.message });
+      logger.warn('ZCODE-CLAIM', `${label}「${planName}」验证码未完成：${e2.message}（可在面板手动领取）`);
+    }
+  }
+
+  const names = claims.filter((c) => c.ok && !c.already).map((c) => c.plan);
+  const status = names.length ? 'checked-in'
+    : claims.every((c) => c.already) ? 'already'
+    : 'failed';
+  const message = status === 'checked-in'
+    ? `已领取：${names.join('、')}${claims.some((c) => c.via === 'captcha') ? '（静默验证码）' : ''}`
+    : status === 'already' ? '活动均已领取过'
+    : needManual ? `有 ${claims.filter((c) => c.needManual).length} 个活动需要验证码，请在面板手动领取`
+    : `领取失败：${claims.filter((c) => !c.ok).map((c) => c.message).filter(Boolean)[0] || '未知错误'}`;
+  return { status, message, claims };
+}

package/src/zcodeClient.js

@@ -59,26 +59,46 @@ export function zcodeAppVersion() {
 export function _resetAppVersionCache(v) { appVersionCache = v || null; }
 
 // ── HTTP 出口：直连优先 / 代理优先（可切换），任一路成功即返回 ──
+// 代理地址：优先用面板里保存的 proxyUrl（zcode-net.json，0600），没有则退回 HTTPS_PROXY 环境变量
 
 function codeHome() {
   return process.env.CREDITDADDY_HOME || process.env.QODERDADDY_HOME || path.join(os.homedir(), '.creditdaddy');
 }
 const NET_PREFS_FILE = () => path.join(codeHome(), 'zcode-net.json');
 
-let proxyFirstCache = null;
-export function proxyFirst() {
-  if (proxyFirstCache !== null) return proxyFirstCache;
-  try { proxyFirstCache = JSON.parse(fs.readFileSync(NET_PREFS_FILE(), 'utf8')).proxyFirst === true; }
-  catch { proxyFirstCache = false; }
-  return proxyFirstCache;
+let netPrefCache = null;
+function netPref() {
+  if (netPrefCache) return netPrefCache;
+  try {
+    const j = JSON.parse(fs.readFileSync(NET_PREFS_FILE(), 'utf8'));
+    netPrefCache = {
+      proxyFirst: j.proxyFirst === true,
+      proxyUrl: typeof j.proxyUrl === 'string' && j.proxyUrl.trim() ? j.proxyUrl.trim() : null,
+      autoClaim: j.autoClaim === true,
+    };
+  } catch { netPrefCache = { proxyFirst: false, proxyUrl: null, autoClaim: false }; }
+  return netPrefCache;
 }
-export function setProxyFirst(v) {
-  proxyFirstCache = v === true;
+function writeNetPref(p) {
+  netPrefCache = p;
   fs.mkdirSync(codeHome(), { recursive: true, mode: 0o700 });
-  fs.writeFileSync(NET_PREFS_FILE(), JSON.stringify({ proxyFirst: proxyFirstCache }, null, 2), { mode: 0o600 });
+  fs.writeFileSync(NET_PREFS_FILE(), JSON.stringify({ proxyFirst: p.proxyFirst, proxyUrl: p.proxyUrl, autoClaim: p.autoClaim }, null, 2), { mode: 0o600 });
+}
+export function proxyFirst() { return netPref().proxyFirst; }
+export function proxyUrl() { return netPref().proxyUrl; }
+/** 活动自动轮询领取开关（默认关：活动期前再开，平时不轮询） */
+export function autoClaimEnabled() { return netPref().autoClaim; }
+export function setAutoClaimEnabled(v) { writeNetPref({ ...netPref(), autoClaim: v === true }); }
+export function setProxyFirst(v) { writeNetPref({ ...netPref(), proxyFirst: v === true }); }
+export function setProxyUrl(u) {
+  const t = typeof u === 'string' ? u.trim() : '';
+  if (t && !/^http:\/\/\S+/i.test(t)) throw new Error('目前只支持 http:// 代理地址');
+  writeNetPref({ ...netPref(), proxyUrl: t || null });
 }
 
 const envProxy = () => process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy || null;
+/** 生效代理：面板保存的优先，其次环境变量 */
+const effectiveProxy = () => proxyUrl() || envProxy();
 
 /** 目标是否应绕过代理（loopback / NO_PROXY 后缀匹配） */
 function proxyBypass(url) {
@@ -118,8 +138,8 @@ function connectTunnel(proxyUrl, target) {
 }
 
 async function fetchViaProxy(url, { method = 'GET', headers = {}, body = null, timeoutMs = 15000 } = {}) {
-  const proxy = envProxy();
-  if (!proxy || !/^http:\/\//i.test(proxy)) throw new Error('没有可用的 http 代理（HTTPS_PROXY 未设置）');
+  const proxy = effectiveProxy();
+  if (!proxy || !/^http:\/\//i.test(proxy)) throw new Error('没有可用的 http 代理（面板配置或 HTTPS_PROXY 环境变量）');
   const u = new URL(url);
   const p = new URL(proxy);
   const isHttps = u.protocol === 'https:';
@@ -163,7 +183,7 @@ export function _setViaProxyForTests(fn) { viaProxyImpl = fn || null; }
 
 export async function fetchJsonRace(url, { method = 'GET', headers = {}, body = null, timeoutMs = 15000 } = {}) {
   const base = { method, headers: { ...headers }, ...(body != null ? { body: typeof body === 'string' ? body : JSON.stringify(body) } : {}), signal: AbortSignal.timeout(timeoutMs) };
-  const useProxy = Boolean(envProxy()) && !proxyBypass(url);
+  const useProxy = Boolean(effectiveProxy()) && !proxyBypass(url);
   const direct = () => fetch(url, base);
   const viaProxy = viaProxyImpl
     ? () => viaProxyImpl(url, { method, headers, body, timeoutMs })