@simonyea/holysheep-cli 1.2.1 → 1.2.3

package/package.json

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

package/src/tools/openclaw.js

@@ -11,9 +11,10 @@
  * HolySheep 接入方式：通过 env.ANTHROPIC_API_KEY + env.ANTHROPIC_BASE_URL
  * 设置 Anthropic provider 自定义 base URL 指向 HolySheep 中继
  */
-const fs   = require('fs')
-const path = require('path')
-const os   = require('os')
+const fs           = require('fs')
+const path         = require('path')
+const os           = require('os')
+const { spawnSync } = require('child_process')
 
 const OPENCLAW_DIR   = path.join(os.homedir(), '.openclaw')
 const CONFIG_FILE    = path.join(OPENCLAW_DIR, 'openclaw.json')
@@ -81,7 +82,12 @@ module.exports = {
     }
 
     writeConfig(config)
-    return { file: CONFIG_FILE, hot: false }
+
+    // 自动启动 Gateway 后台服务（无需用户手动操作）
+    // 先尝试安装 daemon（系统服务），再 start；失败不阻断配置流程
+    _autoStartGateway()
+
+    return { file: CONFIG_FILE, hot: false, _gatewayStarted: true }
   },
   reset() {
     const config = readConfig()
@@ -99,13 +105,52 @@ module.exports = {
     writeConfig(config)
   },
   getConfigPath() { return CONFIG_FILE },
-  hint: '切换后重启 OpenClaw 生效；支持 /model 命令切换模型',
+  hint: 'Gateway 已自动启动，浏览器打开 http://127.0.0.1:18789/ 即可使用',
   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/' },
-  ],
+  launchNote: '🌐 打开浏览器访问 http://127.0.0.1:18789/',
   installCmd: 'npm install -g openclaw@latest',
   docsUrl: 'https://docs.openclaw.ai',
 }
+
+/**
+ * 自动启动 OpenClaw Gateway 后台服务
+ * 1. 先尝试 `openclaw gateway start`（已有 daemon 或上次安装过）
+ * 2. 若失败，尝试 `openclaw onboard --install-daemon --yes`（无交互，自动安装系统服务）
+ * 3. 再 `openclaw gateway start`
+ */
+function _autoStartGateway() {
+  const chalk = require('chalk')
+  const bin = process.platform === 'win32' ? 'openclaw.cmd' : 'openclaw'
+
+  console.log(chalk.gray('\n  ⚙️  正在启动 OpenClaw Gateway...'))
+
+  // 先直接 start
+  const r1 = spawnSync(bin, ['gateway', 'start'], { shell: true, timeout: 15000 })
+  if (r1.status === 0) {
+    console.log(chalk.green('  ✓ OpenClaw Gateway 已在后台启动'))
+    return
+  }
+
+  // start 失败 → 先 onboard --install-daemon --yes（无交互）再 start
+  console.log(chalk.gray('  → 首次运行，正在初始化服务（约 10 秒）...'))
+  spawnSync(bin, ['onboard', '--install-daemon', '--yes'], {
+    shell: true,
+    timeout: 60000,
+    stdio: 'ignore',
+  })
+
+  const r2 = spawnSync(bin, ['gateway', 'start'], { shell: true, timeout: 15000 })
+  if (r2.status === 0) {
+    console.log(chalk.green('  ✓ OpenClaw Gateway 已在后台启动'))
+  } else {
+    // 仍然失败 → fallback：前台静默运行（detached）
+    const { spawn } = require('child_process')
+    const child = spawn(bin, ['gateway'], {
+      shell: true,
+      detached: true,
+      stdio: 'ignore',
+    })
+    child.unref()
+    console.log(chalk.green('  ✓ OpenClaw Gateway 已启动（前台守护模式）'))
+  }
+}

package/src/utils/shell.js

@@ -41,6 +41,25 @@ function removeHsBlock(content) {
   return content.replace(re, '')
 }
 
+/**
+ * 移除 rc 文件里用户手动写的同名 export/set -gx 行
+ * 防止旧值在 holysheep-cli managed 块之后覆盖新值
+ */
+function removeStaleExports(content, keys, isFish = false) {
+  let result = content
+  for (const key of keys) {
+    if (isFish) {
+      // fish: set -gx KEY "..." 或 set -gx KEY ...
+      result = result.replace(new RegExp(`\\n?set\\s+-gx\\s+${escapeRegex(key)}\\s+[^\\n]*\\n?`, 'g'), '\n')
+    } else {
+      // bash/zsh: export KEY="..." 或 export KEY=...
+      result = result.replace(new RegExp(`\\n?export\\s+${escapeRegex(key)}=[^\\n]*\\n?`, 'g'), '\n')
+    }
+  }
+  // 清理多余空行
+  return result.replace(/\n{3,}/g, '\n\n')
+}
+
 function buildEnvBlock(envVars, isFish = false) {
   const lines = [MARKER_START]
   for (const [k, v] of Object.entries(envVars)) {
@@ -75,8 +94,12 @@ function writeEnvToShell(envVars) {
   for (const file of files) {
     let content = ''
     try { content = fs.readFileSync(file, 'utf8') } catch {}
-    content = removeHsBlock(content)
     const isFish = file.endsWith('config.fish')
+    // 1. 清理旧的 holysheep managed 块
+    content = removeHsBlock(content)
+    // 2. 清理用户手动写的同名 export（防止旧值覆盖新值）
+    content = removeStaleExports(content, Object.keys(envVars), isFish)
+    // 3. 追加新的 managed 块
     content += buildEnvBlock(envVars, isFish)
     fs.writeFileSync(file, content, 'utf8')
     written.push(file)
@@ -84,15 +107,24 @@ function writeEnvToShell(envVars) {
   return written
 }
 
-function removeEnvFromShell() {
+function removeEnvFromShell(extraKeys = []) {
+  // 默认清理的 key 列表（holysheep 相关的所有环境变量）
+  const HS_KEYS = [
+    'ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL',
+    'OPENAI_API_KEY', 'OPENAI_BASE_URL',
+    'HOLYSHEEP_API_KEY',
+    ...extraKeys,
+  ]
   const files = getShellRcFiles()
   const cleaned = []
   for (const file of files) {
     if (!fs.existsSync(file)) continue
+    const isFish = file.endsWith('config.fish')
     let content = fs.readFileSync(file, 'utf8')
-    const cleaned_content = removeHsBlock(content)
-    if (cleaned_content !== content) {
-      fs.writeFileSync(file, cleaned_content, 'utf8')
+    let updated = removeHsBlock(content)
+    updated = removeStaleExports(updated, HS_KEYS, isFish)
+    if (updated !== content) {
+      fs.writeFileSync(file, updated, 'utf8')
       cleaned.push(file)
     }
   }