creditdaddy 0.9.3 → 1.1.1

package/bin/creditdaddy.js

@@ -1,187 +1,205 @@
-#!/usr/bin/env node
-/**
- * CreditDaddy CLI
- *   creditdaddy daemon          启动守护进程（默认）
- *   creditdaddy add <token>     添加账号（--cn 国内版 --name 名字）
- *   creditdaddy list            查看账号
- *   creditdaddy checkin         立即领取全部账号
- *   creditdaddy remove <id>     删除账号
- *   creditdaddy export/import   导出/导入账号
- *   creditdaddy logs            查看领取状态（state.json）
- *   creditdaddy help            显示帮助
- */
-
-import { startDaemon } from '../src/daemon.js';
-import { logger } from '../src/logger.js';
-
-const args = process.argv.slice(2);
-const cmd = args[0] || 'daemon';
-
-const HELP = `CreditDaddy — Qoder / WorkBuddy / ZCode 多账号管理 + 每日积分自动领取
-
-用法:
-  creditdaddy daemon [--port 47860] [--host 127.0.0.1]   启动守护进程 + Web 面板
-  creditdaddy add <token> [--cn] [--name 名字]           添加 Qoder 账号（--cn 为国内版）
-  creditdaddy add <token> --workbuddy [--intl]           添加 WorkBuddy 账号（登录 token）
-  creditdaddy list                                       查看账号
-  creditdaddy checkin [--cn | --intl]                    立即领取
-  creditdaddy remove <id前缀>                             删除账号
-  creditdaddy export [file.json] [--password 口令] [--cn|--intl]
-                                                        导出账号；带口令则加密（与 10router 迁移文件互通）
-  creditdaddy import <file.json> [--password 口令]        导入 CreditDaddy / 10router 导出文件
-  creditdaddy scan                                       导入本机 Qoder / WorkBuddy / ZCode 客户端已登录的账号
-  creditdaddy umid [install|remove]                      Qoder 设备身份组件（Linux / fnOS 国际版领取用）
-  creditdaddy logs                                       查看领取状态
-  creditdaddy help                                       显示本帮助`;
-
-function flag(name) {
-  const i = args.indexOf(name);
-  return i >= 0 ? args[i + 1] : undefined;
-}
-
-async function main() {
-  switch (cmd) {
-    case 'daemon': {
-      const port = Number(flag('--port')) || Number(process.env.PORT) || undefined;
-      const host = flag('--host') || process.env.HOST || undefined;
-      await startDaemon(port, host);
-      const { startScheduler } = await import('../src/checkin.js');
-      startScheduler();
-      logger.info('CLI', '按 Ctrl+C 停止');
-      break;
-    }
-    case 'add': {
-      const token = args[1];
-      if (!token) { console.error('用法: creditdaddy add <token> [--cn] [--name 名字]'); process.exit(1); }
-      const { publicAccount } = await import('../src/store.js');
-      const { addAccount } = await import('../src/accounts.js');
-      const wbFlag = args.includes('--workbuddy');
-      const provider = wbFlag
-        ? (args.includes('--intl') ? 'workbuddy-intl' : 'workbuddy')
-        : (args.includes('--cn') ? 'qoder-cn' : 'qoder');
-      const { account, duplicate } = await addAccount({ token, provider, name: flag('--name') });
-      if (duplicate) { console.error('该账号已存在'); process.exit(1); }
-      console.log(account.verified ? '✓ token 校验通过' : '⚠ token 校验失败（仍会保存）：' + account.verifyError);
-      console.log('✓ 已添加：', JSON.stringify(publicAccount(account), null, 2));
-      break;
-    }
-    case 'list': {
-      const { loadAccounts, publicAccount } = await import('../src/store.js');
-      const accounts = await loadAccounts();
-      if (accounts.length === 0) return console.log('（还没有账号，用 creditdaddy add <token> 添加）');
-      for (const a of accounts) {
-        const p = publicAccount(a);
-        console.log(`[${p.id.slice(0, 8)}] ${(p.name || '(未命名)').padEnd(16)} ${p.provider.padEnd(14)} ${p.tokenMasked}  ${p.lastCheckin ? '上次领取 ' + p.lastCheckin.slice(0, 16) : '未领取'}`);
-      }
-      break;
-    }
-    case 'checkin': {
-      const { runCheckinTick } = await import('../src/checkin.js');
-      const provider = args.includes('--workbuddy')
-        ? (args.includes('--intl') ? 'workbuddy-intl' : 'workbuddy')
-        : args.includes('--cn') ? 'qoder-cn' : args.includes('--intl') ? 'qoder' : undefined;
-      const { summary, results } = await runCheckinTick({ provider, skipIfCheckedToday: false });
-      console.log(summary);
-      for (const r of results) {
-        console.log(`  ${r.status === 'checked-in' ? '✓' : r.status === 'failed' ? '✗' : '·'} ${r.account}（${r.provider}）${r.status === 'checked-in' ? ` +${r.claimedAmount} Credits` : r.error ? ' ' + r.error : r.message ? ' ' + r.message : ''}`);
-      }
-      break;
-    }
-    case 'remove': {
-      const id = args[1];
-      if (!id) { console.error('用法: creditdaddy remove <id前缀>（id 见 creditdaddy list）'); process.exit(1); }
-      const { withAccounts } = await import('../src/store.js');
-      const outcome = await withAccounts((accounts) => {
-        const matches = accounts.filter((a) => a.id.startsWith(id));
-        if (matches.length !== 1) return { count: matches.length };
-        accounts.splice(accounts.indexOf(matches[0]), 1);
-        return { count: 1, removed: matches[0] };
-      });
-      if (outcome.count === 0) { console.error('账号不存在'); process.exit(1); }
-      if (outcome.count > 1) { console.error(`id 前缀 "${id}" 匹配到 ${outcome.count} 个账号，请输入更长的前缀`); process.exit(1); }
-      console.log('✓ 已删除', outcome.removed.name || outcome.removed.id);
-      break;
-    }
-    case 'export': {
-      const { loadAccounts } = await import('../src/store.js');
-      const { exportAccounts } = await import('../src/transfer.js');
-      const out = args[1] && !args[1].startsWith('--') ? args[1] : 'creditdaddy-backup.json';
-      const password = flag('--password');
-      const provider = args.includes('--cn') ? 'qoder-cn' : args.includes('--intl') ? 'qoder' : undefined;
-      const { writeFileSync } = await import('node:fs');
-      writeFileSync(out, JSON.stringify(exportAccounts(await loadAccounts(), { password, provider }), null, 2), { mode: 0o600 });
-      console.log('✓ 已导出到', out, password ? '（已加密，10router 可直接导入）' : '（含明文 token，注意保管；加 --password 可加密）');
-      break;
-    }
-    case 'import': {
-      const file = args[1];
-      if (!file) { console.error('用法: creditdaddy import <file.json>'); process.exit(1); }
-      const { readFileSync } = await import('node:fs');
-      const { importAccounts } = await import('../src/accounts.js');
-      const { parseImport } = await import('../src/transfer.js');
-      const parsed = parseImport(JSON.parse(readFileSync(file, 'utf8')), { password: flag('--password') });
-      const r = await importAccounts(parsed.accounts);
-      console.log(`✓ 导入完成（来源 ${parsed.source}）：新增 ${r.added}，续期 ${r.updated}，跳过 ${r.skipped + parsed.skipped}`);
-      break;
-    }
-    case 'scan': {
-      const { readQoderAppAccounts } = await import('../src/qoderApp.js');
-      const { readWorkbuddySessions } = await import('../src/workbuddyLocal.js');
-      const { liveToAccount: zcodeLive } = await import('../src/zcodeLocal.js');
-      const { addAccount } = await import('../src/accounts.js');
-      const qa = await readQoderAppAccounts();
-      const wb = readWorkbuddySessions();
-      const zAccount = zcodeLive();
-      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' },
-        })),
-        ...wb.accounts.map(({ file: _f, fileTime: _t, current, source, ...rec }) => ({
-          label: source, rec: { ...rec, source: current ? 'workbuddy-current' : 'workbuddy-history' },
-        })),
-        ...(zAccount ? [{ label: 'ZCode 当前登录', rec: zAccount }] : []),
-      ];
-      for (const e of [...qa.errors, ...wb.errors]) console.log('⚠', e.file, e.error);
-      if (!records.length) { console.log('（本机 Qoder / WorkBuddy / ZCode 客户端未登录或未安装）'); 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}）`);
-      }
-      break;
-    }
-    case 'umid': {
-      const umid = await import('../src/qoderUmid.js');
-      const sub = args[1] || 'status';
-      if (sub === 'install') {
-        console.log('正在从 npm 下载官方 @qoder-ai/qodercli 并提取设备身份组件（约 30MB）…');
-        const m = await umid.installUmid();
-        console.log(`✓ 已安装：qodercli ${m.version} / ${m.arch}，Qoder 国际版领取可用`);
-      } else if (sub === 'remove') {
-        umid.removeUmid();
-        console.log('✓ 已移除设备身份组件');
-      } else {
-        const info = umid.umidInfo();
-        if (!info.supported) console.log('当前平台不需要该组件（Windows / macOS 使用 Qoder 客户端自带的 runtime-info）');
-        else if (info.installed) console.log(`已安装：qodercli ${info.installed.version} / ${info.installed.arch}（${info.installed.installedAt.slice(0, 10)}）`);
-        else console.log('未安装。运行 creditdaddy umid install 安装后即可领取 Qoder 国际版');
-      }
-      break;
-    }
-    case 'logs': {
-      const { loadState } = await import('../src/store.js');
-      console.log('数据目录状态:', JSON.stringify(await loadState(), null, 2));
-      break;
-    }
-    case 'help':
-    case '--help':
-    case '-h':
-      console.log(HELP);
-      break;
-    default:
-      console.error(`未知命令: ${cmd}\n\n${HELP}`);
-      process.exit(1);
-  }
-}
-
-main().catch((e) => { console.error('✗', e.message); process.exit(1); });
+#!/usr/bin/env node
+/**
+ * CreditDaddy CLI
+ *   creditdaddy daemon          启动守护进程（默认）
+ *   creditdaddy add <token>     添加账号（--cn 国内版 --name 名字）
+ *   creditdaddy list            查看账号
+ *   creditdaddy checkin         立即领取全部账号
+ *   creditdaddy remove <id>     删除账号
+ *   creditdaddy export/import   导出/导入账号
+ *   creditdaddy logs            查看领取状态（state.json）
+ *   creditdaddy help            显示帮助
+ */
+
+import { startDaemon } from '../src/daemon.js';
+import { logger } from '../src/logger.js';
+
+const args = process.argv.slice(2);
+const cmd = args[0] || 'daemon';
+
+const HELP = `CreditDaddy — Qoder / WorkBuddy / ZCode / mirasim / 妙手 多账号管理 + 每日积分自动领取
+
+用法:
+  creditdaddy daemon [--port 47860] [--host 127.0.0.1]   启动守护进程 + Web 面板
+  creditdaddy add <token> [--cn] [--name 名字]           添加 Qoder 账号（--cn 为国内版）
+  creditdaddy add <token> --workbuddy [--intl]           添加 WorkBuddy 账号（登录 token）
+  creditdaddy list                                       查看账号
+  creditdaddy checkin [--cn | --intl]                    立即领取
+  creditdaddy remove <id前缀>                             删除账号
+  creditdaddy export [file.json] --password 口令 [--cn|--intl]
+                                                        导出账号（口令必填，至少 4 位；与 10router 迁移文件互通）
+  creditdaddy import <file.json> [--password 口令]        导入 CreditDaddy / 10router 导出文件
+  creditdaddy scan                                       导入本机 Qoder / WorkBuddy / ZCode / mirasim / 妙手 客户端已登录的账号
+  creditdaddy umid [install|remove]                      Qoder 设备身份组件（Linux / fnOS 国际版领取用）
+  creditdaddy logs                                       查看领取状态
+  creditdaddy help                                       显示本帮助`;
+
+function flag(name) {
+  const i = args.indexOf(name);
+  return i >= 0 ? args[i + 1] : undefined;
+}
+
+async function main() {
+  switch (cmd) {
+    case 'daemon': {
+      const port = Number(flag('--port')) || Number(process.env.PORT) || undefined;
+      const host = flag('--host') || process.env.HOST || undefined;
+      await startDaemon(port, host);
+      const { startScheduler } = await import('../src/checkin.js');
+      startScheduler();
+      logger.info('CLI', '按 Ctrl+C 停止');
+      break;
+    }
+    case 'add': {
+      const token = args[1];
+      if (!token) { console.error('用法: creditdaddy add <token> [--cn] [--name 名字]'); process.exit(1); }
+      const { publicAccount } = await import('../src/store.js');
+      const { addAccount } = await import('../src/accounts.js');
+      const wbFlag = args.includes('--workbuddy');
+      const provider = wbFlag
+        ? (args.includes('--intl') ? 'workbuddy-intl' : 'workbuddy')
+        : (args.includes('--cn') ? 'qoder-cn' : 'qoder');
+      const { account, duplicate } = await addAccount({ token, provider, name: flag('--name') });
+      if (duplicate) { console.error('该账号已存在'); process.exit(1); }
+      console.log(account.verified ? '✓ token 校验通过' : '⚠ token 校验失败（仍会保存）：' + account.verifyError);
+      console.log('✓ 已添加：', JSON.stringify(publicAccount(account), null, 2));
+      break;
+    }
+    case 'list': {
+      const { loadAccounts, publicAccount } = await import('../src/store.js');
+      const accounts = await loadAccounts();
+      if (accounts.length === 0) return console.log('（还没有账号，用 creditdaddy add <token> 添加）');
+      for (const a of accounts) {
+        const p = publicAccount(a);
+        console.log(`[${p.id.slice(0, 8)}] ${(p.name || '(未命名)').padEnd(16)} ${p.provider.padEnd(14)} ${p.tokenMasked}  ${p.lastCheckin ? '上次领取 ' + p.lastCheckin.slice(0, 16) : '未领取'}`);
+      }
+      break;
+    }
+    case 'checkin': {
+      const { runCheckinTick } = await import('../src/checkin.js');
+      const provider = args.includes('--workbuddy')
+        ? (args.includes('--intl') ? 'workbuddy-intl' : 'workbuddy')
+        : args.includes('--cn') ? 'qoder-cn' : args.includes('--intl') ? 'qoder' : undefined;
+      const { summary, results } = await runCheckinTick({ provider, skipIfCheckedToday: false });
+      console.log(summary);
+      for (const r of results) {
+        console.log(`  ${r.status === 'checked-in' ? '✓' : r.status === 'failed' ? '✗' : '·'} ${r.account}（${r.provider}）${r.status === 'checked-in' ? ` +${r.claimedAmount} Credits` : r.error ? ' ' + r.error : r.message ? ' ' + r.message : ''}`);
+      }
+      break;
+    }
+    case 'remove': {
+      const id = args[1];
+      if (!id) { console.error('用法: creditdaddy remove <id前缀>（id 见 creditdaddy list）'); process.exit(1); }
+      const { withAccounts } = await import('../src/store.js');
+      const outcome = await withAccounts((accounts) => {
+        const matches = accounts.filter((a) => a.id.startsWith(id));
+        if (matches.length !== 1) return { count: matches.length };
+        accounts.splice(accounts.indexOf(matches[0]), 1);
+        return { count: 1, removed: matches[0] };
+      });
+      if (outcome.count === 0) { console.error('账号不存在'); process.exit(1); }
+      if (outcome.count > 1) { console.error(`id 前缀 "${id}" 匹配到 ${outcome.count} 个账号，请输入更长的前缀`); process.exit(1); }
+      console.log('✓ 已删除', outcome.removed.name || outcome.removed.id);
+      break;
+    }
+    case 'export': {
+      const { loadAccounts } = await import('../src/store.js');
+      const { exportAccounts, TransferError } = await import('../src/transfer.js');
+      const out = args[1] && !args[1].startsWith('--') ? args[1] : 'creditdaddy-secure-backup.json';
+      const password = flag('--password');
+      if (!password) { console.error('导出账号必须设置加密口令：creditdaddy export [file.json] --password 口令（至少 4 位）'); process.exit(1); }
+      const provider = args.includes('--cn') ? 'qoder-cn' : args.includes('--intl') ? 'qoder' : undefined;
+      const { writeFileSync } = await import('node:fs');
+      let blob;
+      try {
+        blob = exportAccounts(await loadAccounts(), { password, provider });
+      } catch (e) {
+        console.error(e instanceof TransferError ? `导出失败：${e.message}` : e.message);
+        process.exit(1);
+      }
+      writeFileSync(out, JSON.stringify(blob, null, 2), { mode: 0o600 });
+      console.log('✓ 已导出加密文件（10router 可直接导入）：', out);
+      break;
+    }
+    case 'import': {
+      const file = args[1];
+      if (!file) { console.error('用法: creditdaddy import <file.json>'); process.exit(1); }
+      const { readFileSync } = await import('node:fs');
+      const { importAccounts } = await import('../src/accounts.js');
+      const { parseImport } = await import('../src/transfer.js');
+      const parsed = parseImport(JSON.parse(readFileSync(file, 'utf8')), { password: flag('--password') });
+      const r = await importAccounts(parsed.accounts);
+      console.log(`✓ 导入完成（来源 ${parsed.source}）：新增 ${r.added}，续期 ${r.updated}，跳过 ${r.skipped + parsed.skipped}`);
+      break;
+    }
+    case 'scan': {
+      const { readQoderAppAccounts } = await import('../src/qoderApp.js');
+      const { readWorkbuddySessions } = await import('../src/workbuddyLocal.js');
+      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 { addAccount } = await import('../src/accounts.js');
+      const qa = await readQoderAppAccounts();
+      const wb = readWorkbuddySessions();
+      const skipped = [];
+      let zAccount = null;
+      try { zAccount = zcodeLive(); } catch (e) { skipped.push({ file: '~/.zcode/v2/credentials.json', error: e.message }); }
+      let miraAccount = null;
+      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 }); }
+      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' },
+        })),
+        ...wb.accounts.map(({ file: _f, fileTime: _t, current, source, ...rec }) => ({
+          label: source, rec: { ...rec, source: current ? 'workbuddy-current' : 'workbuddy-history' },
+        })),
+        ...(zAccount ? [{ label: 'ZCode 当前登录', rec: zAccount }] : []),
+        ...(miraAccount ? [{ label: 'mirasim 当前登录', rec: miraAccount }] : []),
+        ...(cpAccount ? [{ label: '妙手当前登录', rec: cpAccount }] : []),
+      ];
+      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; }
+      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}）`);
+      }
+      break;
+    }
+    case 'umid': {
+      const umid = await import('../src/qoderUmid.js');
+      const sub = args[1] || 'status';
+      if (sub === 'install') {
+        console.log('正在从 npm 下载官方 @qoder-ai/qodercli 并提取设备身份组件（约 30MB）…');
+        const m = await umid.installUmid();
+        console.log(`✓ 已安装：qodercli ${m.version} / ${m.arch}，Qoder 国际版领取可用`);
+      } else if (sub === 'remove') {
+        umid.removeUmid();
+        console.log('✓ 已移除设备身份组件');
+      } else {
+        const info = umid.umidInfo();
+        if (!info.supported) console.log('当前平台不需要该组件（Windows / macOS 使用 Qoder 客户端自带的 runtime-info）');
+        else if (info.installed) console.log(`已安装：qodercli ${info.installed.version} / ${info.installed.arch}（${info.installed.installedAt.slice(0, 10)}）`);
+        else console.log('未安装。运行 creditdaddy umid install 安装后即可领取 Qoder 国际版');
+      }
+      break;
+    }
+    case 'logs': {
+      const { loadState } = await import('../src/store.js');
+      console.log('数据目录状态:', JSON.stringify(await loadState(), null, 2));
+      break;
+    }
+    case 'help':
+    case '--help':
+    case '-h':
+      console.log(HELP);
+      break;
+    default:
+      console.error(`未知命令: ${cmd}\n\n${HELP}`);
+      process.exit(1);
+  }
+}
+
+main().catch((e) => { console.error('✗', e.message); process.exit(1); });

