@2api-store/activate 0.4.1 → 0.4.3

package/lib/cmds.mjs

@@ -227,13 +227,37 @@ async function cmdRestore(argv) {
     byTime[tsKey].push(b)
   }
 
+  // 同时间组内按 origPath 去重（同 origPath 只保留 mtime 最大的）
+  for (const ts of timeOrder) {
+    const group = byTime[ts]
+    const byOrig = {}
+    for (const b of group) {
+      if (!byOrig[b.origPath] || b.mtime > byOrig[b.origPath].mtime) {
+        byOrig[b.origPath] = b
+      }
+    }
+    byTime[ts] = Object.values(byOrig).sort((a, b) => b.mtime - a.mtime)
+  }
+
   console.log()
   step(`选择恢复时间点（${chosenAppLabel}）`)
   const timeItems = timeOrder.map((ts) => {
     const group = byTime[ts]
     const files = group.map((b) => path.basename(b.origPath)).join(', ')
     const tsDisplay = fmtTime(group[0].mtime)
-    return { label: `${chalk.dim(tsDisplay)}（${group.length} 文件：${files}）`, ts, group }
+    // 从备份内容提取 key 前缀（帮助用户区分不同激活）
+    let keyHint = ''
+    for (const b of group) {
+      try {
+        const content = fs.readFileSync(b.bakPath, 'utf8')
+        const m = content.match(/sk-[a-f0-9]{6,8}/i)
+        if (m) { keyHint = `sk-…${m[0].slice(-6)}`; break }
+        const m2 = content.match(/(?:api_key|API_KEY|OPENAI_API_KEY)["':\s]+(["']?)(sk-[a-f0-9]{6,8})/i)
+        if (m2) { keyHint = `sk-…${m2[2].slice(-6)}`; break }
+      } catch { /* ignore */ }
+    }
+    const hint = keyHint ? ` ${chalk.yellow(keyHint)}` : ''
+    return { label: `${chalk.dim(tsDisplay)}（${group.length} 文件：${files}）${hint}`, ts, group }
   })
   const timeIdx = await select('选择时间点（回车=最新）', timeItems, { defaultIndex: 0 })
   if (timeIdx < 0 || timeIdx >= timeItems.length) {
@@ -464,17 +488,11 @@ async function cmdReconfig(argv) {
   info('识别为：API Key 模式（不创建账号，仅重拉模板写入配置）')
   console.log()
 
-  // 询问是否限制平台（可选）
-  const platformAnswer = (await ask('限制平台？（留空=全部，或输入 openai/anthropic/gemini/grok/antigravity）')).trim()
-  const platform = platformAnswer || null
-  if (platform) info(`平台过滤：${platform}`)
-  console.log()
-
-  // POST /cli/activate
-  step('请求激活服务（key 模式重拉模板）')
+  // POST /cli/activate — 全平台，不问平台限制
+  step('请求激活服务（全量重拉模板）')
   let bundle
   try {
-    bundle = await cliActivate({ credential: apiKey, platform, apiBase })
+    bundle = await cliActivate({ credential: apiKey, apiBase })
   } catch (err) {
     fail(`请求失败：${err.message}`)
     if (err.statusCode) fail(`  HTTP ${err.statusCode}`)
@@ -487,7 +505,7 @@ async function cmdReconfig(argv) {
   if (bundle.base_url) info(`base_url：${bundle.base_url}`)
   console.log()
 
-  // 过滤配置
+  // 过滤配置 — 按模型平台推断 + OS 过滤（与默认激活流程一致）
   const allowedPlatforms = new Set()
   for (const m of bundle.models || []) {
     const id = (typeof m === 'string' ? m : m?.id || '').toLowerCase()
@@ -496,12 +514,10 @@ async function cmdReconfig(argv) {
     else if (id.startsWith('gemini')) allowedPlatforms.add('gemini')
     else if (id.startsWith('grok')) allowedPlatforms.add('grok')
   }
-  if (platform) allowedPlatforms.add(platform)
 
   const osConfigs = (bundle.configs || []).filter((c) => {
     if (!c) return false
     if (allowedPlatforms.size > 0 && !allowedPlatforms.has(c.platform)) return false
-    if (platform && c.platform !== platform) return false
     if (env.os.isWindows) {
       return c.os_type === 'windows' || c.os_type === 'all'
     }
@@ -513,43 +529,22 @@ async function cmdReconfig(argv) {
     return 1
   }
 
-  // dedupe by platform + client_type
+  // reconfig: 全选所有配置，不问 CLI 选择
   const seen = new Set()
-  const cliItems = []
+  const selectedItems = []
   for (const c of osConfigs) {
     const key = `${c.platform}/${c.client_type}`
     if (seen.has(key)) continue
     seen.add(key)
     const meta = getCliMeta(c.client_type)
     const displayName = c.display_name || c.displayName || meta?.name || `${c.platform} ${c.client_type}`
-    const installed = env.installed[c.client_type]?.path || (meta && env.installed[meta.detectBin]?.path)
-    const primaryMark = isDefaultSelected(c.client_type) ? '' : '（独立 CLI）'
-    const nameColored = installed ? chalk.green(displayName) : chalk.gray(`${displayName} (未装)`)
-    cliItems.push({
-      label: `${nameColored} ${chalk.dim(`[${c.platform}/${c.client_type}]`)}${primaryMark}`,
+    selectedItems.push({
       config: c,
       clientType: c.client_type,
       meta,
-      alreadyInstalled: !!installed,
     })
   }
-
-  const defaultSelected = cliItems
-    .map((item, i) => ({ item, i }))
-    .filter(({ item }) => isDefaultSelected(item.clientType))
-    .map(({ i }) => i)
-
-  step('选择要重配的 CLI')
-  const selectedIdxes = await multiSelect(
-    '选择 CLI（绿色=已装，灰色=未装；默认选主 CLI）',
-    cliItems,
-    { defaultSelected },
-  )
-  if (selectedIdxes.length === 0) {
-    plain('未选择任何 CLI，退出。')
-    return 0
-  }
-  const selectedItems = selectedIdxes.map((i) => cliItems[i])
+  ok(`将覆盖 ${selectedItems.length} 个 CLI 配置`)
   console.log()
 
   // 选默认模型

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@2api-store/activate",
-  "version": "0.4.1",
+  "version": "0.4.3",
   "description": "TokenShop CLI 一键激活：配置本地 codex/claude/gemini/grok/opencode 指向 2api.store 中转（彩色输出 + 自动安装 CLI）",
   "type": "module",
   "bin": {