creditdaddy 1.1.1 → 1.2.0

package/bin/creditdaddy.js

@@ -17,7 +17,7 @@ import { logger } from '../src/logger.js';
 const args = process.argv.slice(2);
 const cmd = args[0] || 'daemon';
 
-const HELP = `CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 多账号管理 + 每日积分自动领取
+const HELP = `CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 / Trae 多账号管理 + 每日积分自动领取
 
 用法:
   creditdaddy daemon [--port 47860] [--host 127.0.0.1]   启动守护进程 + Web 面板
@@ -29,7 +29,7 @@ const HELP = `CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 多
   creditdaddy export [file.json] --password 口令 [--cn|--intl]
                                                         导出账号（口令必填，至少 4 位；与 10router 迁移文件互通）
   creditdaddy import <file.json> [--password 口令]        导入 CreditDaddy / 10router 导出文件
-  creditdaddy scan                                       导入本机 Qoder / WorkBuddy / ZCode / mirasim / 妙手 客户端已登录的账号
+  creditdaddy scan                                       导入本机 Qoder / WorkBuddy / ZCode / mirasim / 妙手 / Trae 客户端已登录的账号
   creditdaddy umid [install|remove]                      Qoder 设备身份组件（Linux / fnOS 国际版领取用）
   creditdaddy logs                                       查看领取状态
   creditdaddy help                                       显示本帮助`;