package/package.json

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

package/src/accounts.js

@@ -6,11 +6,27 @@
  * 同一 provider 下 uid 相同但 token 不同 → 视为 token 续期，原地更新而不是新增。
  */
 
-import { normalizeAccountInput, findDuplicate, loadAccounts, withAccounts } from './store.js';
+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
@@ -44,15 +60,17 @@ function refreshExisting(existing, incoming) {
   return changed;
 }
 
-/** 在锁内合并一条记录：新增 / 续期 / 重复 */
-function mergeInto(accounts, account) {
+/** 在锁内合并一条记录：新增 / 续期 / 重复；顺带挂上暂存的 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 updated = refreshExisting(dup, account);
-  return { account: dup, duplicate: true, updated };
+  const refreshed = refreshExisting(dup, account);
+  const attached = await attachPendingWebSession(dup);
+  return { account: dup, duplicate: true, updated: refreshed || attached };
 }
 
 /**
@@ -94,11 +112,11 @@ export async function addAccount(input, { verify = true, trusted = false } = {})
  * @returns {Promise<{added, updated, skipped}>}
  */
 export function importAccounts(list) {
-  return withAccounts((accounts) => {
+  return withAccounts(async (accounts) => {
     let added = 0, updated = 0, skipped = 0;
     for (const item of list) {
       try {
-        const r = mergeInto(accounts, normalizeAccountInput(item));
+        const r = await mergeInto(accounts, normalizeAccountInput(item));
         if (!r.duplicate) added++;
         else if (r.updated) updated++;
         else skipped++;

package/src/catpawClient.js

@@ -0,0 +1,103 @@
+/**
+ * 妙手（美团 CatPaw）桌面网关 API 客户端 — 用户信息与额度/版本查询。
+ *
+ *   GET https://catx.nocode.cn/api/gateway/auth/current-user    用户信息（userId, name, mobile, avatarUrl）
+ *   GET https://catx.nocode.cn/api/gateway/credit/balance       可用额度 + 当前套餐（体验版/专业版…）
+ *
+ * 鉴权：本机妙手客户端解密出的 access_token，放在 X-Auth-Token 头
+ * （客户端内部 API 封装同款；网页端 credit.catpaw.meituan.com 的接口只认浏览器 Cookie，不适用）。
+ * 响应统一信封 { code: 0, message, data }，code !== 0 视为业务错误。
+ *
+ * 凭据由妙手客户端登录管理（网页 OAuth 轮转），没有对外的 refresh 接口：
+ * token 失效（401）时提示在妙手客户端重新登录后重新本机导入。
+ */
+
+import { fetchJsonRace } from './zcodeClient.js';
+import { FETCH_TIMEOUT_MS } from './constants.js';
+
+export const CATPAW_GATEWAY = 'https://catx.nocode.cn';
+
+const gw = (p) => CATPAW_GATEWAY + '/api/gateway' + p;
+const authHeaders = (token) => ({ 'X-Auth-Token': token, Accept: 'application/json' });
+
+/** GET 网关接口并拆信封；401 → e.auth = true（凭据失效） */
+async function gwGet(path, token) {
+  const res = await fetchJsonRace(gw(path), { headers: authHeaders(token), timeoutMs: FETCH_TIMEOUT_MS });
+  if (res.status === 401) {
+    const e = new Error('妙手登录凭据已过期，请在妙手客户端重新登录后到「添加账号 → 本机导入」同步');
+    e.auth = true;
+    throw e;
+  }
+  if (!res.ok) throw new Error(`妙手接口 ${path} 失败: HTTP ${res.status}`);
+  const body = await res.json().catch(() => null);
+  if (!body || typeof body !== 'object') throw new Error(`妙手接口 ${path} 返回无法解析`);
+  if (body.code !== 0) {
+    const msg = String(body.message || body.errorCode || '未知错误');
+    if (body.code === 401 || /未登录|登录失效/.test(msg)) {
+      const e = new Error('妙手登录凭据已过期，请在妙手客户端重新登录后重新本机导入');
+      e.auth = true;
+      throw e;
+    }
+    throw new Error(`妙手接口 ${path} 返回错误：${msg}`);
+  }
+  return body.data;
+}
+
+/** 用户信息 → { userId, name, mobile, avatarUrl } */
+export async function fetchCatpawProfile(token) {
+  if (!token) throw new Error('账号缺少 token');
+  const d = await gwGet('/auth/current-user', token);
+  if (!d || !d.userId) throw new Error('妙手用户信息响应缺少 userId（上游结构可能变化）');
+  return { userId: String(d.userId), name: d.name || null, mobile: d.mobile || null, avatarUrl: d.avatarUrl || null };
+}
+
+const iso = (ms) => (Number.isFinite(ms) && ms > 0 ? new Date(ms).toISOString() : null);
+
+/** credit/balance → 统一配额结构（可用妙手 Credits + 当前版本；无总量口径，不计入面板「剩余积分」合计） */
+export function normalizeCatpawBalance(d) {
+  // 注意 Number(null) === 0：字段缺失 / 为 null 都要判为空额度，而不是 0
+  const raw = d?.availableCredits;
+  const credits = raw === null || raw === undefined || raw === '' ? NaN : Number(raw);
+  const plan = d?.userPlan || {};
+  const planName = plan.planName || (plan.pro ? '专业版' : '体验版');
+  const remaining = Number.isFinite(credits) ? credits : null;
+  return {
+    total: remaining ?? 0,
+    used: 0,
+    remaining: remaining ?? 0,
+    unit: 'Credits',
+    plan: planName,
+    planExpiresAt: iso(Number(plan.expireTime)),
+    nextRefreshAt: iso(Number(plan.nextRefreshTime)),
+    parts: [{
+      name: '可用额度',
+      total: remaining ?? 0,
+      used: 0,
+      remaining: remaining ?? 0,
+      unit: 'Credits',
+      expiresAt: iso(Number(plan.nextRefreshTime)),
+      recurring: true,
+    }],
+    empty: remaining === null,
+    exceeded: plan.status ? plan.status !== 'active' : false,
+    pro: plan.pro === true,
+    autoRenew: plan.autoRenew === true,
+  };
+}
+
+/** 查询额度与版本（一次 balance 请求即含 userPlan；401 抛 auth 错误） */
+export async function fetchCatpawQuota(account) {
+  if (!account.token) throw new Error('账号缺少 token');
+  return normalizeCatpawBalance(await gwGet('/credit/balance', account.token));
+}
+
+/**
+ * 云端用量（按天 token 总量，无输入/输出/缓存拆分、无模型维度）：
+ *   GET /api/gateway/v1/usage/token/daily?startTime=&endTime=   → { daily: [{ date: 'YYYY-MM-DD', totalTokens }] }
+ * 当天的桶随用随涨，调用方应只取已结束的日期，避免同一天反复快照产生重复行。
+ */
+export async function fetchCatpawTokenDaily(token, { startTime, endTime } = {}) {
+  if (!token) throw new Error('账号缺少 token');
+  const d = await gwGet(`/v1/usage/token/daily?startTime=${startTime}&endTime=${endTime}`, token);
+  return Array.isArray(d && d.daily) ? d.daily : [];
+}