@simonyea/holysheep-cli 1.1.9 → 1.2.1

package/package.json

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

package/src/commands/setup.js

@@ -238,23 +238,25 @@ async function setup(options) {
       console.log(`  ✓ ${r.tool.name}${hot}`)
       if (r.tool.hint) console.log(`    ${chalk.gray('💡 ' + r.tool.hint)}`)
       // 显示启动命令
-      if (r.tool.launchCmd) {
+      if (r.tool.launchSteps) {
+        // 多步骤启动（如 openclaw）
+        console.log(`    ${chalk.gray('▶  启动步骤:')}`)
+        r.tool.launchSteps.forEach((s, i) => {
+          console.log(`    ${chalk.gray(`   ${i + 1}.`)} ${chalk.cyan.bold(s.cmd)}  ${chalk.gray(s.note)}`)
+        })
+      } else if (r.tool.launchCmd) {
         if (r.tool._winJustInstalled) {
-          // Windows 刚安装：PATH 未刷新，统一用 npx 运行
           const cmdBin = r.tool.launchCmd.split(' ')[0]
           const cmdArgs = r.tool.launchCmd.split(' ').slice(1).join(' ')
           const npxCmd = 'npx ' + cmdBin + (cmdArgs ? ' ' + cmdArgs : '')
           console.log(`    ${chalk.gray('▶  启动命令:')} ${chalk.cyan.bold(npxCmd)}`)
-          if (r.tool.launchNote) console.log(`    ${chalk.gray('   ' + r.tool.launchNote)}`)
         } else {
           console.log(`    ${chalk.gray('▶  启动命令:')} ${chalk.cyan.bold(r.tool.launchCmd)}`)
         }
+        if (r.tool.launchNote) console.log(`    ${chalk.gray('   ' + r.tool.launchNote)}`)
       } else if (r.tool.launchNote) {
         console.log(`    ${chalk.gray('▶  ' + r.tool.launchNote)}`)
       }
-      if (r.tool.launchNote && r.tool.launchCmd && !r.tool._winJustInstalled) {
-        console.log(`    ${chalk.gray('   ' + r.tool.launchNote)}`)
-      }
     })
     console.log()
   }

package/src/tools/openclaw.js

@@ -59,7 +59,7 @@ module.exports = {
     if (!config.agents) config.agents = {}
     if (!config.agents.defaults) config.agents.defaults = {}
     if (!config.agents.defaults.model) {
-      config.agents.defaults.model = { primary: 'anthropic/claude-sonnet-4-5' }
+      config.agents.defaults.model = { primary: 'anthropic/claude-sonnet-4-5-20250929' }
     }
 
     // 同时注册一个 holysheep 自定义 provider（支持所有模型）
@@ -71,10 +71,12 @@ module.exports = {
       apiKey,
       api: 'openai-completions',
       models: [
-        { id: 'claude-sonnet-4-5', name: 'Claude Sonnet 4.5 (HolySheep)' },
-        { id: 'claude-opus-4-5',   name: 'Claude Opus 4.5 (HolySheep)'   },
-        { id: 'gpt-5.4',           name: 'GPT-5.4 (HolySheep)'           },
-        { id: 'gpt-5',             name: 'GPT-5 (HolySheep)'             },
+        { id: 'claude-sonnet-4-5-20250929', name: 'Claude Sonnet 4.5 (HolySheep)' },
+        { id: 'claude-sonnet-4-20250514',   name: 'Claude Sonnet 4 (HolySheep)'   },
+        { id: 'claude-opus-4-5-20251101',   name: 'Claude Opus 4.5 (HolySheep)'   },
+        { id: 'claude-opus-4-20250514',     name: 'Claude Opus 4 (HolySheep)'     },
+        { id: 'gpt-4o',                     name: 'GPT-4o (HolySheep)'            },
+        { id: 'gemini-2.5-pro',             name: 'Gemini 2.5 Pro (HolySheep)'    },
       ],
     }
 
@@ -98,8 +100,12 @@ module.exports = {
   },
   getConfigPath() { return CONFIG_FILE },
   hint: '切换后重启 OpenClaw 生效；支持 /model 命令切换模型',
-  launchCmd: 'openclaw dashboard',
-  launchNote: '启动后访问 http://127.0.0.1:18789/ 打开 WebUI',
+  launchCmd: null,
+  launchSteps: [
+    { cmd: 'npx openclaw onboard',        note: '首次初始化（设置模型、鉴权等）' },
+    { cmd: 'npx openclaw gateway start',  note: '启动后台 Gateway 服务'          },
+    { cmd: 'npx openclaw dashboard',      note: '打开 WebUI → http://127.0.0.1:18789/' },
+  ],
   installCmd: 'npm install -g openclaw@latest',
   docsUrl: 'https://docs.openclaw.ai',
 }

package/src/utils/shell.js

@@ -41,26 +41,31 @@ function removeHsBlock(content) {
   return content.replace(re, '')
 }
 
-function buildEnvBlock(envVars) {
+function buildEnvBlock(envVars, isFish = false) {
   const lines = [MARKER_START]
   for (const [k, v] of Object.entries(envVars)) {
-    lines.push(`export ${k}="${v}"`)
+    // fish shell 用 set -gx，其他 shell 用 export
+    lines.push(isFish ? `set -gx ${k} "${v}"` : `export ${k}="${v}"`)
   }
   lines.push(MARKER_END)
   return '\n' + lines.join('\n') + '\n'
 }
 
 function writeEnvToShell(envVars) {
-  // Windows: 用 setx 写入用户级环境变量
+  // 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}`)
+        written.push(`[系统环境变量] ${k}`)
       } catch {}
     }
+    if (written.length > 0) {
+      const chalk = require('chalk')
+      console.log(chalk.yellow('\n  ⚠️  Windows 环境变量已写入，需要重启终端后生效'))
+    }
     return written
   }
 
@@ -71,7 +76,8 @@ function writeEnvToShell(envVars) {
     let content = ''
     try { content = fs.readFileSync(file, 'utf8') } catch {}
     content = removeHsBlock(content)
-    content += buildEnvBlock(envVars)
+    const isFish = file.endsWith('config.fish')
+    content += buildEnvBlock(envVars, isFish)
     fs.writeFileSync(file, content, 'utf8')
     written.push(file)
   }