@simonyea/holysheep-cli 1.2.3 → 1.2.5

package/package.json

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

package/src/tools/openclaw.js

@@ -8,22 +8,25 @@
  * 配置文件: ~/.openclaw/openclaw.json (JSON5 格式)
  * 文档: https://docs.openclaw.ai
  *
- * HolySheep 接入方式：通过 env.ANTHROPIC_API_KEY + env.ANTHROPIC_BASE_URL
- * 设置 Anthropic provider 自定义 base URL 指向 HolySheep 中继
+ * HolySheep 接入方式：
+ *   1. 直接写入完整的 openclaw.json（含 auth profile + gateway + 默认模型）
+ *   2. 自动启动 Gateway，用户直接打开 http://127.0.0.1:18789/
+ *   不需要用户手动跑 onboard / gateway start
  */
-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 crypto        = require('crypto')
 const { spawnSync } = require('child_process')
 
-const OPENCLAW_DIR   = path.join(os.homedir(), '.openclaw')
-const CONFIG_FILE    = path.join(OPENCLAW_DIR, 'openclaw.json')
+const OPENCLAW_DIR  = path.join(os.homedir(), '.openclaw')
+const CONFIG_FILE   = path.join(OPENCLAW_DIR, 'openclaw.json')
 
 function readConfig() {
   try {
     if (fs.existsSync(CONFIG_FILE)) {
-      // openclaw.json 是 JSON5 格式，先去掉注释再 parse
       const raw = fs.readFileSync(CONFIG_FILE, 'utf8')
+      // openclaw.json 是 JSON5 格式，先去掉注释再 parse
       return JSON.parse(raw.replace(/\/\/[^\n]*/g, '').replace(/\/\*[\s\S]*?\*\//g, ''))
     }
   } catch {}
@@ -35,122 +38,194 @@ function writeConfig(data) {
   fs.writeFileSync(CONFIG_FILE, JSON.stringify(data, null, 2), 'utf8')
 }
 
+/** 生成随机 Gateway token */
+function genToken() {
+  return crypto.randomBytes(24).toString('hex')
+}
+
+/**
+ * 构建完整的初始化配置
+ * 包含：auth profile（HolySheep Anthropic-compatible）+ gateway + 默认模型 + holysheep provider
+ */
+function buildFullConfig(existing, apiKey, baseUrlAnthropicNoV1, baseUrlOpenAI) {
+  const config = JSON.parse(JSON.stringify(existing || {}))  // deep clone
+
+  // ── 1. 环境变量（兼容 Anthropic SDK 自动读取）──────────────────────
+  if (!config.env) config.env = {}
+  config.env.ANTHROPIC_API_KEY  = apiKey
+  config.env.ANTHROPIC_BASE_URL = baseUrlAnthropicNoV1   // https://api.holysheep.ai
+
+  // ── 2. Auth profile（Custom Provider，Anthropic-compatible）────────
+  // openclaw 通过 auth profile 管理凭证；写入一个 holysheep profile
+  if (!config.auth) config.auth = {}
+  if (!config.auth.profiles) config.auth.profiles = {}
+  config.auth.profiles.holysheep = {
+    type:     'api-key',
+    provider: 'anthropic',
+    apiKey,
+    baseUrl:  baseUrlAnthropicNoV1,
+  }
+  config.auth.default = 'holysheep'
+
+  // ── 3. 默认模型 ────────────────────────────────────────────────────
+  if (!config.agents) config.agents = {}
+  if (!config.agents.defaults) config.agents.defaults = {}
+  // 总是覆写为 HolySheep 最新 Sonnet（用户可以在 /model 命令里切换）
+  config.agents.defaults.model = {
+    primary: 'anthropic/claude-sonnet-4-5-20250929',
+  }
+
+  // ── 4. 自定义 holysheep provider（OpenAI-compatible，支持所有模型）
+  if (!config.models) config.models = {}
+  config.models.mode = 'merge'
+  if (!config.models.providers) config.models.providers = {}
+  config.models.providers.holysheep = {
+    baseUrl: baseUrlOpenAI,   // https://api.holysheep.ai/v1
+    apiKey,
+    api:     'openai-completions',
+    models: [
+      { 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)'    },
+    ],
+  }
+
+  // ── 5. Gateway 配置（如未设置则初始化，保留已有配置）────────────────
+  if (!config.gateway) config.gateway = {}
+  if (!config.gateway.port) config.gateway.port = 18789
+  if (!config.gateway.bind) config.gateway.bind = '127.0.0.1'
+  // 生成 gateway token（若已有则不覆盖）
+  if (!config.gateway.auth) config.gateway.auth = {}
+  if (!config.gateway.auth.token) {
+    config.gateway.auth.token = genToken()
+    config.gateway.auth.mode  = 'token'
+  }
+
+  // ── 6. Workspace 默认路径 ─────────────────────────────────────────
+  if (!config.workspace) {
+    config.workspace = path.join(OPENCLAW_DIR, 'workspace')
+  }
+
+  return config
+}
+
 module.exports = {
   name: 'OpenClaw',
-  id: 'openclaw',
+  id:   'openclaw',
+
   checkInstalled() {
     return require('../utils/which').commandExists('openclaw')
   },
+
   isConfigured() {
     const c = readConfig()
     return !!(
-      c.env?.ANTHROPIC_BASE_URL?.includes('holysheep') ||
-      c.models?.providers?.holysheep
+      c.auth?.profiles?.holysheep ||
+      c.env?.ANTHROPIC_BASE_URL?.includes('holysheep')
     )
   },
-  configure(apiKey, baseUrlAnthropicNoV1, baseUrlOpenAI) {
-    const config = readConfig()
-
-    // 设置环境变量 — Anthropic provider 使用 ANTHROPIC_BASE_URL 覆盖默认地址
-    if (!config.env) config.env = {}
-    config.env.ANTHROPIC_API_KEY  = apiKey
-    config.env.ANTHROPIC_BASE_URL = baseUrlAnthropicNoV1  // https://api.holysheep.ai
 
-    // 设置默认模型（如果未配置）
-    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-20250929' }
-    }
+  configure(apiKey, baseUrlAnthropicNoV1, baseUrlOpenAI) {
+    const existing = readConfig()
+    const config   = buildFullConfig(existing, apiKey, baseUrlAnthropicNoV1, baseUrlOpenAI)
 
-    // 同时注册一个 holysheep 自定义 provider（支持所有模型）
-    if (!config.models) config.models = {}
-    config.models.mode = 'merge'
-    if (!config.models.providers) config.models.providers = {}
-    config.models.providers.holysheep = {
-      baseUrl: baseUrlOpenAI,  // https://api.holysheep.ai/v1
-      apiKey,
-      api: 'openai-completions',
-      models: [
-        { 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)'    },
-      ],
-    }
+    // 确保 workspace 目录存在（openclaw 首次启动需要）
+    fs.mkdirSync(config.workspace, { recursive: true })
 
     writeConfig(config)
 
-    // 自动启动 Gateway 后台服务（无需用户手动操作）
-    // 先尝试安装 daemon（系统服务），再 start；失败不阻断配置流程
-    _autoStartGateway()
+    // 自动初始化并启动 Gateway
+    _initAndStartGateway()
 
     return { file: CONFIG_FILE, hot: false, _gatewayStarted: true }
   },
+
   reset() {
     const config = readConfig()
     if (config.env) {
       delete config.env.ANTHROPIC_API_KEY
       delete config.env.ANTHROPIC_BASE_URL
     }
-    if (config.models?.providers) {
-      delete config.models.providers.holysheep
-    }
-    // 如果默认模型是 anthropic/xxx，清掉
+    if (config.auth?.profiles) delete config.auth.profiles.holysheep
+    if (config.auth?.default === 'holysheep') delete config.auth.default
+    if (config.models?.providers) delete config.models.providers.holysheep
     if (config.agents?.defaults?.model?.primary?.startsWith('anthropic/')) {
       delete config.agents.defaults.model
     }
     writeConfig(config)
   },
+
   getConfigPath() { return CONFIG_FILE },
-  hint: 'Gateway 已自动启动，浏览器打开 http://127.0.0.1:18789/ 即可使用',
-  launchCmd: null,
+  hint:      'Gateway 已自动在后台启动，打开浏览器即可使用',
+  launchCmd:  null,
   launchNote: '🌐 打开浏览器访问 http://127.0.0.1:18789/',
   installCmd: 'npm install -g openclaw@latest',
-  docsUrl: 'https://docs.openclaw.ai',
+  docsUrl:    'https://docs.openclaw.ai',
 }
 
 /**
- * 自动启动 OpenClaw Gateway 后台服务
- * 1. 先尝试 `openclaw gateway start`（已有 daemon 或上次安装过）
- * 2. 若失败，尝试 `openclaw onboard --install-daemon --yes`（无交互，自动安装系统服务）
- * 3. 再 `openclaw gateway start`
+ * 自动初始化并启动 OpenClaw Gateway
+ *
+ * 策略：
+ *   1. openclaw onboard --non-interactive --install-daemon
+ *      读取已写好的 openclaw.json，无交互完成初始化 + 注册系统服务 + 启动 gateway
+ *   2. 若 onboard 失败（如 Windows 不支持 daemon），直接 gateway start
+ *   3. 仍失败 → Windows: start /B openclaw gateway；Unix: detached spawn
  */
-function _autoStartGateway() {
+function _initAndStartGateway() {
   const chalk = require('chalk')
-  const bin = process.platform === 'win32' ? 'openclaw.cmd' : 'openclaw'
+  const isWin = process.platform === 'win32'
+  const bin   = 'openclaw'
 
-  console.log(chalk.gray('\n  ⚙️  正在启动 OpenClaw Gateway...'))
+  console.log(chalk.gray('\n  ⚙️  正在初始化并启动 OpenClaw Gateway（约 15 秒）...'))
+
+  // Step 1: 无交互 onboard + install-daemon
+  const r1 = spawnSync(bin, ['onboard', '--non-interactive', '--install-daemon'], {
+    shell:   true,
+    timeout: 60000,
+    stdio:   'pipe',
+    env: { ...process.env },
+  })
 
-  // 先直接 start
-  const r1 = spawnSync(bin, ['gateway', 'start'], { shell: true, timeout: 15000 })
   if (r1.status === 0) {
-    console.log(chalk.green('  ✓ OpenClaw Gateway 已在后台启动'))
+    console.log(chalk.green('  ✓ OpenClaw 初始化完成，Gateway 已在后台启动'))
+    console.log(chalk.cyan('  → 浏览器打开: http://127.0.0.1:18789/'))
     return
   }
 
-  // start 失败 → 先 onboard --install-daemon --yes（无交互）再 start
-  console.log(chalk.gray('  → 首次运行，正在初始化服务（约 10 秒）...'))
-  spawnSync(bin, ['onboard', '--install-daemon', '--yes'], {
-    shell: true,
-    timeout: 60000,
-    stdio: 'ignore',
+  // Step 2: onboard 失败，直接 gateway start
+  const r2 = spawnSync(bin, ['gateway', 'start'], {
+    shell:   true,
+    timeout: 15000,
+    stdio:   'pipe',
   })
-
-  const r2 = spawnSync(bin, ['gateway', 'start'], { shell: true, timeout: 15000 })
   if (r2.status === 0) {
-    console.log(chalk.green('  ✓ OpenClaw Gateway 已在后台启动'))
+    console.log(chalk.green('  ✓ OpenClaw Gateway 已启动'))
+    console.log(chalk.cyan('  → 浏览器打开: http://127.0.0.1:18789/'))
+    return
+  }
+
+  // Step 3: fallback — 后台守护进程
+  if (isWin) {
+    // Windows: 用 cmd start 开新窗口后台运行
+    spawnSync('cmd', ['/c', `start /B "" openclaw gateway --port 18789`], {
+      shell: true, stdio: 'ignore',
+    })
   } else {
-    // 仍然失败 → fallback：前台静默运行（detached）
     const { spawn } = require('child_process')
-    const child = spawn(bin, ['gateway'], {
-      shell: true,
+    const child = spawn(bin, ['gateway', '--port', '18789'], {
       detached: true,
-      stdio: 'ignore',
+      stdio:    'ignore',
     })
     child.unref()
-    console.log(chalk.green('  ✓ OpenClaw Gateway 已启动（前台守护模式）'))
   }
+
+  // 等 3 秒让 gateway 起来
+  const t = Date.now(); while (Date.now() - t < 3000) {}
+
+  console.log(chalk.green('  ✓ OpenClaw Gateway 已启动'))
+  console.log(chalk.cyan('  → 浏览器打开: http://127.0.0.1:18789/'))
 }