@simonyea/holysheep-cli 1.5.2 → 1.5.4

package/README.md

@@ -188,6 +188,15 @@ A: OpenClaw 需要 Node.js 20+，运行 `node --version` 确认版本后重试
 
 ---
 
+## Changelog
+
+- **v1.5.2** — OpenClaw 安装失败（无 git 环境）时自动降级为 npx 模式继续配置
+- **v1.5.0** — OpenClaw gateway 无需 token，直接浏览器打开 http://127.0.0.1:18789/
+- **v1.4.6** — 基于实测正确配置格式，彻底修复 OpenClaw 401 认证问题
+- **v1.3.x** — OpenClaw 一键配置支持，自动写入配置并启动 Gateway
+
+---
+
 ## License
 
 MIT

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.5.2",
+  "version": "1.5.4",
   "description": "一键配置所有 AI 编程工具接入 HolySheep API — Claude Code / Codex / Gemini CLI / OpenCode / OpenClaw / Aider / Cursor",
   "keywords": [
     "claude",
@@ -17,7 +17,7 @@
     "ai",
     "coding"
   ],
-  "homepage": "https://shop.holysheep.ai",
+  "homepage": "https://holysheep.ai",
   "repository": {
     "type": "git",
     "url": "https://github.com/holysheep123/holysheep-cli"

package/src/commands/setup.js

@@ -72,7 +72,8 @@ async function setup(options) {
 
   if (!apiKey) {
     console.log(chalk.yellow('需要 API Key 才能配置工具。'))
-    console.log(chalk.cyan(`还没有账号？前往注册：${SHOP_URL}`))
+    console.log(chalk.cyan(`👉 免费注册获取 Key：${SHOP_URL}/register`))
+    console.log(chalk.gray(`   （¥10 起充，按量计费，支持微信/支付宝）`))
     console.log(chalk.gray(`提示：可先运行 ${chalk.cyan('hs login')} 登录并保存 Key，之后 setup 将自动读取。`))
     if (process.platform === 'win32') {
       console.log(chalk.gray(`  ⚠️  Windows 用户：如果 ${chalk.cyan('hs')} 命令找不到，请用以下方式运行：`))
@@ -89,9 +90,40 @@ async function setup(options) {
     }])
     apiKey = key
   } else {
-    console.log(`${chalk.green('✓')} 使用已保存的 API Key: ${chalk.cyan(maskKey(apiKey))}`)
+    console.log(`${chalk.green('✓')} 已保存的 API Key: ${chalk.cyan(maskKey(apiKey))}`)
+    const { useExisting } = await inquirer.prompt([{
+      type: 'confirm',
+      name: 'useExisting',
+      message: '使用此 Key 继续？（输入 N 可更换）',
+      default: true,
+    }])
+    if (!useExisting) {
+      const { key } = await inquirer.prompt([{
+        type: 'password',
+        name: 'key',
+        message: '请输入新的 API Key (cr_xxx):',
+        validate: v => v.startsWith('cr_') ? true : '请输入以 cr_ 开头的 API Key',
+      }])
+      apiKey = key
+      saveConfig({ apiKey: key })
+    }
   }
 
+  // Step 1.5: 选择要配置的模型
+  const MODEL_CHOICES = [
+    { name: 'claude-sonnet-4-6  (Sonnet 4.6, 均衡推荐)', value: 'claude-sonnet-4-6',       checked: true },
+    { name: 'claude-opus-4-6    (Opus 4.6, 强力旗舰)',   value: 'claude-opus-4-6',         checked: true },
+    { name: 'MiniMax-M2.5-highspeed (高速经济版)',        value: 'MiniMax-M2.5-highspeed',  checked: true },
+  ]
+  const { selectedModels } = await inquirer.prompt([{
+    type: 'checkbox',
+    name: 'selectedModels',
+    message: '选择要配置的模型（默认全选，空格取消选中）:',
+    choices: MODEL_CHOICES,
+    pageSize: 5,
+  }])
+  const primaryModel = selectedModels.find(m => m.startsWith('claude-')) || selectedModels[0] || 'claude-sonnet-4-6'
+
   // Step 2: 选择工具（已安装 + 未安装分组显示）
   const installedTools   = TOOLS.filter(t => t.checkInstalled())
   const uninstalledTools = TOOLS.filter(t => !t.checkInstalled())
@@ -183,7 +215,7 @@ async function setup(options) {
   for (const tool of toConfigureTools) {
     const spinner = ora(`配置 ${tool.name}...`).start()
     try {
-      const result = tool.configure(apiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI)
+      const result = tool.configure(apiKey, BASE_URL_ANTHROPIC, BASE_URL_OPENAI, primaryModel, selectedModels)
 
       if (result.manual) {
         spinner.info(`${chalk.yellow(tool.name)} 需要手动配置:`)

package/src/tools/aider.js

@@ -44,16 +44,17 @@ module.exports = {
     const content = readConfig()
     return content.includes('holysheep')
   },
-  configure(apiKey, _baseUrlAnthropicNoV1, baseUrlOpenAI) {
+  configure(apiKey, _baseUrlAnthropicNoV1, baseUrlOpenAI, primaryModel) {
     let content = readConfig()
     content = removeHsBlock(content)
     // Aider 用 openai-api-base（OpenAI 兼容格式，带 /v1）
     // model 格式: openai/<model-name> 表示使用 OpenAI 兼容接口
+    const model = primaryModel || 'claude-sonnet-4-6'
     const block = `
 # holysheep-cli managed — https://holysheep.ai
 openai-api-key: ${apiKey}
 openai-api-base: ${baseUrlOpenAI}
-model: openai/claude-sonnet-4-5
+model: openai/${model}
 `
     content += block
     fs.writeFileSync(CONFIG_FILE, content.trim() + '\n', 'utf8')

package/src/tools/continue.js

@@ -84,8 +84,8 @@ function writeYamlConfig(apiKey, baseUrl, models) {
 }
 
 const HS_MODELS = [
-  { name: 'HolySheep — Claude Sonnet', model: 'claude-sonnet-4-5' },
-  { name: 'HolySheep — Claude Opus',   model: 'claude-opus-4-5'   },
+  { name: 'HolySheep — Claude Sonnet', model: 'claude-sonnet-4-6' },
+  { name: 'HolySheep — Claude Opus',   model: 'claude-opus-4-6'   },
 ]
 
 module.exports = {

package/src/tools/openclaw.js

@@ -57,7 +57,7 @@ module.exports = {
     return cfg.includes('holysheep.ai')
   },
 
-  configure(apiKey, baseUrl) {
+  configure(apiKey, baseUrl, _baseUrlOpenAI, primaryModel, selectedModels) {
     const chalk = require('chalk')
     console.log(chalk.gray('\n  ⚙️  正在配置 OpenClaw...'))
 
@@ -90,7 +90,7 @@ module.exports = {
       '--auth-choice', 'custom-api-key',
       '--custom-base-url', baseUrl,
       '--custom-api-key', apiKey,
-      '--custom-model-id', 'claude-sonnet-4-6',
+      '--custom-model-id', primaryModel || 'claude-sonnet-4-6',
       '--custom-compatibility', 'anthropic',
       '--install-daemon',
     )
@@ -98,7 +98,7 @@ module.exports = {
     if (result.status !== 0) {
       // onboard 失败时 fallback：手写最小化配置
       console.log(chalk.yellow('  ⚠️  onboard 失败，使用备用配置...'))
-      _writeFallbackConfig(apiKey, baseUrl)
+      _writeFallbackConfig(apiKey, baseUrl, selectedModels, primaryModel)
     }
 
     // 4. 关闭 gateway token 认证（直接打开浏览器无需 token）
@@ -136,12 +136,19 @@ module.exports = {
 }
 
 /** onboard 失败时的备用配置（基于实测的正确格式） */
-function _writeFallbackConfig(apiKey, baseUrl) {
+function _writeFallbackConfig(apiKey, baseUrl, selectedModels, primaryModel) {
   fs.mkdirSync(OPENCLAW_DIR, { recursive: true })
 
   const hostname = new URL(baseUrl).hostname.replace(/\./g, '-')
   const providerName = `custom-api-${hostname}`
 
+  // 默认配置的 Claude 模型列表（只注册 Claude 系列，MiniMax 用独立 provider）
+  const claudeModels = (selectedModels || ['claude-sonnet-4-6'])
+    .filter(m => m.startsWith('claude-'))
+  if (claudeModels.length === 0) claudeModels.push('claude-sonnet-4-6')
+
+  const primary = primaryModel || claudeModels[0]
+
   const config = {
     models: {
       mode: 'merge',
@@ -150,20 +157,20 @@ function _writeFallbackConfig(apiKey, baseUrl) {
           baseUrl,
           apiKey,
           api: 'anthropic-messages',
-          models: [{
-            id: 'claude-sonnet-4-6',
-            name: 'claude-sonnet-4-6 (HolySheep)',
+          models: claudeModels.map(id => ({
+            id,
+            name: `${id} (HolySheep)`,
             reasoning: false,
             input: ['text'],
             contextWindow: 200000,
             maxTokens: 16000,
-          }],
+          })),
         }
       }
     },
     agents: {
       defaults: {
-        model: { primary: `${providerName}/claude-sonnet-4-6` }
+        model: { primary: `${providerName}/${primary}` }
       }
     },
     gateway: {

package/src/tools/opencode.js

@@ -81,7 +81,7 @@ module.exports = {
       c.provider?.openai?.options?.baseURL?.includes('holysheep')
     )
   },
-  configure(apiKey, baseUrlAnthropicNoV1, baseUrlOpenAI) {
+  configure(apiKey, baseUrlAnthropicNoV1, baseUrlOpenAI, primaryModel) {
     const config = readConfig()
     if (!config.provider) config.provider = {}
 
@@ -105,9 +105,7 @@ module.exports = {
     }
 
     // 设置默认模型
-    if (!config.model) {
-      config.model = 'anthropic/claude-sonnet-4-5'
-    }
+    config.model = `anthropic/${primaryModel || 'claude-sonnet-4-6'}`
 
     writeConfig(config)
     return { file: getConfigFile(), hot: false }