@2api-store/activate 0.3.1 → 0.3.3

package/activate.mjs

@@ -30,11 +30,12 @@ import {
   confirm,
   closePrompt,
 } from './lib/prompt.mjs'
-import { banner, ok, fail, warn, info, step, guide, plain } from './lib/ui.mjs'
+import { banner, ok, fail, warn, info, step, guide, plain, chalk } from './lib/ui.mjs'
 import { getCliMeta, isDefaultSelected } from './lib/platforms.mjs'
 import { ensureInstalled } from './lib/install.mjs'
 
-const VERSION = '0.3.0'
+import { createRequire } from 'node:module'
+const VERSION = createRequire(import.meta.url)('./package.json').version
 const DEFAULT_API_BASE = 'https://2api.store'
 
 // ============================================================
@@ -243,10 +244,10 @@ async function main() {
     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 installMark = installed ? '✓' : '✗'
     const primaryMark = isDefaultSelected(c.client_type) ? '' : '（独立 CLI）'
+    const nameColored = installed ? chalk.green(displayName) : chalk.gray(`${displayName} (未装)`)
     cliItems.push({
-      label: `[${installMark}] ${displayName} [${c.platform}/${c.client_type}]${primaryMark}`,
+      label: `${nameColored} ${chalk.dim(`[${c.platform}/${c.client_type}]`)}${primaryMark}`,
       config: c,
       clientType: c.client_type,
       meta,
@@ -262,7 +263,7 @@ async function main() {
 
   step('选择 CLI')
   const selectedIdxes = await multiSelect(
-    '选择要激活的 CLI（✓=已装 ✗=未装；默认选主 CLI，独立 CLI 默认不选）',
+    '选择要激活的 CLI（绿色=已装，灰色=未装；默认选主 CLI，独立 CLI 默认不选）',
     cliItems,
     { defaultSelected },
   )
@@ -306,10 +307,22 @@ async function main() {
   const modelItems = listModels(bundle.models || [])
   let defaultModelId = ''
   if (modelItems.length > 0) {
-    step('选择默认模型')
-    const selectItems = modelItems.map((m) => ({ label: `${m.label} (${m.id})` }))
+    step('选择默认模型（最新优先）')
+    const TOP_N = 10
+    const topItems = modelItems.slice(0, TOP_N)
+    const hasMore = modelItems.length > TOP_N
+    const selectItems = [
+      ...topItems.map((m) => ({ label: `${m.label} (${m.id})` })),
+      ...(hasMore ? [{ label: chalk.dim('其他（手动输入模型 ID）') }] : []),
+    ]
     const idx = await select('选择默认模型', selectItems, { defaultIndex: 0 })
-    defaultModelId = modelItems[idx].id
+    if (hasMore && idx === topItems.length) {
+      // 手动输入
+      defaultModelId = (await ask('输入模型 ID（如 gpt-5.6-terra）')).trim()
+      if (!defaultModelId) defaultModelId = topItems[0].id
+    } else {
+      defaultModelId = topItems[idx].id
+    }
     ok(`已选默认模型：${defaultModelId}`)
   } else {
     warn('服务端未返回模型列表，{{defaultModel}} 将留空')

package/lib/detect.mjs

@@ -62,11 +62,13 @@ function findBinary(name, isWindows) {
 function getVersion(bin, isWindows) {
   // --version 是通用约定；codex/claude/gemini/opencode/grok 都支持
   try {
-    const result = spawnSync(isWindows ? `${bin}.cmd` : bin, ['--version'], {
+    const cmdBin = isWindows ? process.env.COMSPEC || 'cmd.exe' : bin
+    const cmdArgs = isWindows ? ['/c', bin, '--version'] : ['--version']
+    const result = spawnSync(cmdBin, cmdArgs, {
       encoding: 'utf8',
       stdio: ['ignore', 'pipe', 'pipe'],
       timeout: 5000,
-      // 不用 shell:true（node 22+ DEP0190）；Windows 用 <bin>.cmd 直调
+      // Windows: CLI 是 <bin>.cmd batch，必须经 cmd.exe /c 解析；不用 shell:true（DEP0190）
     })
     if (result.status === 0 && result.stdout) {
       const firstLine = result.stdout.trim().split(/\r?\n/)[0]

package/lib/install.mjs

@@ -38,15 +38,20 @@ export function installCLI(meta, opts = {}) {
 
   console.log(`  正在执行：${cmd}…`)
   try {
-    const result = spawnSync(process.platform === 'win32' ? 'npm.cmd' : 'npm', ['install', '-g', pkg], {
+    const isWin = process.platform === 'win32'
+    const npmBin = isWin ? process.env.COMSPEC || 'cmd.exe' : 'npm'
+    const npmArgs = isWin ? ['/c', 'npm', 'install', '-g', pkg] : ['install', '-g', pkg]
+    const result = spawnSync(npmBin, npmArgs, {
       stdio: 'inherit', // npm 进度/输出直接透传到当前终端
-      // 不用 shell:true（node 22+ DEP0190 警告 + 安全风险）；Windows 用 npm.cmd 直调
+      // Windows: npm 是 npm.cmd batch，必须经 cmd.exe /c 解析；不用 shell:true（node 22+ DEP0190）
     })
+    if (result.error) {
+      return { ok: false, error: result.error.message }
+    }
     if (result.status === 0) {
       return { ok: true }
     }
-    const errText = `npm exit ${result.status}`
-    return { ok: false, error: errText }
+    return { ok: false, error: `npm exit ${result.status}` }
   } catch (err) {
     return { ok: false, error: err.message }
   }

package/lib/platforms.mjs

@@ -53,7 +53,7 @@ export const CLI_META = {
       '  codex --sandbox read-only --ask-for-approval never 只读（最安全）',
       '  codex --help                                       查看所有选项',
     ].join('\n'),
-    isPrimary: true,
+    isPrimary: false, // codex 的 WebSocket 变体（同 CLI 同 config.toml，默认不选避免覆盖 codex 模式）
   },
   claude: {
     name: 'Claude Code',

package/lib/render.mjs

@@ -63,14 +63,20 @@ export function expandPath(p, { isWindows } = {}) {
   return p
 }
 
+// 模型版本解析（gpt-5.6-sol → [5,6]，gpt-oss-safeguard → [0,0] 旧）用于倒序排序（最新在前）
+function modelVersion(id) {
+  const m = String(id || '').toLowerCase().match(/(\d+)\.(\d+)/)
+  return m ? [parseInt(m[1], 10), parseInt(m[2], 10)] : [0, 0]
+}
+
 /**
- * 将 models 数组规整为 {id, label} 列表，供选择展示用
+ * 将 models 数组规整为 {id, label} 列表，按版本倒序排序（最新在前），供选择展示用
  * @param {Array<{id?: string, name?: string}|string>} models
  * @returns {Array<{index: number, id: string, label: string, raw: any}>}
  */
 export function listModels(models) {
   if (!Array.isArray(models) || models.length === 0) return []
-  return models.map((m, i) => {
+  const items = models.map((m, i) => {
     if (typeof m === 'string') {
       return { index: i, id: m, label: m, raw: m }
     }
@@ -78,4 +84,11 @@ export function listModels(models) {
     const label = m.name || m.id || id
     return { index: i, id, label, raw: m }
   })
+  // 版本倒序（最新在前）；同版本按 id 字母序
+  items.sort((a, b) => {
+    const va = modelVersion(a.id)
+    const vb = modelVersion(b.id)
+    return vb[0] - va[0] || vb[1] - va[1] || String(a.id).localeCompare(String(b.id))
+  })
+  return items
 }

package/lib/ui.mjs

@@ -15,7 +15,8 @@
 
 import chalk from 'chalk'
 
-const PKG_VERSION = '0.3.1'
+import { createRequire } from 'node:module'
+const PKG_VERSION = createRequire(import.meta.url)('../package.json').version
 
 const BANNER = String.raw`
   _   _   _   _   ____    _    ____    _   _

package/package.json

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