creditdaddy 1.1.1 → 1.2.0

package/src/constants.js

@@ -1,95 +1,97 @@
-/**
- * CreditDaddy 常量 — 支持的产品线与 Qoder 官方 OpenAPI 端点（WorkBuddy 端点见 workbuddyClient.js）。
- *
- * 端点与请求头结构来自社区逆向成果（10router 项目实测可用）：
- *   openapi.qoder.sh      国际版：活动/签到、userinfo、配额、PAT 兑换
- *   openapi.qoder.com.cn  国内版：同上
- *
- * ⚠️ 非官方接口，Qoder 调整服务端时可能失效。
- */
-
-import { readFileSync } from 'node:fs';
-
-export const OPENAPI_BASE = 'https://openapi.qoder.sh';
-export const CN_OPENAPI_BASE = 'https://openapi.qoder.com.cn';
-
-// 网页端（账号设置 → 用量明细）同源 API：逐资源包明细只在这里提供，且只认浏览器登录后的会话 Cookie。
-export const WEB_BASE = 'https://qoder.com';
-export const CN_WEB_BASE = 'https://qoder.cn';
-
-export const LOGIN_URL = 'https://qoder.com/device/selectAccounts';
-export const CN_LOGIN_URL = 'https://qoder.cn/device/selectAccounts';
-
-// 活动（签到）列表与领取
-export const CAMPAIGNS_PATH = '/sash/api/v1/me/campaigns?clientType=10';
-export const CAMPAIGN_CLAIM_PATH = (id) => `/sash/api/v1/me/campaigns/${encodeURIComponent(id)}/claim`;
-
-// 账号信息与配额
-export const USERINFO_PATH = '/api/v1/userinfo';
-export const QUOTA_USAGE_PATH = '/api/v2/quota/usage';
-// 网页端逐资源包用量明细（plan / 个人资源包 / 组织资源包，含每包到期时间）。
-// 仅接受浏览器登录的会话 Cookie（dt- / jt- token 一律 401），见 qoderClient.fetchUsageDetail。
-export const WEB_USAGE_PATH = '/api/v2/me/usages/big_model_credits';
-
-// PAT (pt-...) → 短期 job token (jt-...) 兑换（普通 JSON POST，无需 COSY 签名）
-export const JOB_TOKEN_EXCHANGE_PATH = '/api/v1/jobToken/exchange';
-
-// 账号的 provider = 产品 + 区域。新增产品时在此登记，并在 providers.js 挂上对应实现。
-export const PROVIDERS = ['qoder', 'qoder-cn', 'workbuddy', 'workbuddy-intl', 'zcode', 'mirasim', 'catpaw'];
-export const PROVIDER_LABEL = {
-  qoder: 'Qoder 国际版',
-  'qoder-cn': 'Qoder 国内版',
-  workbuddy: 'WorkBuddy 国内版',
-  'workbuddy-intl': 'WorkBuddy 国际版',
-  zcode: 'ZCode',
-  mirasim: 'mirasim',
-  catpaw: '妙手',
-};
-/** provider → 产品线（qoder / workbuddy / zcode / mirasim / catpaw） */
-export const productOf = (provider) => {
-  const p = String(provider);
-  if (p.startsWith('workbuddy')) return 'workbuddy';
-  if (p.startsWith('zcode')) return 'zcode';
-  if (p === 'mirasim') return 'mirasim';
-  if (p === 'catpaw') return 'catpaw';
-  return 'qoder';
-};
-/** provider 是否国内版 */
-export const isCnProvider = (provider) => provider === 'qoder-cn' || provider === 'workbuddy';
-
-/** Qoder 网页端同源 API 的 host（用量明细逐资源包接口在这里，只认浏览器会话 Cookie） */
-export function webBase(provider) {
-  return provider === 'qoder-cn' ? CN_WEB_BASE : WEB_BASE;
-}
-
-/** 签到请求头（源自 10router qoderCheckin.js，clientType=10 与官方客户端一致） */
-export function buildQoderHeaders(token) {
-  return {
-    Authorization: `Bearer ${token}`,
-    'Cosy-ClientType': '10',
-    'Cosy-Version': '0.3.3',
-    'Cosy-MachineOS':
-      process.platform === 'win32' ? 'windows'
-        : process.platform === 'darwin' ? 'macos' : 'linux',
-    'User-Agent': 'Qoder',
-    Accept: 'application/json',
-  };
-}
-
-/** PAT 兑换请求头（源自 10router qoderModels.js，模拟官方 qodercli） */
-export function buildExchangeHeaders() {
-  return {
-    'Content-Type': 'application/json',
-    Accept: 'application/json',
-    'User-Agent': 'qodercli/1.0.0',
-    'Cosy-Version': '1.0.0',
-    'Cosy-ClientType': '5',
-  };
-}
-
-export const FETCH_TIMEOUT_MS = 15000;
-
-// 版本号 / 项目主页以 package.json 为唯一来源（桌面版 / fpk 打包时都会一并拷入 package.json）
-const PKG = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
-export const APP_VERSION = PKG.version;
-export const PROJECT_URL = PKG.homepage || 'https://github.com/techysy/CreditDaddy';
+/**
+ * CreditDaddy 常量 — 支持的产品线与 Qoder 官方 OpenAPI 端点（WorkBuddy 端点见 workbuddyClient.js）。
+ *
+ * 端点与请求头结构来自社区逆向成果（10router 项目实测可用）：
+ *   openapi.qoder.sh      国际版：活动/签到、userinfo、配额、PAT 兑换
+ *   openapi.qoder.com.cn  国内版：同上
+ *
+ * ⚠️ 非官方接口，Qoder 调整服务端时可能失效。
+ */
+
+import { readFileSync } from 'node:fs';
+
+export const OPENAPI_BASE = 'https://openapi.qoder.sh';
+export const CN_OPENAPI_BASE = 'https://openapi.qoder.com.cn';
+
+// 网页端（账号设置 → 用量明细）同源 API：逐资源包明细只在这里提供，且只认浏览器登录后的会话 Cookie。
+export const WEB_BASE = 'https://qoder.com';
+export const CN_WEB_BASE = 'https://qoder.cn';
+
+export const LOGIN_URL = 'https://qoder.com/device/selectAccounts';
+export const CN_LOGIN_URL = 'https://qoder.cn/device/selectAccounts';
+
+// 活动（签到）列表与领取
+export const CAMPAIGNS_PATH = '/sash/api/v1/me/campaigns?clientType=10';
+export const CAMPAIGN_CLAIM_PATH = (id) => `/sash/api/v1/me/campaigns/${encodeURIComponent(id)}/claim`;
+
+// 账号信息与配额
+export const USERINFO_PATH = '/api/v1/userinfo';
+export const QUOTA_USAGE_PATH = '/api/v2/quota/usage';
+// 网页端逐资源包用量明细（plan / 个人资源包 / 组织资源包，含每包到期时间）。
+// 仅接受浏览器登录的会话 Cookie（dt- / jt- token 一律 401），见 qoderClient.fetchUsageDetail。
+export const WEB_USAGE_PATH = '/api/v2/me/usages/big_model_credits';
+
+// PAT (pt-...) → 短期 job token (jt-...) 兑换（普通 JSON POST，无需 COSY 签名）
+export const JOB_TOKEN_EXCHANGE_PATH = '/api/v1/jobToken/exchange';
+
+// 账号的 provider = 产品 + 区域。新增产品时在此登记，并在 providers.js 挂上对应实现。
+export const PROVIDERS = ['qoder', 'qoder-cn', 'workbuddy', 'workbuddy-intl', 'zcode', 'mirasim', 'catpaw', 'trae'];
+export const PROVIDER_LABEL = {
+  qoder: 'Qoder 国际版',
+  'qoder-cn': 'Qoder 国内版',
+  workbuddy: 'WorkBuddy 国内版',
+  'workbuddy-intl': 'WorkBuddy 国际版',
+  zcode: 'ZCode',
+  mirasim: 'mirasim',
+  catpaw: '妙手',
+  trae: 'Trae',
+};
+/** provider → 产品线（qoder / workbuddy / zcode / mirasim / catpaw / trae） */
+export const productOf = (provider) => {
+  const p = String(provider);
+  if (p.startsWith('workbuddy')) return 'workbuddy';
+  if (p.startsWith('zcode')) return 'zcode';
+  if (p === 'mirasim') return 'mirasim';
+  if (p === 'catpaw') return 'catpaw';
+  if (p.startsWith('trae')) return 'trae';
+  return 'qoder';
+};
+/** provider 是否国内版 */
+export const isCnProvider = (provider) => provider === 'qoder-cn' || provider === 'workbuddy';
+
+/** Qoder 网页端同源 API 的 host（用量明细逐资源包接口在这里，只认浏览器会话 Cookie） */
+export function webBase(provider) {
+  return provider === 'qoder-cn' ? CN_WEB_BASE : WEB_BASE;
+}
+
+/** 签到请求头（源自 10router qoderCheckin.js，clientType=10 与官方客户端一致） */
+export function buildQoderHeaders(token) {
+  return {
+    Authorization: `Bearer ${token}`,
+    'Cosy-ClientType': '10',
+    'Cosy-Version': '0.3.3',
+    'Cosy-MachineOS':
+      process.platform === 'win32' ? 'windows'
+        : process.platform === 'darwin' ? 'macos' : 'linux',
+    'User-Agent': 'Qoder',
+    Accept: 'application/json',
+  };
+}
+
+/** PAT 兑换请求头（源自 10router qoderModels.js，模拟官方 qodercli） */
+export function buildExchangeHeaders() {
+  return {
+    'Content-Type': 'application/json',
+    Accept: 'application/json',
+    'User-Agent': 'qodercli/1.0.0',
+    'Cosy-Version': '1.0.0',
+    'Cosy-ClientType': '5',
+  };
+}
+
+export const FETCH_TIMEOUT_MS = 15000;
+
+// 版本号 / 项目主页以 package.json 为唯一来源（桌面版 / fpk 打包时都会一并拷入 package.json）
+const PKG = JSON.parse(readFileSync(new URL('../package.json', import.meta.url), 'utf8'));
+export const APP_VERSION = PKG.version;
+export const PROJECT_URL = PKG.homepage || 'https://github.com/techysy/CreditDaddy';