@@ -138,6 +138,7 @@ async function main() {
       const { liveToAccount: zcodeLive } = await import('../src/zcodeLocal.js');
       const { liveToAccount: mirasimLive } = await import('../src/mirasimLocal.js');
       const { liveToAccount: catpawLive } = await import('../src/catpawLocal.js');
+      const { liveToAccount: traeLive } = await import('../src/traeLocal.js');
       const { addAccount } = await import('../src/accounts.js');
       const qa = await readQoderAppAccounts();
       const wb = readWorkbuddySessions();
@@ -148,10 +149,12 @@ async function main() {
       try { miraAccount = await mirasimLive(); } catch (e) { skipped.push({ file: '~/.mirasim/setting.json', error: e.message }); }
       let cpAccount = null;
       try { cpAccount = await catpawLive(); } catch (e) { skipped.push({ file: 'catpaw-moon/catx-credential.json', error: e.message }); }
+      let traeAccount = null;
+      try { traeAccount = await traeLive(); } catch (e) { skipped.push({ file: 'TRAE SOLO CN/User/globalStorage/storage.json', error: e.message }); }
       const records = [
         ...qa.accounts.map((c) => ({
           label: c.source,
-          rec: { 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' },
+          rec: { 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', meta: { qoderAuth: c.authJson, qoderAuthFile: c.file } },
         })),
         ...wb.accounts.map(({ file: _f, fileTime: _t, current, source, ...rec }) => ({
           label: source, rec: { ...rec, source: current ? 'workbuddy-current' : 'workbuddy-history' },
@@ -159,9 +162,10 @@ async function main() {
         ...(zAccount ? [{ label: 'ZCode 当前登录', rec: zAccount }] : []),
         ...(miraAccount ? [{ label: 'mirasim 当前登录', rec: miraAccount }] : []),
         ...(cpAccount ? [{ label: '妙手当前登录', rec: cpAccount }] : []),
+        ...(traeAccount ? [{ label: 'Trae 当前登录', rec: traeAccount }] : []),
       ];
       for (const e of [...qa.errors, ...wb.errors, ...skipped]) console.log('⚠', e.file, e.error);
-      if (!records.length) { console.log('（本机 Qoder / WorkBuddy / ZCode / mirasim / 妙手 客户端未登录或未安装）'); break; }
+      if (!records.length) { console.log('（本机 Qoder / WorkBuddy / ZCode / mirasim / 妙手 / Trae 客户端未登录或未安装）'); break; }
       for (const { label, rec } of records) {
         const r = await addAccount(rec, { trusted: true });
         console.log(r.duplicate ? (r.updated ? '↻ 已更新' : '· 已存在') : '✓ 已导入', r.account.name || r.account.id, `（${label}）`);

package/package.json

@@ -1,28 +1,29 @@
-{
-  "name": "creditdaddy",
-  "version": "1.1.1",
-  "description": "CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim 多账号本地管理与每日积分自动签到助手",
-  "homepage": "https://github.com/techysy/CreditDaddy",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/techysy/CreditDaddy.git"
-  },
-  "type": "module",
-  "bin": {
-    "creditdaddy": "bin/creditdaddy.js"
-  },
-  "files": [
-    "bin",
-    "src",
-    "README.md",
-    "LICENSE"
-  ],
-  "engines": {
-    "node": ">=20"
-  },
-  "scripts": {
-    "start": "node bin/creditdaddy.js daemon",
-    "test": "node --test"
-  },
-  "license": "MIT"
-}
+{
+  "name": "creditdaddy",
+  "version": "1.2.0",
+  "description": "CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 / Trae 多账号本地管理与每日积分自动签到助手",
+  "homepage": "https://github.com/techysy/CreditDaddy",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/techysy/CreditDaddy.git"
+  },
+  "type": "module",
+  "bin": {
+    "creditdaddy": "bin/creditdaddy.js"
+  },
+  "files": [
+    "bin",
+    "src",
+    "README.md",
+    "LICENSE"
+  ],
+  "engines": {
+    "node": ">=20"
+  },
+  "scripts": {
+    "start": "node bin/creditdaddy.js daemon",
+    "test": "node --test",
+    "release-check": "bash scripts/release-check.sh"
+  },
+  "license": "MIT"
+}

package/src/accounts.js

@@ -1,161 +1,161 @@
-/**
- * 账号新增 / 导入的统一入口 — daemon、CLI、设备码登录、本机导入、文件导入共用。
- *
- * 网络校验（userinfo）在锁外完成；去重 + 入库在 withAccounts 串行队列内完成，
- * 并发请求（如签到轮与添加账号同时发生）不会互相覆盖。
- * 同一 provider 下 uid 相同但 token 不同 → 视为 token 续期，原地更新而不是新增。
- */
-
-import { normalizeAccountInput, findDuplicate, loadAccounts, withAccounts, loadSettings, saveSettings } from './store.js';
-import { productImpl, displayNameFrom } from './providers.js';
-
-export { displayNameFrom };
-
-/**
- * 若该 Qoder 账号有 uid 但还没有网页会话（逐资源包明细用），从 settings 的暂存区取货挂上。
- * 暂存区由桌面版登录窗口写入（会话可能先于账号入库出现）。返回是否有变化。
- */
-async function attachPendingWebSession(target) {
-  if (!String(target.provider || '').startsWith('qoder') || !target.uid) return false;
-  if (target.meta?.qoderWebSession) return false;
-  const pending = (await loadSettings()).pendingQoderWebSessions || {};
-  const item = pending[target.uid];
-  if (!item || item.kind !== target.provider || !item.cookie) return false;
-  const { [target.uid]: _used, ...rest } = pending;
-  await saveSettings({ pendingQoderWebSessions: rest });
-  target.meta = { ...(target.meta || {}), qoderWebSession: { cookie: item.cookie, capturedAt: item.capturedAt || new Date().toISOString() } };
-  return true;
-}
-
-/**
- * 用新记录刷新已存在账号（保留 id / 名字 / 签到记录）：
- *   token 不同 → 续期（换 token + 凭据元数据）；token 相同 → 只补全缺失的 uid / 邮箱 / 有效期 / refreshToken
- * 返回是否有变化。
- */
-function refreshExisting(existing, incoming) {
-  let changed = false;
-  const set = (k, v) => { if (v && existing[k] !== v) { existing[k] = v; changed = true; } };
-  if (existing.token !== incoming.token) {
-    set('token', incoming.token);
-    set('refreshToken', incoming.refreshToken);
-    set('expiresAt', incoming.expiresAt);
-    if (incoming.verified !== undefined) existing.verified = incoming.verified;
-    // 换上了新凭据：旧 token 留下的失败结果（如「登录已失效，请重新登录」）不再成立，
-    // 否则卡片会一直显示旧错误，直到下一次签到才被覆盖
-    if (existing.lastResult?.status === 'failed') { existing.lastResult = null; changed = true; }
-    if (existing.verifyError) { delete existing.verifyError; changed = true; }
-  } else {
-    if (!existing.refreshToken) set('refreshToken', incoming.refreshToken);
-    if (!existing.expiresAt) set('expiresAt', incoming.expiresAt);
-  }
-  if (!existing.uid) set('uid', incoming.uid);
-  if (!existing.email) set('email', incoming.email);
-  // 产品元数据（如 WorkBuddy 会话 / 域名）以最新导入为准
-  const incomingMeta = incoming.meta && Object.keys(incoming.meta).length ? incoming.meta : null;
-  if (incomingMeta && JSON.stringify({ ...existing.meta, ...incomingMeta }) !== JSON.stringify(existing.meta || {})) {
-    existing.meta = { ...(existing.meta || {}), ...incomingMeta };
-    changed = true;
-  }
-  if (changed) existing.updatedAt = new Date().toISOString();
-  return changed;
-}
-
-/** 在锁内合并一条记录：新增 / 续期 / 重复；顺带挂上暂存的 Qoder 网页会话 */
-async function mergeInto(accounts, account) {
-  const dup = findDuplicate(accounts, account.provider, account.token, account.uid);
-  if (!dup) {
-    await attachPendingWebSession(account);
-    accounts.push(account);
-    return { account, duplicate: false, updated: false };
-  }
-  const refreshed = refreshExisting(dup, account);
-  const attached = await attachPendingWebSession(dup);
-  return { account: dup, duplicate: true, updated: refreshed || attached };
-}
-
-/**
- * 新增一个账号。
- * @param {{name?, provider, token, uid?, email?, refreshToken?, expiresAt?, source?}} input
- * @param {{verify?: boolean, trusted?: boolean}} opts
- *   verify  调用 userinfo 校验 token 并补全昵称 / uid / 邮箱（默认 true，失败仍会保存）
- *   trusted token 来源已可信（如设备码登录、本机客户端），直接标记 verified
- * @returns {Promise<{account, duplicate: boolean, updated: boolean}>}
- *   duplicate=true 时 account 为已存在的记录；updated=true 表示已用新 token 续期
- */
-export async function addAccount(input, { verify = true, trusted = false } = {}) {
-  const account = normalizeAccountInput(input);
-
-  // 先快速查重：完全相同的 token 无需再发网络请求（只在锁内补全缺失的元数据）
-  const existing = findDuplicate(await loadAccounts(), account.provider, account.token);
-  if (existing && existing.token === account.token) return withAccounts((accounts) => mergeInto(accounts, account));
-
-  if (trusted) {
-    account.verified = true;
-  } else if (verify) {
-    try {
-      const info = await productImpl(account.provider).verify(account);
-      if (!account.name && info.name) account.name = info.name;
-      if (!account.uid && info.uid) account.uid = info.uid;
-      if (!account.email && info.email) account.email = info.email;
-      account.verified = true;
-    } catch (e) {
-      account.verified = false;
-      account.verifyError = e.message;
-    }
-  }
-
-  return withAccounts((accounts) => mergeInto(accounts, account));
-}
-
-/**
- * 批量导入（已解析的记录数组，见 transfer.parseImport），不做网络校验。
- * @returns {Promise<{added, updated, skipped}>}
- */
-export function importAccounts(list) {
-  return withAccounts(async (accounts) => {
-    let added = 0, updated = 0, skipped = 0;
-    for (const item of list) {
-      try {
-        const r = await mergeInto(accounts, normalizeAccountInput(item));
-        if (!r.duplicate) added++;
-        else if (r.updated) updated++;
-        else skipped++;
-      } catch { skipped++; }
-    }
-    return { added, updated, skipped };
-  });
-}
-
-/**
- * token 刷新后的回写上下文（传给 productImpl(...).checkin / quota 的 ctx）：
- * 新 token 立即写回账号库；若该账号正是 WorkBuddy 客户端当前登录的账号，同步写回客户端会话文件，
- * 避免客户端手里被轮换掉的旧 refreshToken 失效导致掉线。
- */
-export function refreshContext(account, log) {
-  return {
-    onRefresh: async (creds) => {
-      account.token = creds.token;
-      account.refreshToken = creds.refreshToken;
-      account.expiresAt = creds.expiresAt;
-      await withAccounts((accounts) => {
-        const cur = accounts.find((a) => a.id === account.id);
-        if (!cur) return;
-        cur.token = creds.token;
-        cur.refreshToken = creds.refreshToken;
-        cur.expiresAt = creds.expiresAt;
-        if (creds.refreshExpiresAt) cur.meta = { ...(cur.meta || {}), refreshExpiresAt: creds.refreshExpiresAt };
-        cur.updatedAt = new Date().toISOString();
-      });
-      log?.('token 已刷新');
-      if (account.provider.startsWith('workbuddy')) {
-        const { currentWorkbuddyUid, writeWorkbuddySession } = await import('./workbuddyLocal.js');
-        try {
-          if (account.uid && currentWorkbuddyUid() === account.uid) {
-            writeWorkbuddySession(account);
-            log?.('已同步新 token 到 WorkBuddy 客户端');
-          }
-        } catch (e) { log?.('同步到 WorkBuddy 客户端失败：' + e.message); }
-      }
-    },
-  };
-}
+/**
+ * 账号新增 / 导入的统一入口 — daemon、CLI、设备码登录、本机导入、文件导入共用。
+ *
+ * 网络校验（userinfo）在锁外完成；去重 + 入库在 withAccounts 串行队列内完成，
+ * 并发请求（如签到轮与添加账号同时发生）不会互相覆盖。
+ * 同一 provider 下 uid 相同但 token 不同 → 视为 token 续期，原地更新而不是新增。
+ */
+
+import { normalizeAccountInput, findDuplicate, loadAccounts, withAccounts, loadSettings, saveSettings } from './store.js';
+import { productImpl, displayNameFrom } from './providers.js';
+
+export { displayNameFrom };
+
+/**
+ * 若该 Qoder 账号有 uid 但还没有网页会话（逐资源包明细用），从 settings 的暂存区取货挂上。
+ * 暂存区由桌面版登录窗口写入（会话可能先于账号入库出现）。返回是否有变化。
+ */
+async function attachPendingWebSession(target) {
+  if (!String(target.provider || '').startsWith('qoder') || !target.uid) return false;
+  if (target.meta?.qoderWebSession) return false;
+  const pending = (await loadSettings()).pendingQoderWebSessions || {};
+  const item = pending[target.uid];
+  if (!item || item.kind !== target.provider || !item.cookie) return false;
+  const { [target.uid]: _used, ...rest } = pending;
+  await saveSettings({ pendingQoderWebSessions: rest });
+  target.meta = { ...(target.meta || {}), qoderWebSession: { cookie: item.cookie, capturedAt: item.capturedAt || new Date().toISOString() } };
+  return true;
+}
+
+/**
+ * 用新记录刷新已存在账号（保留 id / 名字 / 签到记录）：
+ *   token 不同 → 续期（换 token + 凭据元数据）；token 相同 → 只补全缺失的 uid / 邮箱 / 有效期 / refreshToken
+ * 返回是否有变化。
+ */
+function refreshExisting(existing, incoming) {
+  let changed = false;
+  const set = (k, v) => { if (v && existing[k] !== v) { existing[k] = v; changed = true; } };
+  if (existing.token !== incoming.token) {
+    set('token', incoming.token);
+    set('refreshToken', incoming.refreshToken);
+    set('expiresAt', incoming.expiresAt);
+    if (incoming.verified !== undefined) existing.verified = incoming.verified;
+    // 换上了新凭据：旧 token 留下的失败结果（如「登录已失效，请重新登录」）不再成立，
+    // 否则卡片会一直显示旧错误，直到下一次签到才被覆盖
+    if (existing.lastResult?.status === 'failed') { existing.lastResult = null; changed = true; }
+    if (existing.verifyError) { delete existing.verifyError; changed = true; }
+  } else {
+    if (!existing.refreshToken) set('refreshToken', incoming.refreshToken);
+    if (!existing.expiresAt) set('expiresAt', incoming.expiresAt);
+  }
+  if (!existing.uid) set('uid', incoming.uid);
+  if (!existing.email) set('email', incoming.email);
+  // 产品元数据（如 WorkBuddy 会话 / 域名）以最新导入为准
+  const incomingMeta = incoming.meta && Object.keys(incoming.meta).length ? incoming.meta : null;
+  if (incomingMeta && JSON.stringify({ ...existing.meta, ...incomingMeta }) !== JSON.stringify(existing.meta || {})) {
+    existing.meta = { ...(existing.meta || {}), ...incomingMeta };
+    changed = true;
+  }
+  if (changed) existing.updatedAt = new Date().toISOString();
+  return changed;
+}
+
+/** 在锁内合并一条记录：新增 / 续期 / 重复；顺带挂上暂存的 Qoder 网页会话 */
+async function mergeInto(accounts, account) {
+  const dup = findDuplicate(accounts, account.provider, account.token, account.uid);
+  if (!dup) {
+    await attachPendingWebSession(account);
+    accounts.push(account);
+    return { account, duplicate: false, updated: false };
+  }
+  const refreshed = refreshExisting(dup, account);
+  const attached = await attachPendingWebSession(dup);
+  return { account: dup, duplicate: true, updated: refreshed || attached };
+}
+
+/**
+ * 新增一个账号。
+ * @param {{name?, provider, token, uid?, email?, refreshToken?, expiresAt?, source?}} input
+ * @param {{verify?: boolean, trusted?: boolean}} opts
+ *   verify  调用 userinfo 校验 token 并补全昵称 / uid / 邮箱（默认 true，失败仍会保存）
+ *   trusted token 来源已可信（如设备码登录、本机客户端），直接标记 verified
+ * @returns {Promise<{account, duplicate: boolean, updated: boolean}>}
+ *   duplicate=true 时 account 为已存在的记录；updated=true 表示已用新 token 续期
+ */
+export async function addAccount(input, { verify = true, trusted = false } = {}) {
+  const account = normalizeAccountInput(input);
+
+  // 先快速查重：完全相同的 token 无需再发网络请求（只在锁内补全缺失的元数据）
+  const existing = findDuplicate(await loadAccounts(), account.provider, account.token);
+  if (existing && existing.token === account.token) return withAccounts((accounts) => mergeInto(accounts, account));
+
+  if (trusted) {
+    account.verified = true;
+  } else if (verify) {
+    try {
+      const info = await productImpl(account.provider).verify(account);
+      if (!account.name && info.name) account.name = info.name;
+      if (!account.uid && info.uid) account.uid = info.uid;
+      if (!account.email && info.email) account.email = info.email;
+      account.verified = true;
+    } catch (e) {
+      account.verified = false;
+      account.verifyError = e.message;
+    }
+  }
+
+  return withAccounts((accounts) => mergeInto(accounts, account));
+}
+
+/**
+ * 批量导入（已解析的记录数组，见 transfer.parseImport），不做网络校验。
+ * @returns {Promise<{added, updated, skipped}>}
+ */
+export function importAccounts(list) {
+  return withAccounts(async (accounts) => {
+    let added = 0, updated = 0, skipped = 0;
+    for (const item of list) {
+      try {
+        const r = await mergeInto(accounts, normalizeAccountInput(item));
+        if (!r.duplicate) added++;
+        else if (r.updated) updated++;
+        else skipped++;
+      } catch { skipped++; }
+    }
+    return { added, updated, skipped };
+  });
+}
+
+/**
+ * token 刷新后的回写上下文（传给 productImpl(...).checkin / quota 的 ctx）：
+ * 新 token 立即写回账号库；若该账号正是 WorkBuddy 客户端当前登录的账号，同步写回客户端会话文件，
+ * 避免客户端手里被轮换掉的旧 refreshToken 失效导致掉线。
+ */
+export function refreshContext(account, log) {
+  return {
+    onRefresh: async (creds) => {
+      account.token = creds.token;
+      account.refreshToken = creds.refreshToken;
+      account.expiresAt = creds.expiresAt;
+      await withAccounts((accounts) => {
+        const cur = accounts.find((a) => a.id === account.id);
+        if (!cur) return;
+        cur.token = creds.token;
+        cur.refreshToken = creds.refreshToken;
+        cur.expiresAt = creds.expiresAt;
+        if (creds.refreshExpiresAt) cur.meta = { ...(cur.meta || {}), refreshExpiresAt: creds.refreshExpiresAt };
+        cur.updatedAt = new Date().toISOString();
+      });
+      log?.('token 已刷新');
+      if (account.provider.startsWith('workbuddy')) {
+        const { currentWorkbuddyUid, writeWorkbuddySession } = await import('./workbuddyLocal.js');
+        try {
+          if (account.uid && currentWorkbuddyUid() === account.uid) {
+            writeWorkbuddySession(account);
+            log?.('已同步新 token 到 WorkBuddy 客户端');
+          }
+        } catch (e) { log?.('同步到 WorkBuddy 客户端失败：' + e.message); }
+      }
+    },
+  };
+}