@simonyea/holysheep-cli 1.0.4 → 1.0.6

package/package.json

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

package/src/commands/setup.js

@@ -36,10 +36,19 @@ async function tryAutoInstall(tool) {
 
   const spinner = ora(`正在安装 ${tool.name}...`).start()
   try {
-    spawnSync(info.cmd.split(' ')[0], info.cmd.split(' ').slice(1), {
+    const ret = spawnSync(info.cmd.split(' ')[0], info.cmd.split(' ').slice(1), {
       stdio: 'inherit',
       shell: true,
     })
+    if (ret.status !== 0) {
+      spinner.fail(`安装失败，请手动运行: ${chalk.cyan(info.cmd)}`)
+      return false
+    }
+    // Windows PATH 在当前进程内不会刷新，安装成功即认为可用
+    if (process.platform === 'win32') {
+      spinner.succeed(`${tool.name} 安装完成（请重新开一个终端窗口后运行 hs setup 完成配置）`)
+      return false  // 返回 false 跳过配置，让用户重开终端再来
+    }
     // 安装后重新检测
     if (tool.checkInstalled()) {
       spinner.succeed(`${tool.name} 安装成功`)

package/src/tools/aider.js

@@ -38,10 +38,7 @@ module.exports = {
   name: 'Aider',
   id: 'aider',
   checkInstalled() {
-    try {
-      require('child_process').execSync('which aider', { stdio: 'ignore' })
-      return true
-    } catch { return false }
+    return require('../utils/which').commandExists('aider')
   },
   isConfigured() {
     const content = readConfig()

package/src/tools/claude-code.js

@@ -34,13 +34,7 @@ module.exports = {
   name: 'Claude Code',
   id: 'claude-code',
   checkInstalled() {
-    // 检查是否安装了 claude CLI
-    try {
-      require('child_process').execSync('which claude', { stdio: 'ignore' })
-      return true
-    } catch {
-      return false
-    }
+    return require('../utils/which').commandExists('claude')
   },
   isConfigured() {
     const s = readSettings()

package/src/tools/codex.js

@@ -44,15 +44,7 @@ module.exports = {
   name: 'Codex CLI',
   id: 'codex',
   checkInstalled() {
-    try {
-      require('child_process').execSync('codex --version', { stdio: 'ignore' })
-      return true
-    } catch {
-      try {
-        require('child_process').execSync('npx @openai/codex --version', { stdio: 'ignore' })
-        return true
-      } catch { return false }
-    }
+    return require('../utils/which').commandExists('codex')
   },
   isConfigured() {
     const c = readConfig()
@@ -64,7 +56,7 @@ module.exports = {
 
     // 设置 HolySheep 为默认 provider
     config.provider = 'holysheep'
-    config.model    = config.model || 'claude-sonnet-4-5'
+    config.model    = 'gpt-5.1-codex'  // HolySheep 支持的 Codex 专属模型
 
     if (!config.providers) config.providers = {}
     config.providers.holysheep = {

package/src/tools/gemini-cli.js

@@ -38,10 +38,7 @@ module.exports = {
   name: 'Gemini CLI',
   id: 'gemini-cli',
   checkInstalled() {
-    try {
-      require('child_process').execSync('which gemini', { stdio: 'ignore' })
-      return true
-    } catch { return false }
+    return require('../utils/which').commandExists('gemini')
   },
   isConfigured() {
     const s = readSettings()

package/src/tools/openclaw.js

@@ -44,10 +44,7 @@ module.exports = {
   name: 'OpenClaw',
   id: 'openclaw',
   checkInstalled() {
-    try {
-      require('child_process').execSync('which openclaw', { stdio: 'ignore' })
-      return true
-    } catch { return false }
+    return require('../utils/which').commandExists('openclaw')
   },
   isConfigured() {
     const file = getSettingsFile()

package/src/tools/opencode.js

@@ -53,10 +53,7 @@ module.exports = {
   name: 'OpenCode',
   id: 'opencode',
   checkInstalled() {
-    try {
-      require('child_process').execSync('which opencode', { stdio: 'ignore' })
-      return true
-    } catch { return false }
+    return require('../utils/which').commandExists('opencode')
   },
   isConfigured() {
     const c = readConfig()

package/src/utils/which.js

@@ -0,0 +1,21 @@
+/**
+ * 跨平台检测命令是否存在
+ * Windows 用 where，Unix 用 which，兜底用 --version
+ */
+const { execSync } = require('child_process')
+
+function commandExists(cmd) {
+  const finder = process.platform === 'win32' ? `where ${cmd}` : `which ${cmd}`
+  try {
+    execSync(finder, { stdio: 'ignore' })
+    return true
+  } catch {
+    // 兜底：直接跑 --version
+    try {
+      execSync(`${cmd} --version`, { stdio: 'ignore', timeout: 3000 })
+      return true
+    } catch { return false }
+  }
+}
+
+module.exports = { commandExists }