package/src/daemon.js

@@ -56,11 +56,12 @@ import { readWorkbuddySessions, writeWorkbuddySession, workbuddyAuthDir, current
 import { liveToAccount as zcodeLiveAccount, switchTo as zcodeSwitchTo, currentZcodeUid, currentZcodeIdentity, detectZcode, ensureVirtualDeviceMid, terminateZcode, zcodeRunning } from './zcodeLocal.js';
 import { liveToAccount as mirasimLiveAccount, switchTo as mirasimSwitchTo, currentMirasimUid, detectMirasim, terminateMirasim, mirasimRunning } from './mirasimLocal.js';
 import { liveToAccount as catpawLiveAccount, switchTo as catpawSwitchTo, currentCatpawToken, detectCatpaw, terminateCatpaw } from './catpawLocal.js';
-import { fetchClaimPlans, claimPlan, fetchCaptchaConfig, proxyFirst, setProxyFirst, proxyUrl, setProxyUrl, autoClaimEnabled, autoClaimUntil, setAutoClaimEnabled } from './zcodeClient.js';
+import { liveToAccount as traeLiveAccount, detectTrae, switchTo as traeSwitchTo, snapshotLive as traeSnapshotLive } from './traeLocal.js';
+import { fetchClaimPlans, claimPlan, fetchCaptchaConfig, proxyFirst, setProxyFirst, proxyUrl, setProxyUrl, autoClaimEnabled, autoClaimUntil, setAutoClaimEnabled, claimIntervalMin, setClaimIntervalMin, claimWindowMin, setClaimWindowMin } from './zcodeClient.js';
 import { exportAccounts, parseImport, TransferError } from './transfer.js';
 import { syncAccountsTo10r } from './tenrouterAccounts.js';
-import { runCheckinTick, getSchedulerInfo, dayKey, enableZcodeAutoClaimForOneHour, refreshZcodeScheduler, pollZcodeNow } from './checkin.js';
-import { detectQoderApps, readQoderAppAccounts, riskIdentityAvailable, riskIdentitySource } from './qoderApp.js';
+import { runCheckinTick, getSchedulerInfo, dayKey, enableZcodeAutoClaimWindow, refreshZcodeScheduler, pollZcodeNow } from './checkin.js';
+import { detectQoderApps, readQoderAppAccounts, riskIdentityAvailable, riskIdentitySource, switchTo as qoderSwitchTo, qoderRunning, terminateQoder } from './qoderApp.js';
 import { umidInfo, installUmid } from './qoderUmid.js';
 import * as tenrouter from './tenrouter.js';
 import * as zcodeGateway from './zcodeGateway.js';
@@ -68,7 +69,7 @@ import { startDeviceFlow, pollDeviceFlow, LOGIN_KINDS } from './authDevice.js';
 import { detectInstalls, scanLocalTokens, putCandidate, peekCandidate } from './localDetect.js';
 import { PROVIDER_LABEL, APP_VERSION, PROVIDERS, PROJECT_URL } from './constants.js';
 
-const PRODUCT_IDS = ['qoder', 'workbuddy', 'zcode', 'mirasim', 'catpaw'];
+const PRODUCT_IDS = ['qoder', 'workbuddy', 'zcode', 'mirasim', 'catpaw', 'trae'];
 
 /** 面板访问密码：面板「设置」写入的 settings.json.panelKey 优先（可设 / 可关）；
  *  未设置（或被面板关闭）时回退环境变量 CREDITDADDY_PASSWORD（fnOS / 命令行部署注入），
@@ -88,6 +89,22 @@ const DEFAULT_PORT = 47860;
 const MAX_BODY_BYTES = 2 * 1024 * 1024;
 const LOOPBACK_HOSTS = new Set(['127.0.0.1', 'localhost', '::1', '[::1]']);
 
+// Qoder 当前登录缓存：面板 30s 一轮 status，DPAPI 解密结果没必要每轮重算
+let qoderCurCache = { at: 0, data: null };
+async function qoderCurrentInfo() {
+  if (qoderCurCache.data && Date.now() - qoderCurCache.at < 60_000) return qoderCurCache.data;
+  const data = { apps: detectQoderApps(), uids: {}, backfill: [] };
+  try {
+    const r = await readQoderAppAccounts();
+    for (const c of r.accounts) {
+      data.uids[c.provider] = c.user.id || null;
+      if (c.user.id) data.backfill.push({ provider: c.provider, uid: c.user.id, authJson: c.authJson, file: c.file });
+    }
+  } catch { /* 解密失败只留检测信息 */ }
+  qoderCurCache = { at: Date.now(), data };
+  return data;
+}
+
 class HttpError extends Error {
   constructor(status, message) { super(message); this.status = status; }
 }
