creditdaddy 1.5.2 → 1.6.0

package/src/minimaxClient.js

@@ -286,6 +286,35 @@ export function normalizeMiniMaxQuota(data) {
   };
 }
 
+/**
+ * 只查签到状态，不打 claim（10R 只读推送用，issue #33）。
+ * 刷新失败等凭据问题照常抛错；查询失败返回 null（推送侧降级为不带签到字段）。
+ * @returns {Promise<{checkedToday: boolean, streakDays: number, points: number, bonusPoints: number}|null>}
+ */
+export async function fetchMiniMaxCheckinStatus(account, ctx = {}) {
+  try {
+    return await withMiniMaxAuth(account, async (token) => {
+      const statusRes = await fetchJsonRace(SIGNIN_STATUS_URL, {
+        headers: authHeaders(token),
+        timeoutMs: FETCH_TIMEOUT_MS,
+      });
+      if (!statusRes.ok) return null;
+      const statusData = await statusRes.json().catch(() => null);
+      if (!statusData || statusData.base_resp?.status_code !== 0) return null;
+      const today = (statusData.data?.days || []).find((d) => d.is_today);
+      if (!today) return null;
+      return {
+        checkedToday: today.status === 3,
+        streakDays: today.day_no || 0,
+        points: today.points || 0,
+        bonusPoints: today.bonus_points || 0,
+      };
+    }, ctx);
+  } catch {
+    return null;   // 推送是旁路：凭据失效 / 网络抖动都不该炸整轮推送
+  }
+}
+
 /**
  * 每日自动签到 (checkin)
  */

package/src/mirasimClient.js

