@simonyea/holysheep-cli 1.0.2 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "一键配置所有 AI 编程工具接入 HolySheep API — Claude Code / Codex / Gemini CLI / OpenCode / OpenClaw / Aider / Cursor",
   "keywords": [
     "claude",

package/src/commands/setup.js

@@ -4,15 +4,55 @@
 const inquirer  = require('inquirer')
 const chalk     = require('chalk')
 const ora       = require('ora')
+const { execSync, spawnSync } = require('child_process')
 const { saveConfig, getApiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI, SHOP_URL } = require('../utils/config')
 const { writeEnvToShell } = require('../utils/shell')
 const TOOLS = require('../tools')
 
-const TOOL_CHOICES = TOOLS.map(t => ({
-  name: `${t.checkInstalled() ? chalk.green('●') : chalk.gray('○')}  ${t.name.padEnd(18)} ${t.checkInstalled() ? chalk.gray('(已安装)') : chalk.gray('(未安装)')}`,
-  value: t.id,
-  short: t.name,
-}))
+// 工具的自动安装命令（npm/pip）
+const AUTO_INSTALL = {
+  'claude-code': { cmd: 'npm install -g @anthropic-ai/claude-code', mgr: 'npm' },
+  'codex':       { cmd: 'npm install -g @openai/codex',             mgr: 'npm' },
+  'gemini-cli':  { cmd: 'npm install -g @google/gemini-cli',        mgr: 'npm' },
+  'opencode':    { cmd: 'npm install -g opencode-ai',               mgr: 'npm' },
+  'aider':       { cmd: 'pip install aider-chat',                   mgr: 'pip' },
+}
+
+function canAutoInstall(toolId) {
+  return !!AUTO_INSTALL[toolId]
+}
+
+async function tryAutoInstall(tool) {
+  const info = AUTO_INSTALL[tool.id]
+  if (!info) return false
+
+  // 检查 npm/pip 是否可用
+  try {
+    execSync(`${info.mgr} --version`, { stdio: 'ignore' })
+  } catch {
+    console.log(chalk.red(`  ✗ 未找到 ${info.mgr}，无法自动安装 ${tool.name}`))
+    return false
+  }
+
+  const spinner = ora(`正在安装 ${tool.name}...`).start()
+  try {
+    spawnSync(info.cmd.split(' ')[0], info.cmd.split(' ').slice(1), {
+      stdio: 'inherit',
+      shell: true,
+    })
+    // 安装后重新检测
+    if (tool.checkInstalled()) {
+      spinner.succeed(`${tool.name} 安装成功`)
+      return true
+    } else {
+      spinner.fail(`${tool.name} 安装后仍未检测到，请手动安装: ${chalk.cyan(info.cmd)}`)
+      return false
+    }
+  } catch (e) {
+    spinner.fail(`安装失败: ${e.message}`)
+    return false
+  }
+}
 
 async function setup(options) {
   console.log()
@@ -38,18 +78,36 @@ async function setup(options) {
     console.log(`${chalk.green('✓')} 使用已保存的 API Key: ${chalk.cyan(maskKey(apiKey))}`)
   }
 
-  // Step 2: 选择工具
+  // Step 2: 选择工具（已安装 + 未安装分组显示）
+  const installedTools   = TOOLS.filter(t => t.checkInstalled())
+  const uninstalledTools = TOOLS.filter(t => !t.checkInstalled())
+
+  const choices = []
+  if (installedTools.length) {
+    choices.push(new inquirer.Separator(chalk.green('── 已安装 ──')))
+    installedTools.forEach(t => choices.push({
+      name: `${chalk.green('●')}  ${t.name.padEnd(18)} ${chalk.gray('(已安装)')}`,
+      value: t.id,
+      short: t.name,
+      checked: true,  // 已安装的默认全选
+    }))
+  }
+  if (uninstalledTools.length) {
+    choices.push(new inquirer.Separator(chalk.gray('── 未安装（可自动安装）──')))
+    uninstalledTools.forEach(t => choices.push({
+      name: `${chalk.gray('○')}  ${t.name.padEnd(18)} ${canAutoInstall(t.id) ? chalk.cyan('(选中后自动安装)') : chalk.gray('(需手动安装)')}`,
+      value: t.id,
+      short: t.name,
+      checked: false,
+    }))
+  }
+
   const { toolIds } = await inquirer.prompt([{
     type: 'checkbox',
     name: 'toolIds',
     message: '选择要配置的工具（空格选中，回车确认）:',
-    choices: [
-      new inquirer.Separator('── 已安装 ──'),
-      ...TOOL_CHOICES.filter((_, i) => TOOLS[i].checkInstalled()),
-      new inquirer.Separator('── 未安装 ──'),
-      ...TOOL_CHOICES.filter((_, i) => !TOOLS[i].checkInstalled()),
-    ],
-    pageSize: 12,
+    choices,
+    pageSize: 14,
   }])
 
   if (toolIds.length === 0) {
@@ -59,12 +117,46 @@ async function setup(options) {
 
   console.log()
 
-  // Step 3: 配置每个工具
+  // Step 3: 对未安装但被选中的工具，询问是否自动安装
   const selectedTools = TOOLS.filter(t => toolIds.includes(t.id))
+  const needInstall = selectedTools.filter(t => !t.checkInstalled() && canAutoInstall(t.id))
+  const cantInstall = selectedTools.filter(t => !t.checkInstalled() && !canAutoInstall(t.id))
+
+  // 提示不能自动安装的工具
+  if (cantInstall.length) {
+    console.log(chalk.yellow(`以下工具需要手动安装后再运行 hs setup：`))
+    cantInstall.forEach(t => console.log(`  ${chalk.gray('→')} ${t.name}: ${chalk.cyan(t.installCmd)}`))
+    console.log()
+  }
+
+  // 自动安装可以安装的工具
+  if (needInstall.length) {
+    const { doInstall } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'doInstall',
+      message: `检测到 ${needInstall.map(t => chalk.cyan(t.name)).join('、')} 未安装，现在自动安装？`,
+      default: true,
+    }])
+
+    if (doInstall) {
+      for (const tool of needInstall) {
+        await tryAutoInstall(tool)
+      }
+      console.log()
+    }
+  }
+
+  // Step 4: 配置每个已安装的工具
   const envVarsToWrite = {}
   const results = []
+  const toConfigureTools = selectedTools.filter(t => t.checkInstalled())
 
-  for (const tool of selectedTools) {
+  if (toConfigureTools.length === 0) {
+    console.log(chalk.yellow('没有可配置的工具（请先安装），退出。'))
+    return
+  }
+
+  for (const tool of toConfigureTools) {
     const spinner = ora(`配置 ${tool.name}...`).start()
     try {
       const result = tool.configure(apiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI)
@@ -74,7 +166,6 @@ async function setup(options) {
         result.steps.forEach((s, i) => console.log(`  ${chalk.gray(i + 1 + '.')} ${s}`))
         results.push({ tool, status: 'manual' })
       } else {
-        // 收集需要写入 shell 的环境变量
         if (result.envVars) Object.assign(envVarsToWrite, result.envVars)
         spinner.succeed(`${chalk.green(tool.name)} ${chalk.gray(result.file ? `→ ${result.file}` : '')}`)
         results.push({ tool, status: 'ok', result })
@@ -85,16 +176,15 @@ async function setup(options) {
     }
   }
 
-  // Step 4: 写入通用环境变量（如果有工具需要）
-  const needsEnvVars = selectedTools.some(t => t.id === 'codex' || t.id === 'aider')
+  // Step 5: 写入通用环境变量
+  const needsEnvVars = toConfigureTools.some(t => t.id === 'codex' || t.id === 'aider')
   if (needsEnvVars || Object.keys(envVarsToWrite).length > 0) {
-    const defaultEnv = {
+    Object.assign(envVarsToWrite, {
       ANTHROPIC_API_KEY: apiKey,
       ANTHROPIC_BASE_URL: BASE_URL_ANTHROPIC,
       OPENAI_API_KEY: apiKey,
       OPENAI_BASE_URL: BASE_URL_OPENAI,
-    }
-    Object.assign(envVarsToWrite, defaultEnv)
+    })
   }
 
   if (Object.keys(envVarsToWrite).length > 0) {
@@ -107,7 +197,7 @@ async function setup(options) {
     }
   }
 
-  // Step 5: 保存 API Key 到本地
+  // Step 6: 保存 API Key
   saveConfig({ apiKey })
 
   // 摘要
@@ -116,7 +206,7 @@ async function setup(options) {
   console.log(chalk.green.bold('✅ 配置完成！'))
   console.log()
 
-  const ok = results.filter(r => r.status === 'ok')
+  const ok     = results.filter(r => r.status === 'ok')
   const manual = results.filter(r => r.status === 'manual')
   const errors = results.filter(r => r.status === 'error')
 

package/src/tools/codex.js

@@ -1,54 +1,43 @@
 /**
- * OpenAI Codex CLI 适配器
- * 配置文件: ~/.codex/config.yaml 或 ~/.codex/config.json
- * 环境变量: OPENAI_API_KEY, OPENAI_BASE_URL
+ * Codex CLI 适配器 (@openai/codex v0.46+)
  *
- * Codex 支持 custom provider 配置:
- *   providers:
- *     - name: HolySheep
- *       baseURL: https://api.holysheep.ai/v1
- *       envKey: OPENAI_API_KEY
+ * 配置文件: ~/.codex/config.json（JSON 格式，不是 yaml）
  *
- * 注意: Codex 用 OpenAI 兼容格式，baseURL 需带 /v1
+ * 正确格式:
+ * {
+ *   "model": "claude-sonnet-4-5",
+ *   "provider": "holysheep",          // 指定默认 provider
+ *   "providers": {
+ *     "holysheep": {
+ *       "name": "HolySheep",
+ *       "baseURL": "https://api.holysheep.ai/v1",
+ *       "envKey": "OPENAI_API_KEY"
+ *     }
+ *   }
+ * }
+ *
+ * 环境变量: OPENAI_API_KEY（通过 envKey 指定）
+ * 注意: Codex 会优先使用账号登录，需要设置 provider 才能绕过
  */
-const fs = require('fs')
+const fs   = require('fs')
 const path = require('path')
-const os = require('os')
+const os   = require('os')
 
 const CONFIG_DIR  = path.join(os.homedir(), '.codex')
-const CONFIG_YAML = path.join(CONFIG_DIR, 'config.yaml')
-const CONFIG_JSON = path.join(CONFIG_DIR, 'config.json')
+const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json')
 
 function readConfig() {
   try {
-    if (fs.existsSync(CONFIG_YAML)) return { type: 'yaml', content: fs.readFileSync(CONFIG_YAML, 'utf8') }
-    if (fs.existsSync(CONFIG_JSON)) return { type: 'json', content: fs.readFileSync(CONFIG_JSON, 'utf8') }
+    if (fs.existsSync(CONFIG_FILE)) {
+      return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'))
+    }
   } catch {}
-  return { type: 'yaml', content: '' }
+  return {}
 }
 
-function removeHolysheepProvider(yamlContent) {
-  // 简单移除已有的 holysheep provider 块
-  const lines = yamlContent.split('\n')
-  const result = []
-  let skip = false
-  for (const line of lines) {
-    if (line.includes('HolySheep') || line.includes('holysheep')) {
-      skip = true
-      // 也移除上一行的 `- name:` 前缀
-      if (result.length && result[result.length - 1].trim().startsWith('- name:')) {
-        result.pop()
-      }
-      continue
-    }
-    if (skip && (line.startsWith('  ') || line.trim() === '')) {
-      if (line.trim() === '') skip = false
-      continue
-    }
-    skip = false
-    result.push(line)
-  }
-  return result.join('\n')
+function writeConfig(data) {
+  if (!fs.existsSync(CONFIG_DIR)) fs.mkdirSync(CONFIG_DIR, { recursive: true })
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(data, null, 2), 'utf8')
 }
 
 module.exports = {
@@ -56,62 +45,57 @@ module.exports = {
   id: 'codex',
   checkInstalled() {
     try {
-      require('child_process').execSync('which codex', { stdio: 'ignore' })
+      require('child_process').execSync('codex --version', { stdio: 'ignore' })
       return true
-    } catch { return false }
+    } catch {
+      try {
+        require('child_process').execSync('npx @openai/codex --version', { stdio: 'ignore' })
+        return true
+      } catch { return false }
+    }
   },
   isConfigured() {
-    const { content } = readConfig()
-    return content.includes('holysheep') || content.includes('HolySheep')
+    const c = readConfig()
+    return c.provider === 'holysheep' &&
+           !!c.providers?.holysheep?.baseURL?.includes('holysheep')
   },
-  configure(apiKey, baseUrlOpenAI) {
-    if (!fs.existsSync(CONFIG_DIR)) fs.mkdirSync(CONFIG_DIR, { recursive: true })
+  configure(apiKey, _baseUrlAnthropicNoV1, baseUrlOpenAI) {
+    const config = readConfig()
 
-    // 生成 YAML 格式配置（Codex 官方推荐）
-    let content = ''
-    if (fs.existsSync(CONFIG_YAML)) {
-      content = fs.readFileSync(CONFIG_YAML, 'utf8')
-      content = removeHolysheepProvider(content)
-    }
+    // 设置 HolySheep 为默认 provider
+    config.provider = 'holysheep'
+    config.model    = config.model || 'claude-sonnet-4-5'
 
-    // 追加 holysheep provider + 设为默认 model provider
-    const providerBlock = `
-# HolySheep API — https://shop.holysheep.ai
-providers:
-  - name: HolySheep
-    baseURL: ${baseUrlOpenAI}
-    envKey: OPENAI_API_KEY
-model: claude-sonnet-4-5
-`
-    // 如果已有 providers 块，改为追加到列表
-    if (content.includes('providers:')) {
-      content = content.replace('providers:', `providers:\n  - name: HolySheep\n    baseURL: ${baseUrlOpenAI}\n    envKey: OPENAI_API_KEY`)
-    } else {
-      content += providerBlock
+    if (!config.providers) config.providers = {}
+    config.providers.holysheep = {
+      name:    'HolySheep',
+      baseURL: baseUrlOpenAI,   // https://api.holysheep.ai/v1
+      envKey:  'OPENAI_API_KEY',
     }
 
-    fs.writeFileSync(CONFIG_YAML, content.trim() + '\n', 'utf8')
+    writeConfig(config)
 
-    // 同时写入环境变量（Codex 通过 envKey 读取）
     return {
-      file: CONFIG_YAML,
-      hot: false,
+      file: CONFIG_FILE,
+      hot:  false,
+      // 需要同时设置环境变量，供 envKey 读取
       envVars: {
-        OPENAI_API_KEY: apiKey,
-        OPENAI_BASE_URL: baseUrlOpenAI,
+        OPENAI_API_KEY:   apiKey,
+        OPENAI_BASE_URL:  baseUrlOpenAI,
       },
     }
   },
   reset() {
-    if (fs.existsSync(CONFIG_YAML)) {
-      let content = fs.readFileSync(CONFIG_YAML, 'utf8')
-      content = removeHolysheepProvider(content)
-      fs.writeFileSync(CONFIG_YAML, content, 'utf8')
+    const config = readConfig()
+    if (config.provider === 'holysheep') {
+      delete config.provider
+      delete config.providers?.holysheep
     }
+    writeConfig(config)
   },
-  getConfigPath() { return CONFIG_YAML },
-  hint: '切换后需重启终端或新开 terminal',
+  getConfigPath() { return CONFIG_FILE },
+  hint: '切换后重开终端生效；用 codex --provider holysheep 指定',
   installCmd: 'npm install -g @openai/codex',
   docsUrl: 'https://github.com/openai/codex',
-  envVarFormat: 'openai',  // 告知 setup 命令写哪些 env vars
+  envVarFormat: 'openai',
 }

package/src/utils/shell.js

@@ -10,6 +10,10 @@ const MARKER_END   = '# <<< holysheep-cli managed <<<'
 
 function getShellRcFiles() {
   const home = os.homedir()
+
+  // Windows：不写 shell rc，改用 setx 写系统环境变量
+  if (process.platform === 'win32') return []
+
   const shell = process.env.SHELL || ''
   const candidates = []
 
@@ -19,7 +23,7 @@ function getShellRcFiles() {
 
   // 默认兜底
   if (candidates.length === 0) {
-    const zshrc = path.join(home, '.zshrc')
+    const zshrc  = path.join(home, '.zshrc')
     const bashrc = path.join(home, '.bashrc')
     if (fs.existsSync(zshrc))  candidates.push(zshrc)
     if (fs.existsSync(bashrc)) candidates.push(bashrc)
@@ -47,6 +51,19 @@ function buildEnvBlock(envVars) {
 }
 
 function writeEnvToShell(envVars) {
+  // Windows: 用 setx 写入用户级环境变量
+  if (process.platform === 'win32') {
+    const { execSync } = require('child_process')
+    const written = []
+    for (const [k, v] of Object.entries(envVars)) {
+      try {
+        execSync(`setx ${k} "${v}"`, { stdio: 'ignore' })
+        written.push(`[System Env] ${k}`)
+      } catch {}
+    }
+    return written
+  }
+
   const files = getShellRcFiles()
   const written = []