@@ -350,9 +367,19 @@ async function handleApi(req, res, url) {
   if (p === '/api/zcode-gateway' && method === 'PUT') {
     const body = await readBody(req).catch(() => ({}));
     if (body?.enabled !== undefined) await zcodeGateway.setGatewayEnabled(body.enabled === true);
-    if (body?.lan !== undefined) {
-      await (await import('./store.js')).saveSettings({ zcodeGatewayLan: body.lan === true });
-      logger.info('DAEMON', `ZCode 网关局域网访问：${body.lan === true ? '开（重启后绑定 0.0.0.0）' : '关（仅本机）'}`);
+    if (body?.lan !== undefined || body?.allow !== undefined) {
+      const patch = {};
+      if (body?.lan !== undefined) patch.zcodeGatewayLan = body.lan === true;
+      if (body?.allow !== undefined) {
+        if (!Array.isArray(body.allow)) return json(res, 400, { error: 'allow 需为字符串数组' });
+        const cleaned = [...new Set(body.allow.map((x) => String(x || '').trim()).filter(Boolean))];
+        if (cleaned.some((x) => /[^\w.*:-]/.test(x))) return json(res, 400, { error: '白名单条目只能是 IP / 主机名（支持 192.168.31.* 通配）' });
+        patch.zcodeGatewayAllow = cleaned;
+      }
+      await (await import('./store.js')).saveSettings(patch);
+      const lanNow = patch.zcodeGatewayLan ?? (await (await import('./store.js')).loadSettings()).zcodeGatewayLan === true;
+      const allowText = patch.zcodeGatewayAllow ? patch.zcodeGatewayAllow.join(', ') : '';
+      logger.info('DAEMON', `ZCode 网关局域网：${lanNow ? '开' : '关（仅本机）'}${allowText ? `，白名单：${allowText}` : ''}（绑定改动重启后生效）`);
     }
     return json(res, 200, await zcodeGateway.gatewayStatus());
   }
@@ -360,21 +387,33 @@ async function handleApi(req, res, url) {
     const u = proxyUrl();
     const masked = u ? (() => { try { const x = new URL(u); x.password = x.password ? '*'.repeat(4) : ''; return x.toString(); } catch { return '***'; } })() : null;
     const ac = autoClaimEnabled();
-    return json(res, 200, { proxyFirst: proxyFirst(), proxyUrlMasked: masked, autoClaim: ac, autoClaimUntil: ac ? autoClaimUntil() : null, hasEnvProxy: Boolean(process.env.HTTPS_PROXY || process.env.https_proxy || process.env.HTTP_PROXY || process.env.http_proxy) });
+    return json(res, 200, {
+      proxyFirst: proxyFirst(), proxyUrlMasked: masked,
+      autoClaim: ac, autoClaimUntil: ac ? autoClaimUntil() : null,
+      claimIntervalMin: claimIntervalMin(), claimWindowMin: claimWindowMin(),
+      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(() => ({}));
     try {
       if (body?.proxyFirst !== undefined) setProxyFirst(body.proxyFirst === true);
       if (body?.proxyUrl !== undefined) setProxyUrl(body.proxyUrl);
+      // 自动领取计划（轮询周期 / 运行时长）先落盘，再按新配置启动
+      if (body?.claimIntervalMin !== undefined) setClaimIntervalMin(body.claimIntervalMin);
+      if (body?.claimWindowMin !== undefined) setClaimWindowMin(body.claimWindowMin);
+      if (body?.claimIntervalMin !== undefined || body?.claimWindowMin !== undefined) refreshZcodeScheduler();
       if (body?.autoClaim !== undefined) {
-        if (body.autoClaim === true) enableZcodeAutoClaimForOneHour();   // 开 = 开启 1 小时时段（2 分钟后首轮，之后每 ~2 分钟）
+        if (body.autoClaim === true) enableZcodeAutoClaimWindow();       // 开 = 按「自动领取计划」启动（2 分钟后首轮）
         else { setAutoClaimEnabled(false); refreshZcodeScheduler(); }    // 关 = 立即停表
       }
     } catch (e) { return json(res, 400, { error: e.message }); }
     const ac = autoClaimEnabled();
-    logger.info('DAEMON', `ZCode 出口：${proxyFirst() ? '代理优先' : '直连优先'}，自动领取：${ac ? '开' : '关'}，代理 ${proxyUrl() || '(环境变量/未设置)'}`);
-    return json(res, 200, { proxyFirst: proxyFirst(), autoClaim: ac, autoClaimUntil: ac ? autoClaimUntil() : null });
+    logger.info('DAEMON', `ZCode 出口：${proxyFirst() ? '代理优先' : '直连优先'}，自动领取：${ac ? `开（每 ${claimIntervalMin()} 分钟，${claimWindowMin() > 0 ? `运行 ${claimWindowMin()} 分钟` : '一直运行'}）` : '关'}，代理 ${proxyUrl() || '(环境变量/未设置)'}`);
+    return json(res, 200, {
+      proxyFirst: proxyFirst(), autoClaim: ac, autoClaimUntil: ac ? autoClaimUntil() : null,
+      claimIntervalMin: claimIntervalMin(), claimWindowMin: claimWindowMin(),
+    });
   }
 
   // 切换 WorkBuddy / ZCode 客户端当前登录账号
@@ -457,7 +496,55 @@ async function handleApi(req, res, url) {
         return json(res, e.catpawRunning ? 409 : 400, { error: e.message, code: e.catpawRunning ? 'CATPAW_RUNNING' : undefined });
       }
     }
-    if (!target.provider.startsWith('workbuddy')) return json(res, 400, { error: '只有 WorkBuddy / ZCode / mirasim / 妙手 账号支持切换' });
+    if (target.provider === 'qoder' || target.provider === 'qoder-cn') {
+      // 防丢号：先把本机当前登录的最新 auth 快照回写账号库（客户端会静默刷新 token，旧快照可能已失效），再覆盖
+      try {
+        const lr = await readQoderAppAccounts();
+        const live = lr.accounts.find((c) => c.provider === target.provider);
+        if (live && live.user.id && String(live.user.id) !== String(target.uid)) {
+          await addAccount({
+            provider: live.provider, token: live.token, name: live.user.name || live.user.email,
+            uid: live.user.id, email: live.user.email, refreshToken: live.refreshToken, expiresAt: live.expiresAt,
+            source: 'local-app', meta: { qoderAuth: live.authJson, qoderAuthFile: live.file },
+          }, { trusted: true }).catch((e) => logger.warn('DAEMON', '同步 Qoder 当前登录失败：' + e.message));
+        }
+      } catch (e) { logger.warn('DAEMON', '读取 Qoder 当前登录失败：' + e.message); }
+      try {
+        // 强制切换：先关掉运行中的 Qoder，否则它退出时会把内存里的旧登录覆盖回文件
+        let closedClient = false;
+        if (body?.force === true) {
+          const t = terminateQoder();
+          closedClient = t.closed === true;
+          if (closedClient) logger.info('DAEMON', '已关闭 Qoder 客户端（强制切换）');
+          else if (t.running) logger.warn('DAEMON', '未能完全结束 Qoder 进程，继续强制切换');
+        }
+        const r = await qoderSwitchTo(target, { force: body?.force === true });
+        logger.info('DAEMON', r.alreadyActive ? `Qoder 当前已是 ${target.name || target.id}` : `Qoder 已切换到 ${target.name || target.id}（重新打开 Qoder 生效）`);
+        return json(res, 200, { ok: true, closedClient, ...r });
+      } catch (e) {
+        return json(res, e.qoderRunning ? 409 : 400, { error: e.message, code: e.qoderRunning ? 'QODER_RUNNING' : undefined });
+      }
+    }
+    if (target.provider === 'trae') {
+      // 防丢号：先把 Trae 当前登录同步进账号库并建快照，再覆盖成目标账号的登录态
+      try {
+        const live = await traeLiveAccount();
+        if (live && live.token !== target.token) {
+          await addAccount(live, { trusted: true }).catch((e) => logger.warn('DAEMON', '同步 Trae 当前登录失败：' + e.message));
+          traeSnapshotLive();
+        }
+      } catch (e) {}
+      try {
+        // 退进程交给 switchTo：它要先确认目标有快照才会动手，避免「白关一次 Trae」
+        const r = await traeSwitchTo(target, { force: body?.force === true });
+        if (r.closedClient) logger.info('DAEMON', '已关闭 Trae 客户端（强制切换）');
+        logger.info('DAEMON', r.alreadyActive ? `Trae 当前已是 ${target.name || target.id}` : `Trae 已切换到 ${target.name || target.id}（重新打开客户端生效）`);
+        return json(res, 200, { ok: true, ...r });
+      } catch (e) {
+        return json(res, e.traeRunning ? 409 : 400, { error: e.message, code: e.traeRunning ? 'TRAE_RUNNING' : undefined });
+      }
+    }
+    if (!target.provider.startsWith('workbuddy')) return json(res, 400, { error: '只有 WorkBuddy / ZCode / mirasim / 妙手 / Trae 账号支持切换' });
     // 先把客户端当前会话的最新 token 收回账号库，避免被覆盖后丢失
     const cur = readWorkbuddySessions().accounts.find((a) => a.current);
     if (cur && cur.uid !== target.uid) {
@@ -522,7 +609,7 @@ async function handleApi(req, res, url) {
 
   // ── 本机检测 / 凭据扫描 ──
   if (p === '/api/local/detect' && method === 'GET') {
-    return json(res, 200, { apps: detectQoderApps(), workbuddyDir: workbuddyAuthDir(), zcode: detectZcode(), mirasim: detectMirasim(), catpaw: detectCatpaw(), legacy: detectInstalls() });
+    return json(res, 200, { apps: detectQoderApps(), workbuddyDir: workbuddyAuthDir(), zcode: detectZcode(), mirasim: detectMirasim(), catpaw: detectCatpaw(), trae: detectTrae(), legacy: detectInstalls() });
   }
   if (p === '/api/local/scan' && method === 'POST') {
     const existing = await loadAccounts();
@@ -548,6 +635,8 @@ async function handleApi(req, res, url) {
       addRecord({
         provider: c.provider, token: c.token, name: c.user.name || c.user.email, uid: c.user.id, email: c.user.email,
         refreshToken: c.refreshToken, expiresAt: c.expiresAt, source: 'local-app',
+        // 存整份解密后的 auth.v1.dat：切换时要原样写回（里面除 token 还有客户端读的其它字段）
+        meta: { qoderAuth: c.authJson, qoderAuthFile: c.file },
       }, { source: c.source });
     }
     // 2) WorkBuddy 客户端：当前会话 + 历史会话
@@ -575,7 +664,12 @@ async function handleApi(req, res, url) {
       const cp = await catpawLiveAccount();
       if (cp) addRecord(cp, { source: '妙手当前登录', current: true });
     } catch (e) { errors.push({ file: 'catpaw-moon/catx-credential.json', error: e.message }); }
-    // 6) 旧版 VS Code 系 Qoder IDE / CLI：明文 token 扫描（归属需用户选择）
+    // 6) Trae 客户端：解密 <userData>\User\globalStorage\storage.json 的 tc 信封当前登录
+    try {
+      const tr = await traeLiveAccount();
+      if (tr) addRecord(tr, { source: 'Trae 当前登录', current: true });
+    } catch (e) { errors.push({ file: 'TRAE SOLO CN/User/globalStorage/storage.json', error: e.message }); }
+    // 7) 旧版 VS Code 系 Qoder IDE / CLI：明文 token 扫描（归属需用户选择）
     const det = detectInstalls();
     const dirs = det.ideDataDirs.filter(d => d.exists).map(d => d.path);
     if (det.cliDir.exists) dirs.push(det.cliDir.path);
@@ -598,6 +692,8 @@ async function handleApi(req, res, url) {
       { trusted: Boolean(cand.record) },
     );
     if (duplicate && !updated) return json(res, 409, { error: '该账号已存在，信息已是最新' });
+    // Trae 的登录态是 15 项文件快照而非单个凭据文件，导入时就建一次快照，否则该账号不可切换
+    if (account.provider === 'trae') traeSnapshotLive();
     logger.info('DAEMON', (updated ? '已用本机凭据更新：' : '从本机导入账号：') + (account.name || account.id));
     return json(res, updated ? 200 : 201, { account: publicAccount(account), updated });
   }
@@ -673,8 +769,24 @@ async function handleApi(req, res, url) {
   if (p === '/api/status' && method === 'GET') {
     const accounts = await loadAccounts();
     const state = await loadState();
+    // Qoder 当前登录（面板轮询每 30s 打一次，DPAPI 解密结果缓存 1 分钟）
+    const qoder = await qoderCurrentInfo();
+    // 旧账号没赶上「整份 auth 快照」的导入：本机 Qoder 有登录且账号库里有缺快照的同 uid 账号时，顺手回填（可逆、只在缺失时发生）
+    const needBackfill = qoder.backfill.length
+      && accounts.some((a) => (a.provider === 'qoder' || a.provider === 'qoder-cn')
+        && a.uid && !a.meta?.qoderAuth
+        && qoder.backfill.some((b) => b.provider === a.provider && String(b.uid) === String(a.uid)));
+    if (needBackfill) {
+      await withAccounts((list) => {
+        for (const b of qoder.backfill) {
+          const cur = list.find((a) => a.provider === b.provider && a.uid && b.uid && String(a.uid) === String(b.uid) && !a.meta?.qoderAuth);
+          if (cur) cur.meta = { ...(cur.meta || {}), qoderAuth: b.authJson, qoderAuthFile: b.file };
+        }
+      }).catch((e) => logger.warn('DAEMON', '回填 Qoder 登录快照失败：' + e.message));
+    }
     // 妙手凭据文件只存 token：当前登录按 token 对齐账号库，避免每轮状态都打网关查 uid
     const cpToken = currentCatpawToken();
+    const traeDet = detectTrae();
     return json(res, 200, {
       ok: true,
       app: 'CreditDaddy',
@@ -690,6 +802,8 @@ async function handleApi(req, res, url) {
       umid: umidInfo(),
       platform: process.platform,
       workbuddyCurrentUid: currentWorkbuddyUid(),
+      qoderCurrent: qoder.uids,
+      qoderClient: { installed: qoder.apps.some((x) => x.installed), signedIn: qoder.apps.some((x) => x.signedIn), running: qoderRunning() },
       zcodeCurrentUid: currentZcodeUid(),
       zcodeCurrentIdentity: currentZcodeIdentity(),
       zcodeClient: (() => { const d = detectZcode(); return { installed: d.exists, signedIn: d.signedIn, running: zcodeRunning() }; })(),
@@ -697,6 +811,8 @@ async function handleApi(req, res, url) {
       mirasimClient: (() => { const d = detectMirasim(); return { installed: d.clientInstalled, signedIn: d.signedIn, running: d.running }; })(),
       catpawCurrentUid: (cpToken && accounts.find((a) => a.provider === 'catpaw' && a.token === cpToken)?.uid) || null,
       catpawClient: (() => { const d = detectCatpaw(); return { installed: d.clientInstalled, signedIn: d.signedIn, running: d.running }; })(),
+      traeCurrentUid: traeDet.uid,
+      traeClient: { installed: traeDet.clientInstalled, signedIn: traeDet.signedIn, running: traeDet.running },
       keyRequired: Boolean(PANEL_KEY),
     });
   }