@@ -154,6 +154,9 @@ export function normalizeMirasimLimits(limits, profile = null) {
     plan: profile?.plan ? String(profile.plan).toUpperCase() : (limits?.paid ? 'PRO' : 'FREE'),
     planExpiresAt: epochToIso(profile?.plan_exp),
     bottleneckLabel: isExhausted ? (bottleneck?.name || '额度') + '已用尽' : null,
+    // 结构化瓶颈（面板按词典分别 T() 窗口名与「已用尽」，替代拼串 bottleneckLabel——
+    // 上游新增窗口名（如 '30d'）无词典映射时拼串会出「30d已用尽」混语）
+    bottleneck: isExhausted && bottleneck ? { name: bottleneck.name } : null,
     parts,
     empty: parts.length === 0,
     exceeded: limits?.suspended === true || isExhausted,

package/src/panel.html

@@ -472,11 +472,6 @@
                 </div>
                 <div class="hint" data-i18n="作用于全部产品的定时签到轮(ZCode 活动领取在自身页签单独配置);修改立即生效,下一轮按新间隔执行。">作用于全部产品的定时签到轮(ZCode 活动领取在自身页签单独配置);修改立即生效,下一轮按新间隔执行。</div>
               </div>
-              <div class="field">
-                <label data-i18n="WorkBuddy 国际版 活跃请求">WorkBuddy 国际版 活跃请求</label>
-                <label class="check"><input type="checkbox" id="cfg-wb-activity"> <span data-i18n="定期发送活跃请求（保持资格，不保证奖励）">定期发送活跃请求（保持资格，不保证奖励）</span></label>
-                <div class="hint" data-i18n="关闭后本机不再对国际版账号自动/手动发活跃请求;卡片与仪表盘的「活跃」入口一同隐藏。">关闭后本机不再对国际版账号自动/手动发活跃请求;卡片与仪表盘的「活跃」入口一同隐藏。</div>
-              </div>
               <div class="field">
                 <label data-i18n="面板访问密码">面板访问密码</label>
                 <div id="sec-block"></div>
@@ -769,6 +764,35 @@
   </div>
 </div>
 
+<!-- 捐赠支持（面向国内用户：爱发电 / 支付宝 / 微信；渠道与 10Router 一致，UI 照 CD 设计语言） -->
+<div class="mask" id="m-donate">
+  <div class="modal">
+    <div class="modal-title"><span data-i18n="捐赠支持">捐赠支持</span><button class="close" data-close>✕</button></div>
+    <div class="hint" data-i18n="如果 CreditDaddy 对你有帮助，欢迎支持一下开发——免费渠道的每一行代码都是咖啡驱动的。">如果 CreditDaddy 对你有帮助，欢迎支持一下开发——免费渠道的每一行代码都是咖啡驱动的。</div>
+    <div style="display:grid;grid-template-columns:repeat(3,1fr);gap:12px;margin-top:14px">
+      <div style="display:flex;flex-direction:column;align-items:center;gap:8px;padding:14px 10px;border:1px solid var(--border-subtle);border-radius:10px">
+        <span style="font-size:26px">⚡</span>
+        <div style="font-weight:700">AiFaDian</div>
+        <div class="hint" data-i18n="爱发电 · Power me ⚡">爱发电 · Power me ⚡</div>
+        <img src="/assets/donate-ifdian.svg?v=3" alt="AiFaDian" style="width:140px;height:140px;margin-top:auto;border-radius:8px;padding:6px;flex:none">
+      </div>
+      <div style="display:flex;flex-direction:column;align-items:center;gap:8px;padding:14px 10px;border:1px solid var(--border-subtle);border-radius:10px">
+        <span style="font-size:26px">🅰️</span>
+        <div style="font-weight:700">Alipay</div>
+        <div class="hint" data-i18n="支付宝扫码打赏">支付宝扫码打赏</div>
+        <img src="/assets/donate-alipay.svg?v=3" alt="Alipay" style="width:140px;height:140px;margin-top:auto;border-radius:8px;padding:6px;flex:none">
+      </div>
+      <div style="display:flex;flex-direction:column;align-items:center;gap:8px;padding:14px 10px;border:1px solid var(--border-subtle);border-radius:10px">
+        <span style="font-size:26px">💚</span>
+        <div style="font-weight:700">WeChat Pay</div>
+        <div class="hint" data-i18n="微信扫码打赏">微信扫码打赏</div>
+        <img src="/assets/donate-wechat.svg?v=3" alt="WeChat Pay" style="width:140px;height:140px;margin-top:auto;border-radius:8px;padding:6px;flex:none">
+      </div>
+    </div>
+    <div class="modal-actions"><button class="btn primary" data-close data-i18n="关闭">关闭</button></div>
+  </div>
+</div>
+
 <!-- 10Router 设置 -->
 <div class="mask" id="m-10r">
   <div class="modal">
@@ -807,9 +831,9 @@
 <!-- 免费额度池：推送设置 -->
 <div class="mask" id="m-free-settings">
   <div class="modal sm">
-    <div class="modal-title"><span data-i18n="免费额度推送设置">免费额度推送设置</span><button class="close" data-close>✕</button></div>
+    <div class="modal-title"><span data-i18n="额度卡片推送设置">额度卡片推送设置</span><button class="close" data-close>✕</button></div>
     <div class="field">
-      <label class="check"><input type="checkbox" id="free-push-auto"> <span data-i18n="自动推送免费额度卡到 10Router（Token Harbor / MiniMax）">自动推送免费额度卡到 10Router（Token Harbor / MiniMax）</span></label>
+      <label class="check"><input type="checkbox" id="free-push-auto"> <span data-i18n="自动推送额度卡片到 10Router（Token Harbor / MiniMax / LongCat 等）">自动推送额度卡片到 10Router（Token Harbor / MiniMax / LongCat 等）</span></label>
     </div>
     <div class="field">
       <label data-i18n="推送频率">推送频率</label>
@@ -821,7 +845,7 @@
         <option value="240" data-i18n="每 4 小时">每 4 小时</option>
       </select>
     </div>
-    <div class="hint" data-i18n="把 CreditDaddy 解析的免费额度数字（不含凭据）推到 10Router 配额页出卡；卡片在 10Router 具 7 天有效期。点「立即同步一次」或 10Router 页「刷新额度」也会立即推送。">把 CreditDaddy 解析的免费额度数字（不含凭据）推到 10Router 配额页出卡；卡片在 10Router 具 7 天有效期。点「立即同步一次」或 10Router 页「刷新额度」也会立即推送。</div>
+    <div class="hint" data-i18n="把 CreditDaddy 解析的额度数字（不含凭据）推到 10Router 配额页出卡；卡片在 10Router 具 7 天有效期。点「立即同步一次」或 10Router 页「刷新额度」也会立即推送。">把 CreditDaddy 解析的额度数字（不含凭据）推到 10Router 配额页出卡；卡片在 10Router 具 7 天有效期。点「立即同步一次」或 10Router 页「刷新额度」也会立即推送。</div>
     <div class="hint" id="free-settings-status" style="margin-top:8px"></div>
     <div class="modal-actions">
       <button class="btn" style="margin-right:auto" id="free-settings-push-now" data-i18n="立即推送一次">立即推送一次</button>
@@ -969,6 +993,8 @@ const I = {
   play: svg('<polygon points="6 4 20 12 6 20 6 4"/>'),
   refresh: svg('<path d="M21 12a9 9 0 1 1-2.64-6.36L21 8"/><path d="M21 3v5h-5"/>'),
   trash: svg('<path d="M3 6h18"/><path d="M8 6V4h8v2"/><path d="M19 6l-1 14H6L5 6"/>'),
+  eye: svg('<path d="M1 12s4-8 11-8 11 8 11 8-4 8-11 8-11-8-11-8z"/><circle cx="12" cy="12" r="3"/>'),
+  eyeOff: svg('<path d="M17.94 17.94A10.07 10.07 0 0 1 12 20c-7 0-11-8-11-8a18.45 18.45 0 0 1 5.06-5.94M9.9 4.24A9.12 9.12 0 0 1 12 4c7 0 11 8 11 8a18.5 18.5 0 0 1-2.16 3.19m-6.72-1.07a3 3 0 1 1-4.24-4.24"/><line x1="1" y1="1" x2="23" y2="23"/>'),
   plus: svg('<path d="M12 5v14M5 12h14"/>'),
   upload: svg('<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><path d="M17 8l-5-5-5 5"/><path d="M12 3v12"/>'),
   download: svg('<path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><path d="M7 10l5 5 5-5"/><path d="M12 15V3"/>'),
@@ -1023,6 +1049,9 @@ const COMPONENTS = [
   { id: 'free', label: '网页会话' },
   { id: 'tenrouter', label: '10Router' },
 ];
+// 捐赠二维码随日夜主题切换（顶层定义：applyTheme 的调用早于原块级定义，块内 function 不可达）
+// 捐赠二维码统一低饱和金黄（透明底），日夜主题通用，无需随主题切换
+function applyDonateQrTheme() { /* 统一金码：无主题切换 */ }
 const HIDDEN_COMP_KEY = 'qd_hidden_components';
 const DEFAULT_HIDDEN_COMP = ['catpaw'];   // 妙手默认收起，右上角设置里可打开
 state.hidden = (() => {
@@ -1250,7 +1279,6 @@ async function loadSettings() {
   try {
     const d = await api('/api/settings');
     state.sec = { enabled: Boolean(d.panelKeyEnabled), loaded: true };
-    state.wbActivity = d.workbuddyActivity !== false;   // WB 国际版活跃请求总开关（默认开）
     if (!d.panelKeyEnabled) setKey('');   // 关闭后清掉本地缓存的旧密钥
     if (d.locale) renderLocale(d.locale);
   } catch (e) { /* 401（密码开启但未输入）等状态由 promptKey 流程处理 */ }
@@ -1283,15 +1311,6 @@ async function applyDictFromServer() {
 document.getElementById('set-locale')?.addEventListener('change', (ev) => setLocale(ev.target.value));
 
 // ── 通用设置：全局自动签到（开关 + 频率，落盘立刻重调度）、日志默认显示方式（本机偏好）──
-const wbActOn = () => state.wbActivity !== false;
-$('cfg-wb-activity').addEventListener('change', async (e) => {
-  try {
-    await api('/api/settings', { method: 'PUT', json: { workbuddyActivity: e.target.checked } });
-    await loadSettings();
-    render(); renderStatus();
-    toast(T('已保存'), true);
-  } catch (err) { toast(err.message, false); }
-});
 function fillAutoCheckin() {
   const sc = state.status && state.status.scheduler;
   if (!sc) return;
@@ -1329,6 +1348,7 @@ applyLogsDisplay(logsDisplayDefault());
 // 由 renderThemeMode() 反映到菜单里的分段控件（主题只有那一个入口）。
 function applyTheme(t) {
   document.documentElement.dataset.theme = t;
+  if (typeof applyDonateQrTheme === 'function') { try { applyDonateQrTheme(t); } catch {} }
 }
 function initTheme() {
   let t = null;
@@ -1425,6 +1445,7 @@ function initTheme() {
   // 需要跟随系统走菜单里的三态分段控件。
   const themeBtn = $('btn-theme');
   function resolvedTheme() { return document.documentElement.dataset.theme === 'dark' ? 'dark' : 'light'; }
+
   function renderThemeButton() {
     if (!themeBtn) return;
     const cur = resolvedTheme();
@@ -1455,20 +1476,16 @@ function initTheme() {
     else window.open(url, '_blank');
   };
 
-  // 捐赠（桌面版走 IPC 桥；网页直接开浏览器）
-  $('donate-btn').onclick = () => {
-    closeHmenu();
-    if (window.creditdaddy && typeof window.creditdaddy.shellOpen === 'function')
-      window.creditdaddy.shellOpen('https://github.com/sponsors/techysy');
-    else window.open('https://github.com/sponsors/techysy', '_blank');
-  };
+  // 捐赠：弹窗展示三渠道（爱发电 / 支付宝 / 微信——国内用户为主，与 10Router 一致）；
+  // Sponsors 按钮跳转（桌面版走 IPC 桥，网页直接开浏览器）
+  $('donate-btn').onclick = () => { closeHmenu(); openModal('m-donate'); };
 }
 
 // ── 状态 / 渲染 ──
-// 统一「领鸡蛋」语义：Qoder / WorkBuddy 国内/国际 = 领取积分；workbuddy-intl = 保持活跃（不保证奖励）
+// 统一「领鸡蛋」语义：全部签到产品线 = 领取积分（workbuddy-intl 的「活跃」语义随活跃领取线删除）
 function statusOf(a) {
   if (!CHECKIN_PRODUCTS.has(a.product)) return { cls: '', text: '', msg: '' };  // ZCode 无每日领取，不显示徽标
-  const intl = a.provider === 'workbuddy-intl';
+  if (a.provider === 'workbuddy-intl') return { cls: '', text: '', msg: '' };   // 国际版无签到动作（活跃领取线已删），不显示徽标
   const byProd = (state.status && state.status.todayByProduct) || {};
   const today = byProd[a.product] || (state.status && state.status.today);
   const done = state.status && state.status.todayDone && state.status.todayDone[a.id] === today;
@@ -1476,15 +1493,13 @@ function statusOf(a) {
   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: T('本机已领'), msg: r.message };
   if (done) {
-    if (intl) return { cls: 'ok', text: T('今日活跃'), msg: r && r.message ? r.message : '' };
     const amt = r && r.status === 'checked-in' && fresh && r.amount ? ' +' + fmtNum(r.amount) : '';
-    const streak = r && !intl && r.streakDays ? T(' · 连续 ') + r.streakDays + T(' 天') : '';
+    const streak = r && r.streakDays ? T(' · 连续 ') + r.streakDays + T(' 天') : '';
     return { cls: 'ok', text: T('今日已领') + amt + streak, msg: r && r.message && !['checked-in', 'already'].includes(r.status) ? r.message : '' };
   }
-  const failText = intl ? T('活跃失败') : T('领取失败');
-  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 ? T('待活跃') : T('待领取'), msg: r.message };
-  return { cls: 'pending', text: intl ? T('未活跃') : T('未领取'), msg: '' };
+  if (r && fresh && r.status === 'failed') return { cls: 'fail', text: T('领取失败'), msg: r.message, err: true };
+  if (r && fresh && r.status === 'no-activity') return { cls: 'pending', text: T('待领取'), msg: r.message };
+  return { cls: 'pending', text: T('未领取'), msg: '' };
 }
 
 function expiryCell(a) {
@@ -1567,8 +1582,11 @@ function creditHtml(a) {
     const planBadge = q.plan ? '<span class="badge">' + esc(T(q.plan)) + T(' 套餐</span>') : '';
     const expLabel = q.planExpiresAt ? '<span class="dim">' + fmtTime(q.planExpiresAt).slice(0, 10) + T(' 到期</span>') : '';
     // 状态采用温和的徽章，避免整行大红字制造恐慌
+    // pill 不再用 mirasimClient 拼好的 bottleneckLabel（上游窗口名原文 + '已用尽' 拼串，
+    // 英文界面会出「30d已用尽」这类混语）——改面板侧按词典分别 T()：窗口名走词条
+    // （'5小时窗口'→'5h window' 等，上游新名如 '30d' 拉丁原样），「已用尽」单独走词条。
     const topStatus = isExhausted
-      ? '<span class="pill pending">' + esc(T(q.bottleneckLabel || '') || T('额度已用尽')) + '</span>'
+      ? '<span class="pill pending">' + esc(q.bottleneck ? T(q.bottleneck.name) + T('已用尽') : T('额度已用尽')) + '</span>'
       : T('<span class="lbl">可用额度</span><b>') + fmtNum(q.remaining) + '%</b>';
 
     const fmtUnits = (n) => (n >= 10000 ? (n / 10000).toFixed(2) + T('万') : fmtNum(Math.round(n)));
@@ -1640,7 +1658,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' ? T('<button class="icon-btn" data-act="claim" title="活动领取（billing/preview → claim，可能需过一次验证码）">') + I.gift + '</button>' : '')
-    + (canCheckin && (a.provider !== 'workbuddy-intl' || wbActOn()) ? '<button class="icon-btn' + (state.busy[a.id] ? ' busy' : '') + '" data-act="checkin" title="' + (a.provider === 'workbuddy-intl' ? T('发送活跃请求') : T('立即领取')) + '">' + (state.busy[a.id] ? I.refresh : I.play) + '</button>' : '')
+    + (canCheckin && a.provider !== 'workbuddy-intl' ? '<button class="icon-btn' + (state.busy[a.id] ? ' busy' : '') + '" data-act="checkin" title="' + T('立即领取') + '">' + (state.busy[a.id] ? I.refresh : I.play) + '</button>' : '')
     + (a.qoderWebDead ? '<button class="icon-btn" data-act="webrenew" title="' + T('网页会话已失效——打开登录窗口重新授权，关闭窗口时自动补 cookie（API token 不受影响）') + '">' + I.swap + '</button>' : '')
     + (a.canSwitch && !isCurrent && st.cls !== 'fail' ? T('<button class="icon-btn" data-act="switch" title="切换 ') + (CLIENT_LABEL[a.product] ? T(CLIENT_LABEL[a.product]) : prodLabel(a.product)) + T(' 客户端到此账号">') + I.swap + '</button>' : '')
     + T('<button class="icon-btn" data-act="quota" title="刷新积分">') + I.refresh + '</button>'
@@ -1752,11 +1770,9 @@ function renderProd() {
   $('s-count').textContent = acc.length;
   $('s-done-wrap').style.display = canCheckin ? 'contents' : 'none';
   if (prod === 'workbuddy') {
-    // 国内版 = 每日签到送积分；国际版 = 保持活跃（活跃不等于必有奖励）
+    // 国内版 = 每日签到送积分；国际版无签到动作（活跃领取线已删），只统计国内
     const cnAcc = acc.filter((a) => a.provider === 'workbuddy');
-    const intlAcc = acc.filter((a) => a.provider === 'workbuddy-intl' && wbActOn());
-    $('s-done-wrap').innerHTML = (cnAcc.length ? T('<div class="stat"><span title="国内版每日签到送积分">领取（国内）</span><strong>') + cnAcc.filter(isDone).length + ' / ' + cnAcc.length + '</strong></div><div class="divider"></div>' : '')
-      + (intlAcc.length ? T('<div class="stat"><span title="国际版定期发送活跃请求保持资格；活跃不等于必有奖励">活跃（国际）</span><strong>') + intlAcc.filter(isDone).length + ' / ' + intlAcc.length + '</strong></div><div class="divider"></div>' : '');
+    $('s-done-wrap').innerHTML = (cnAcc.length ? T('<div class="stat"><span title="国内版每日签到送积分">领取（国内）</span><strong>') + cnAcc.filter(isDone).length + ' / ' + cnAcc.length + '</strong></div><div class="divider"></div>' : '');
   } else {
     // 从 WorkBuddy 页切回来时 s-done 可能被 innerHTML 换没了，先重建结构再写值
     if (!$('s-done')) $('s-done-wrap').innerHTML = T('<div class="stat"><span>今日已领</span><strong id="s-done"></strong></div><div class="divider"></div>');
@@ -1773,8 +1789,7 @@ function renderProd() {
   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) {
-    const hasIntl = acc.some((a) => a.provider === 'workbuddy-intl') && wbActOn();
-    $('btn-checkin').innerHTML = I.play + (prod === 'workbuddy' && hasIntl ? T('领取 / 活跃全部') : T('领取全部 ') + prodLabel(prod));
+    $('btn-checkin').innerHTML = I.play + T('领取全部 ') + prodLabel(prod);
   }
   // 顶栏产品专属入口：ZCode 设置组、Trae 打开客户端，带状态灯（运行中绿点呼吸）
   const dot = (on, pulse) => '<span class="dot' + (on ? ' on' : '') + (on && pulse ? ' pulse' : '') + '"></span>';
@@ -1842,23 +1857,19 @@ function renderDash() {
   const credit = creditSum(state.accounts.filter((a) => a.product !== 'zcode'));
   const byProd = orderedVisibleComps().filter((id) => id !== 'tenrouter').map((id) => prodLabel(id) + ' ' + ofProduct(id).length).join(' · ');
   const creditByProd = ['qoder', 'workbuddy', 'minimax'].filter(compVisible).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' && wbActOn());
-  const domAcc = signable.filter((a) => a.provider !== 'workbuddy-intl');
-  const doneDom = domAcc.filter(isDone).length;
-  const doneIntl = intlAcc.filter(isDone).length;
+  // 今日进度：国际版 WorkBuddy 无签到动作（活跃领取线已删），signable 天然只剩可领取账号
   $('kpis').innerHTML =
     kpi(T('账号'), state.accounts.length, byProd)
-    + kpi(T('今日领取') + (intlAcc.length ? T(' / 活跃') : ''), intlAcc.length
-        ? doneDom + ' <small>/ ' + domAcc.length + '</small><small class="kpi-side">' + T(' · 活跃 {n} / {m}', { n: doneIntl, m: intlAcc.length }) + '</small>'
-        : done + ' <small>/ ' + signable.length + '</small>',
+    + kpi(T('今日领取'), done + ' <small>/ ' + signable.length + '</small>',
       !signable.length ? T('暂无可领取的账号')
-        : (doneDom === domAcc.length && doneIntl === intlAcc.length ? (intlAcc.length ? T('今天全部完成（国际为活跃请求，不保证奖励）') : T('今天全部签完'))
+        : (done === signable.length ? T('今天全部签完')
         : T('待办 ') + (signable.length - done) + (failed ? T(' · 失败 ') + failed : '')),
-      T('领取 = 国内版每日签到；活跃 = 国际版定期活跃请求（保持资格，不保证奖励）'))
+      T('领取 = 每日签到'))
     + kpi(T('剩余积分'), credit.loading ? '…' : (credit.known ? fmtNum(credit.sum) : '-'), credit.loading ? T('正在读取各账号额度…') : creditByProd)
     + kpi(T('下次自动领取'), sch.ticking ? T('领取中…') : sch.nextTickAt ? fmtTime(sch.nextTickAt).slice(11) : '-',
-      sch.lastTick ? T('上一轮 ') + fmtTime(sch.lastTick.at).slice(5) + ' · ' + esc(sch.lastTick.summary || '') : T('每 ~2 小时一轮'));
+      sch.lastTick
+        ? T('上一轮 ') + fmtTime(sch.lastTick.at).slice(5) + ' · ' + esc(sch.lastTick.summaryKey ? T(sch.lastTick.summaryKey, sch.lastTick.summaryArgs) : (sch.lastTick.summary || ''))
+        : T('每 ~2 小时一轮'));
 
   // 仪表盘产品卡按组件设置里的顺序渲染（与标签栏同步），10Router 汇总卡按其顺序插入
   const prodCardHtml = (p) => {
@@ -1870,16 +1881,10 @@ function renderDash() {
       const d = list.filter(isDone).length;
       const c = creditSum(list);
       if (p.id === 'workbuddy') {
-        // 国内 = 每日领取；国际 = 保持活跃（活跃不等于必有奖励）——合并一行展示
+        // 国内 = 每日领取；国际无签到动作（活跃领取线已删），统计只覆盖国内账号
         const cnList = list.filter((a) => a.provider === 'workbuddy');
-        const intlList = list.filter((a) => a.provider === 'workbuddy-intl');
-        const parts = [];
-        if (cnList.length) parts.push(cnList.filter(isDone).length + ' / ' + cnList.length + T('（国内）'));
-        if (intlList.length) parts.push(intlList.filter(isDone).length + ' / ' + intlList.length + T('（国际 · 不保证奖励）'));
-        rows += T('<span class="lbl">领取 / 活跃</span><span class="val" title="') + esc(parts.join(T('，')) + (intlList.length ? T('（国际为活跃请求，不保证奖励）') : '')) + '">'
-          + (cnList.length ? cnList.filter(isDone).length + ' / ' + cnList.length + T(' 国内') : '')
-          + (cnList.length && intlList.length ? ' · ' : '')
-          + (intlList.length ? intlList.filter(isDone).length + ' / ' + intlList.length + T(' 国际') : '')
+        rows += T('<span class="lbl">领取</span><span class="val" title="') + esc(cnList.length ? cnList.filter(isDone).length + ' / ' + cnList.length + T('（国内）') : '') + '">'
+          + (cnList.length ? cnList.filter(isDone).length + ' / ' + cnList.length + T(' 国内') : T('—'))
           + '</span>';
       } else if (p.id === 'minimax') {
         const planned = list.filter((a) => { const q = state.quotas[a.id]; return q && !q.error && !q.empty; }).length;
@@ -1944,7 +1949,7 @@ function renderDash() {
     if (a.verified === false) att.push(Object.assign({ pill: 'fail', text: T('token 无效') }, base));
     else if (ex.label === '已过期') att.push(Object.assign({ pill: 'fail', text: T('token 已过期') }, base));
     else if (ex.warn) att.push(Object.assign({ pill: 'limited', text: ex.label.slice(5, 10) + T(' 过期') }, base));
-    if (st.cls === 'fail') att.push(Object.assign({ pill: 'fail', text: a.provider === 'workbuddy-intl' ? T('活跃失败') : T('领取失败'), title: st.msg }, base));
+    if (st.cls === 'fail') att.push(Object.assign({ pill: 'fail', text: T('领取失败'), title: st.msg }, base));
   }
   for (const c of (tr.quotas && tr.quotas.connections) || []) {
     if (!compVisible('tenrouter')) break;
@@ -1970,8 +1975,6 @@ function renderDash() {
     ? recent.map((a) => {
       const r = a.lastResult;
       let [cls, txt] = RES[r.status] || ['pending', r.status];
-      // 国际版 WorkBuddy 是保持活跃（不保证奖励），不叫「领取」
-      if (a.provider === 'workbuddy-intl' && r.status === 'checked-in') txt = T('活跃达成');
       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>';
@@ -2001,7 +2004,7 @@ function renderStatus() {
   } else {
     chip.innerHTML = '';
   }
-  chip.title = sch.lastTick ? T('上一轮 ') + fmtTime(sch.lastTick.at) + T('：') + sch.lastTick.summary : '';
+  chip.title = sch.lastTick ? T('上一轮 ') + fmtTime(sch.lastTick.at) + T('：') + (sch.lastTick.summaryKey ? T(sch.lastTick.summaryKey, sch.lastTick.summaryArgs) : sch.lastTick.summary || '') : '';
   // 产品相关提示只在对应标签页出现
   const hasIntl = state.view === 'qoder' && state.region !== 'cn' && state.accounts.some((a) => a.provider === 'qoder');
   const n = $('notice');
@@ -2082,6 +2085,30 @@ async function installUmid() {
 $('notice').addEventListener('click', (e) => { if (e.target.closest('#btn-umid')) installUmid(); });
 // 覆盖 #notice（各产品横幅）与 #z-actions（ZCode 工具栏按钮组）的点击
 document.addEventListener('click', async (e) => {
+  // 免费额度页：站点卡隐藏 / 全部显示（拖拽排序在 renderFreePool 里经 bindCardDrag 绑定）
+  const hideBtn = e.target.closest('[data-free-hide]');
+  if (hideBtn) {
+    state.hiddenFreeSites.add(hideBtn.dataset.freeHide);
+    saveHiddenFreeSites();
+    renderFreePool();
+    return;
+  }
+  const doubaoBtn = e.target.closest('[data-open-doubao]');
+  if (doubaoBtn) {
+    if (window.creditdaddy && typeof window.creditdaddy.openDoubaoClient === 'function') {
+      window.creditdaddy.openDoubaoClient().then((r) => {
+        if (r && r.ok) toast(T('已启动豆包客户端'), true);
+        else toast((r && r.error) || T('无法启动豆包客户端'), false);
+      }).catch((err) => toast(String(err && err.message || err), false));
+    } else toast(T('需要桌面版 CreditDaddy'), false);
+    return;
+  }
+  if (e.target.closest('#free-show-all')) {
+    state.hiddenFreeSites.clear();
+    saveHiddenFreeSites();
+    renderFreePool();
+    return;
+  }
   if (e.target.closest('#zt-open')) {
     try {
       const r = await window.creditdaddy.openZcodeClient();
@@ -2488,30 +2515,78 @@ async function loadCookieSites(force) {
   return state.cookieSites;
 }
 
+// 免费额度页站点卡：顺序 / 显隐（本机持久化；拖拽复用 bindCardDrag，眼睛按钮切换显隐）
+const FREE_ORDER_KEY = 'qd_free_site_order';
+const FREE_HIDDEN_KEY = 'qd_hidden_free_sites';
+state.freeOrder = (() => {
+  let arr = [];
+  try { arr = JSON.parse(localStorage.getItem(FREE_ORDER_KEY) || '[]'); } catch {}
+  return Array.isArray(arr) ? arr : [];
+})();
+function saveFreeOrder() { try { localStorage.setItem(FREE_ORDER_KEY, JSON.stringify(state.freeOrder)); } catch {} }
+state.hiddenFreeSites = (() => {
+  let list = [];
+  try { list = JSON.parse(localStorage.getItem(FREE_HIDDEN_KEY) || '[]'); } catch {}
+  return new Set(Array.isArray(list) ? list : []);
+})();
+function saveHiddenFreeSites() { try { localStorage.setItem(FREE_HIDDEN_KEY, JSON.stringify([...state.hiddenFreeSites])); } catch {} }
+const freeVisible = (id) => !state.hiddenFreeSites.has(id);
+
+function orderedFreeSites(sites) {
+  const ids = sites.map((s) => s.id);
+  const arr = state.freeOrder.filter((id) => ids.includes(id));
+  for (const id of ids) if (!arr.includes(id)) arr.push(id);
+  state.freeOrder = arr;
+  return arr.map((id) => sites.find((s) => s.id === id)).filter(Boolean);
+}
+
 function renderFreePool() {
   const body = $('free-pool-body');
   if (!body) return;
   const sites = state.cookieSites;
   const canCapture = Boolean(window.creditdaddy && typeof window.creditdaddy.openAuthWindow === 'function');
   if (!sites) { body.innerHTML = T('<div class="dim">加载中…</div>'); loadCookieSites().then(() => renderFreePool()); return; }
-  const totalAccounts = sites.reduce((sum, s) => sum + (s.accounts?.length || 0), 0);
+  const enabledSites = sites.filter((s) => s.disabled !== true);
+  const totalAccounts = enabledSites.reduce((sum, s) => sum + (s.accounts?.length || 0), 0);
   if ($('free-total-count')) $('free-total-count').textContent = totalAccounts;
-  if ($('free-sites-count')) $('free-sites-count').textContent = sites.length;
+  if ($('free-sites-count')) $('free-sites-count').textContent = enabledSites.length;
   if ($('cnt-free')) $('cnt-free').textContent = totalAccounts;
 
-  if (!sites.length) {
+  if (!enabledSites.length) {
     body.innerHTML = T('<div class="muted-empty">暂无可捕获的供应商</div>');
     return;
   }
 
-  body.innerHTML = sites.map((site) => {
+  const hiddenCount = enabledSites.filter((s) => !freeVisible(s.id)).length;
+  const showHiddenBar = hiddenCount > 0;
+  const visibleSites = orderedFreeSites(sites).filter((s) => freeVisible(s.id) && s.disabled !== true);
+
+  body.innerHTML = (showHiddenBar
+    ? T('<div class="hint" style="grid-column:1/-1;display:flex;align-items:center;gap:8px">') + T('{n} 个站点已隐藏', { n: hiddenCount })
+      + ' <button class="btn" id="free-show-all" style="padding:2px 10px;font-size:12px">' + T('全部显示') + '</button></div>'
+    : '')
+  + visibleSites.map((site) => {
+    // entryOnly 站点（豆包）：纯快捷入口卡——只出「打开」按钮与说明，无捕获/账号
+    if (site.entryOnly === true) {
+      const openBtn = canCapture
+        ? '<button class="btn primary" data-open-doubao="1">' + I.play + T('打开豆包') + '</button>'
+        : T('<button class="btn" disabled title="需要桌面版 CreditDaddy">打开豆包</button>');
+      return '<div class="card" style="display:flex;flex-direction:column;justify-content:flex-start;gap:8px;padding:14px 16px;background:var(--surface);border:1px solid var(--border-subtle);border-radius:14px;box-shadow:var(--shadow)">'
+        + '<div style="display:flex;align-items:center;justify-content:space-between;gap:10px">'
+        + '<span style="font-size:14px;font-weight:700">' + esc(site.label || site.name) + '</span>' + openBtn + '</div>'
+        + (site.hint ? '<div class="hint" style="margin:2px 0 0">' + esc(T(site.hint)) + '</div>' : '')
+        + '</div>';
+    }
     const rows = site.accounts || [];
     const stateTxt = rows.length
       ? T('<span class="badge ok">已捕获 ') + rows.length + T(' 个会话</span>')
       : T('<span class="badge limited">未捕获</span>');
-    const btn = canCapture
-      ? '<button class="btn primary" data-capture-site="' + esc(site.id) + '">' + I.plus + T('登录捕获') + '</button>'
-      : T('<button class="btn" disabled title="需要桌面版 CreditDaddy(无痕登录窗)">登录捕获</button>');
+    const siteDisabled = site.disabled === true;
+    const btn = siteDisabled
+      ? T('<button class="btn" disabled title="网页 cookie 无法参与该站活动（活动校验客户端环境）">网页版（暂不可用）</button>')
+      : canCapture
+        ? '<button class="btn primary" data-capture-site="' + esc(site.id) + '">' + I.plus + T('网页版') + '</button>'
+        : T('<button class="btn" disabled title="需要桌面版 CreditDaddy(无痕登录窗)">网页版</button>');
     // 「粘贴捕获」：部分站点（小米账号 SSO）登录态挂设备指纹，CD 无痕窗也会被静默 SSO
     // 拉回同一账号——多号并存走系统浏览器登录新号后手动粘 cookie（不依赖登录窗）。
     const pasteBtn = ' <button class="btn" data-paste-capture="' + esc(site.id) + '" title="' + T('在其他浏览器登录该站点后，把会话 cookie 粘贴进来捕获（多账号并存的可靠路径）') + '">' + T('粘贴捕获') + '</button>';
@@ -2605,28 +2680,44 @@ function renderFreePool() {
             + '</div>'
             + '<div style="display:flex;align-items:center;gap:8px;flex:none">'
             + '<span class="dim" style="font-size:11.5px">' + (acc.capturedAt ? esc(fmtTime(acc.capturedAt)) : '–') + '</span>'
+            + (site.id === 'doubao' && canCapture ? '<button class="icon-btn" data-open-doubao="1" title="' + T('打开豆包客户端（签到请在客户端内完成）') + '">' + I.play + '</button>' : '')
             + '<button class="icon-btn" data-act="reprobe" data-site="' + esc(site.id) + '" data-id="' + esc(acc.id) + '" title="' + T('就地重探（免登录，用已存会话刷新身份与额度）') + '">' + I.refresh + '</button>'
             + '<button class="icon-btn del" data-act="del" data-id="' + esc(acc.id) + '" title="' + T('删除此账号') + '">' + I.trash + '</button>'
             + '</div></div>'
             + (metricHtml ? '<div style="display:flex;align-items:center;gap:6px;flex-wrap:wrap;padding-left:14px">' + metricHtml + '</div>' : '')
             + '</div>';
         }).join('') + '</div>'
-      : T('<div class="muted-empty" style="padding:16px 0 6px">还没有捕获该站点的账号，点右上角「登录捕获」开始</div>');
+      : T('<div class="muted-empty" style="padding:16px 0 6px">还没有该站点的账号，点右上角「网页版」登录后自动捕获</div>');
 
     // justify-content 不用 space-between：网格行高被最高卡撑齐后，单行账号会被推到卡底（沉底）
-    return '<div class="card" style="display:flex;flex-direction:column;justify-content:flex-start;gap:8px;padding:14px 16px;background:var(--surface);border:1px solid var(--border-subtle);border-radius:14px;box-shadow:var(--shadow)">'
+    const eyeBtn = '<button class="icon-btn" data-free-hide="' + esc(site.id) + '" title="' + T('隐藏此站点卡片（「全部显示」可恢复）') + '">' + I.eyeOff + '</button>';
+    return '<div class="card" draggable="true" data-id="' + esc(site.id) + '" style="display:flex;flex-direction:column;justify-content:flex-start;gap:8px;padding:14px 16px;background:var(--surface);border:1px solid var(--border-subtle);border-radius:14px;box-shadow:var(--shadow)">'
       + '<div><div style="display:flex;align-items:center;justify-content:space-between;gap:10px;margin-bottom:6px">'
       + '<div style="display:flex;align-items:center;gap:8px">'
       + '<span style="font-size:14px;font-weight:700">' + esc(site.label || site.name) + '</span>'
       + stateTxt
       + '</div>'
-      + '<div style="display:flex;align-items:center;gap:6px">' + btn + pasteBtn + clearBtn + '</div>'
+      + '<div style="display:flex;align-items:center;gap:6px">' + btn + pasteBtn + clearBtn + eyeBtn + '</div>'
       + '</div>'
       + hint
       + '</div>'
       + accRows
       + '</div>';
   }).join('');
+  bindCardDrag(body, {
+    kind: 'free-site',
+    onReorder: (drag, targetId) => {
+      if (!drag.id) return;
+      const ids = state.freeOrder.slice();
+      const from = ids.indexOf(drag.id);
+      if (from >= 0) ids.splice(from, 1);
+      const ti = ids.indexOf(targetId);
+      ids.splice(ti < 0 ? ids.length : ti, 0, drag.id);
+      state.freeOrder = ids;
+      saveFreeOrder();
+      renderFreePool();
+    },
+  });
 }
 
 function renderCookieSites() {
@@ -2642,8 +2733,8 @@ function renderCookieSites() {
       ? T('<span class="dim">已捕获 ') + rows.length + T(' 个会话</span>')
       : T('<span class="dim">未捕获</span>');
     const btn = canCapture
-      ? '<button class="btn" data-capture-site="' + esc(site.id) + '">' + T('登录捕获') + '</button>'
-      : T('<button class="btn" disabled title="需要桌面版 CreditDaddy(无痕登录窗)">登录捕获</button>');
+      ? '<button class="btn" data-capture-site="' + esc(site.id) + '">' + T('网页版') + '</button>'
+      : T('<button class="btn" disabled title="需要桌面版 CreditDaddy(无痕登录窗)">网页版</button>');
     const hint = site.hint ? T('<div class="hint">') + esc(site.hint) + '</div>' : '';
     const accRows = rows.map((acc) =>
       '<div style="display:flex;align-items:center;justify-content:space-between;gap:10px;font-size:12px">'
@@ -2736,7 +2827,7 @@ $('free-settings-save')?.addEventListener('click', async () => {
       },
     });
     closeModal('m-free-settings');
-    toast(T('免费额度推送设置已保存'));
+    toast(T('额度卡片推送设置已保存'));
   } catch (e) { toast(e.message, false); }
 });
 $('free-settings-push-now')?.addEventListener('click', async () => {
@@ -2780,7 +2871,10 @@ async function cookieSitePasteCapture(siteId) {
   try {
     const r = await api('/api/cookie-sites/' + encodeURIComponent(siteId) + '/capture', { json: { cookie: cookie.trim() } });
     if (r && r.ok) {
-      toast(T('{name} cookie 捕获成功，同步到 10Router 后卡片点亮', { name: site.name }), true);
+      // 豆包不推 10R（无外部配额卡），文案不带「同步 10Router」以免误导
+      toast(site.no10rSync
+        ? T('{name} cookie 捕获成功，额度卡片已就绪', { name: site.name })
+        : T('{name} cookie 捕获成功，同步到 10Router 后卡片点亮', { name: site.name }), true);
       state.cookieSites = null;
       loadCookieSites(true).then(() => { if (state.view === 'free') renderFreePool(); });
     } else toast(T('捕获失败'), false);
@@ -2796,7 +2890,10 @@ if (window.creditdaddy && typeof window.creditdaddy.onCookieCaptured === 'functi
   window.creditdaddy.onCookieCaptured((payload) => {
     if (payload && payload.ok === false) { toast(payload.error || T('cookie 捕获失败'), false); return; }
     const name = payload && payload.name;
-    toast(T('{name} cookie 捕获成功，同步到 10Router 后卡片点亮', { name: name || '' }), true);
+    const site2 = (state.cookieSites || []).find((s) => s.name === name) || null;
+    toast(site2?.no10rSync
+      ? T('{name} cookie 捕获成功，额度卡片已就绪', { name: name || '' })
+      : T('{name} cookie 捕获成功，同步到 10Router 后卡片点亮', { name: name || '' }), true);
     state.cookieSites = null;
     Promise.allSettled([loadCookieSites(true), refreshAccountList(), loadTrQuotas(true)])
       .then(() => {
@@ -2804,6 +2901,11 @@ if (window.creditdaddy && typeof window.creditdaddy.onCookieCaptured === 'functi
         if (state.view === 'free') renderFreePool();
         renderCookieSites();
         renderDash();
+        // 收割时余额快照已随账号落库——账号卡上的余额读 state.quotas 缓存，
+        // 不重拉就显示旧数字（实测：小米收割成功后卡面 ¥0.00 挂到手动刷新）。
+        // 非 live 读快照零网络，成本可忽略；只刷 cookie-site 型账号。
+        const ids = (state.accounts || []).filter((a) => a.meta?.cookieSiteId).map((a) => a.id);
+        if (ids.length) loadQuotas(ids).then(renderDash);
       });
   });
 }
@@ -3657,7 +3759,7 @@ function openChangelogModal() {
           + '<div style="font-weight:700;margin:0 0 4px">v' + esc(s.version)
           + (s.date ? ' <span class="dim" style="font-weight:400;font-size:11px">' + esc(s.date) + '</span>' : '') + '</div>'
           + (s.theme ? '<div class="hint">' + strip(s.theme) + '</div>' : '')
-          + (s.topics && s.topics.length ? '<div class="hint" style="margin-top:4px">' + s.topics.map(strip).join(' · ') + '</div>' : '')
+          + (s.topics && s.topics.length ? '<div class="hint" style="margin-top:4px">' + s.topics.map((t) => strip(T(t.trim()))).join(' · ') + '</div>' : '')
           + '</div>').join('')
       : T('<div class="hint">暂无本地更新日志，请到 GitHub Releases 查看。</div>');
   }).catch(openReleases);
@@ -3767,7 +3869,7 @@ $('znet-ok').addEventListener('click', async () => {
     state.zProxyFirst = r.proxyFirst === true;
     await loadZNet();
     $('znet-url').value = '';
-    $('znet-url').placeholder = state.zProxyUrl || (state.zHasEnvProxy ? T('跟随环境变量 HTTPS_PROXY') : 'http://192.168.31.101:7890');
+    $('znet-url').placeholder = state.zProxyUrl ? T('当前代理：{url}（输入新值可更换，留空清除）', { url: state.zProxyUrl }) : (state.zHasEnvProxy ? T('跟随环境变量 HTTPS_PROXY') : 'http://192.168.31.101:7890');
     $('znet-state').textContent = T('已保存：') + (state.zProxyFirst === true ? T('代理优先') : T('直连优先'))
       + (state.zProxyUrl ? T(' · 代理 ') + state.zProxyUrl : '');
     toast(T('网络出口：') + (r.proxyFirst ? T('代理优先（直连兜底）') : T('直连优先（代理兜底）')) + (body.proxyUrl === '' ? T('，代理已清除') : T('，代理已保存')));
@@ -3844,10 +3946,11 @@ async function localScan() {
       const sub = c.kind === 'app'
         ? esc(c.source) + (c.email ? ' · ' + esc(mask(c.email)) : c.phone ? ' · ' + esc(c.phone) : '') + (c.expiresAt ? T(' · 有效期至 ') + esc(fmtTime(c.expiresAt)) : '')
         : esc(c.source) + ' · ' + esc(String(c.file || '').split(/[\\/]/).pop()) + T('（') + c.hits + T(' 处）');
+      const intl = c.intlWarning ? '<div class="hint" style="color:var(--warn,#d4b83a);margin-top:4px">⚠ ' + esc(c.intlWarning) + '</div>' : '';
       const btns = c.imported ? T('<span class="pill ok">已导入</span>') + (c.provider ? '<button class="btn" data-cid="' + esc(c.id) + T('" title="用本机凭据更新 token / 有效期 / 邮箱">同步信息</button>') : '')
         : c.provider ? '<button class="btn primary" data-cid="' + esc(c.id) + T('">导入</button>')
         : '<button class="btn" data-cid="' + esc(c.id) + T('" data-prov="qoder">导入·国际</button><button class="btn" data-cid="') + esc(c.id) + T('" data-prov="qoder-cn">导入·国内</button>');
-      html += '<div class="cand"><div class="cand-main"><div class="cand-name">' + title + prov + '</div><div class="cand-sub">' + sub + '</div></div><div class="row">' + btns + '</div></div>';
+      html += '<div class="cand"><div class="cand-main"><div class="cand-name">' + title + prov + '</div><div class="cand-sub">' + sub + '</div>' + intl + '</div><div class="row">' + btns + '</div></div>';
     }
     for (const e of r.errors || []) {
       html += T('<div class="hint" style="color:var(--err)">读取失败：') + esc(e.file) + T('：') + esc(e.error) + '</div>';
@@ -4308,7 +4411,6 @@ $('btn-comp').addEventListener('click', async () => {
   renderCompMenu();
   fillAutoCheckin();
   $('cfg-logs-display').value = logsDisplayDefault();
-  $('cfg-wb-activity').checked = wbActOn();
   // 网络出口（全局）：预填当前顺序与脱敏代理地址
   await loadZNet();
   (state.zProxyFirst === true ? $('znet-proxy') : $('znet-direct')).checked = true;