@simonyea/holysheep-cli 1.1.0 → 1.1.1

package/README.md

@@ -40,7 +40,7 @@ Instead of manually editing config files and environment variables for each tool
 | [Codex CLI](https://github.com/openai/codex) | `npm i -g @openai/codex` | `~/.codex/config.toml` | ✅ Auto |
 | [Aider](https://aider.chat) | `pip install aider-install && aider-install` | `~/.aider.conf.yml` | ✅ Auto |
 | [Continue.dev](https://continue.dev) | VS Code marketplace | `~/.continue/config.yaml` | ✅ Auto |
-| [OpenCode](https://github.com/sst/opencode) | `npm i -g opencode-ai` | `~/.config/opencode/config.json` | ✅ Auto |
+| [OpenCode](https://opencode.ai) | `brew install anomalyco/tap/opencode` | `~/.config/opencode/opencode.json` | ✅ Auto |
 | [OpenClaw](https://github.com/iOfficeAI/AionUi) | Download from website | `~/.openclaw/settings.json` | ✅ Auto |
 | [Cursor](https://cursor.sh) | Download from website | GUI only (encrypted storage) | ⚠️ Manual |
 | [Gemini CLI](https://github.com/google-gemini/gemini-cli) | `npm i -g @google/gemini-cli` | Google protocol only | ❌ Not supported |
@@ -134,7 +134,7 @@ HolySheep 是面向中国开发者的 Claude/GPT/Gemini 官方 API 中转服务
 | [Codex CLI](https://github.com/openai/codex) | `npm i -g @openai/codex` | `~/.codex/config.toml` | ✅ 自动 |
 | [Aider](https://aider.chat) | `pip install aider-install && aider-install` | `~/.aider.conf.yml` | ✅ 自动 |
 | [Continue.dev](https://continue.dev) | VS Code 插件市场 | `~/.continue/config.yaml` | ✅ 自动 |
-| [OpenCode](https://github.com/sst/opencode) | `npm i -g opencode-ai` | `~/.config/opencode/config.json` | ✅ 自动 |
+| [OpenCode](https://opencode.ai) | `brew install anomalyco/tap/opencode` | `~/.config/opencode/opencode.json` | ✅ 自动 |
 | [OpenClaw](https://github.com/iOfficeAI/AionUi) | 官网下载 | `~/.openclaw/settings.json` | ✅ 自动 |
 | [Cursor](https://cursor.sh) | 官网下载 | GUI 手动配置（加密存储） | ⚠️ 手动 |
 | [Gemini CLI](https://github.com/google-gemini/gemini-cli) | `npm i -g @google/gemini-cli` | 仅支持 Google 官方协议 | ❌ 不支持 |

package/package.json

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

package/src/tools/aider.js

@@ -44,10 +44,11 @@ module.exports = {
     const content = readConfig()
     return content.includes('holysheep')
   },
-  configure(apiKey, baseUrlOpenAI) {
+  configure(apiKey, _baseUrlAnthropicNoV1, baseUrlOpenAI) {
     let content = readConfig()
     content = removeHsBlock(content)
-    // Aider 用 openai-api-base (不带 /v1 的后缀) 或完整带 /v1
+    // Aider 用 openai-api-base（OpenAI 兼容格式，带 /v1）
+    // model 格式: openai/<model-name> 表示使用 OpenAI 兼容接口
     const block = `
 # holysheep-cli managed — https://shop.holysheep.ai
 openai-api-key: ${apiKey}

package/src/tools/continue.js

@@ -1,79 +1,144 @@
 /**
  * Continue.dev 适配器 (VS Code / JetBrains 插件)
- * 配置文件: ~/.continue/config.json
  *
- * Continue 支持自定义 provider，格式:
- * {
- *   "models": [{
- *     "title": "HolySheep Claude",
- *     "provider": "openai",
- *     "model": "claude-sonnet-4-5",
- *     "apiKey": "cr_xxx",
- *     "apiBase": "https://api.holysheep.ai/v1"
- *   }]
- * }
+ * ⚠️ 重要：Continue 新版本已将配置文件从 config.json 迁移到 config.yaml (YAML格式)
+ * 配置文件: ~/.continue/config.yaml (优先) 或 ~/.continue/config.json (旧版兼容)
+ *
+ * YAML 格式示例:
+ * models:
+ *   - name: HolySheep Claude Sonnet
+ *     provider: openai
+ *     model: claude-sonnet-4-5
+ *     apiKey: cr_xxx
+ *     apiBase: https://api.holysheep.ai/v1
+ *
+ * Continue 支持 OpenAI 兼容 provider，可接入任何兼容端点
+ * 官方文档: https://docs.continue.dev
  */
 const fs = require('fs')
 const path = require('path')
 const os = require('os')
 
-const CONFIG_FILE = path.join(os.homedir(), '.continue', 'config.json')
+const CONTINUE_DIR = path.join(os.homedir(), '.continue')
+const CONFIG_YAML  = path.join(CONTINUE_DIR, 'config.yaml')
+const CONFIG_JSON  = path.join(CONTINUE_DIR, 'config.json')
+
+function getConfigFile() {
+  // 优先使用 config.yaml (新版)
+  if (fs.existsSync(CONFIG_YAML)) return { file: CONFIG_YAML, format: 'yaml' }
+  if (fs.existsSync(CONFIG_JSON)) return { file: CONFIG_JSON, format: 'json' }
+  // 默认创建 yaml
+  return { file: CONFIG_YAML, format: 'yaml' }
+}
+
+function readJsonConfig() {
+  try {
+    return JSON.parse(fs.readFileSync(CONFIG_JSON, 'utf8'))
+  } catch {
+    return { models: [] }
+  }
+}
 
-function readConfig() {
+function writeJsonConfig(data) {
+  fs.mkdirSync(CONTINUE_DIR, { recursive: true })
+  fs.writeFileSync(CONFIG_JSON, JSON.stringify(data, null, 2), 'utf8')
+}
+
+function readYamlRaw() {
   try {
-    if (fs.existsSync(CONFIG_FILE)) return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'))
+    if (fs.existsSync(CONFIG_YAML)) return fs.readFileSync(CONFIG_YAML, 'utf8')
   } catch {}
-  return { models: [], tabAutocompleteModel: null }
+  return ''
 }
 
-function writeConfig(data) {
-  fs.mkdirSync(path.dirname(CONFIG_FILE), { recursive: true })
-  fs.writeFileSync(CONFIG_FILE, JSON.stringify(data, null, 2), 'utf8')
+/**
+ * 写入 YAML 配置（简单字符串追加/替换方式，不依赖 yaml 库）
+ * 先移除已有 HolySheep 模型块，再在 models: 下插入新的
+ */
+function writeYamlConfig(apiKey, baseUrl, models) {
+  fs.mkdirSync(CONTINUE_DIR, { recursive: true })
+
+  let content = readYamlRaw()
+
+  // 移除旧的 holysheep 模型块（以 "  - name: HolySheep" 开头到下一个 "  - " 或 EOF）
+  content = content.replace(/  - name: HolySheep[^\n]*\n(    [^\n]*\n)*/g, '')
+
+  // 如果没有 models: 段，则加上
+  if (!content.includes('models:')) {
+    content = 'models:\n' + content
+  }
+
+  // 构建要插入的模型 YAML 块
+  const modelBlocks = models.map(m => [
+    `  - name: ${m.name}`,
+    `    provider: openai`,
+    `    model: ${m.model}`,
+    `    apiKey: ${apiKey}`,
+    `    apiBase: ${baseUrl}`,
+  ].join('\n')).join('\n')
+
+  // 在 models: 之后插入
+  content = content.replace('models:\n', `models:\n${modelBlocks}\n`)
+
+  fs.writeFileSync(CONFIG_YAML, content.replace(/\n{3,}/g, '\n\n').trimStart(), 'utf8')
 }
 
-const HS_MODELS = (apiKey, baseUrl) => [
-  {
-    title: 'HolySheep — Claude Sonnet',
-    provider: 'openai',
-    model: 'claude-sonnet-4-5',
-    apiKey,
-    apiBase: baseUrl,
-  },
-  {
-    title: 'HolySheep — Claude Opus',
-    provider: 'openai',
-    model: 'claude-opus-4-5',
-    apiKey,
-    apiBase: baseUrl,
-  },
+const HS_MODELS = [
+  { name: 'HolySheep — Claude Sonnet', model: 'claude-sonnet-4-5' },
+  { name: 'HolySheep — Claude Opus',   model: 'claude-opus-4-5'   },
 ]
 
 module.exports = {
   name: 'Continue.dev',
   id: 'continue',
   checkInstalled() {
-    return fs.existsSync(path.join(os.homedir(), '.continue'))
+    return fs.existsSync(CONTINUE_DIR)
   },
   isConfigured() {
-    const c = readConfig()
+    if (fs.existsSync(CONFIG_YAML)) {
+      return readYamlRaw().includes('holysheep')
+    }
+    const c = readJsonConfig()
     return (c.models || []).some(m => m.apiBase?.includes('holysheep'))
   },
-  configure(apiKey, baseUrlOpenAI) {
-    const config = readConfig()
-    // 移除旧的 holysheep models
-    config.models = (config.models || []).filter(m => !m.apiBase?.includes('holysheep'))
-    // 插入新的
-    config.models = [...HS_MODELS(apiKey, baseUrlOpenAI), ...config.models]
-    writeConfig(config)
-    return { file: CONFIG_FILE, hot: true }
+  configure(apiKey, _baseUrlAnthropicNoV1, baseUrlOpenAI) {
+    const { format } = getConfigFile()
+
+    if (format === 'yaml') {
+      writeYamlConfig(apiKey, baseUrlOpenAI, HS_MODELS)
+      return { file: CONFIG_YAML, hot: true }
+    } else {
+      // 兼容旧版 JSON 格式
+      const config = readJsonConfig()
+      config.models = (config.models || []).filter(m => !m.apiBase?.includes('holysheep'))
+      config.models = [
+        ...HS_MODELS.map(m => ({
+          title: m.name,
+          provider: 'openai',
+          model: m.model,
+          apiKey,
+          apiBase: baseUrlOpenAI,
+        })),
+        ...config.models,
+      ]
+      writeJsonConfig(config)
+      return { file: CONFIG_JSON, hot: true }
+    }
   },
   reset() {
-    const config = readConfig()
-    config.models = (config.models || []).filter(m => !m.apiBase?.includes('holysheep'))
-    writeConfig(config)
+    if (fs.existsSync(CONFIG_YAML)) {
+      let content = readYamlRaw()
+      content = content.replace(/  - name: HolySheep[^\n]*\n(    [^\n]*\n)*/g, '')
+      fs.writeFileSync(CONFIG_YAML, content, 'utf8')
+    }
+    if (fs.existsSync(CONFIG_JSON)) {
+      const config = readJsonConfig()
+      config.models = (config.models || []).filter(m => !m.apiBase?.includes('holysheep'))
+      writeJsonConfig(config)
+    }
   },
-  getConfigPath() { return CONFIG_FILE },
-  hint: '配置后在 VS Code Continue 面板选择 HolySheep 模型即可使用',
+  getConfigPath() { return fs.existsSync(CONFIG_YAML) ? CONFIG_YAML : CONFIG_JSON },
+  hint: '新版使用 config.yaml；配置后在 VS Code Continue 面板选择 HolySheep 模型',
   installCmd: 'VS Code 插件市场搜索 "Continue"',
   docsUrl: 'https://continue.dev',
 }

package/src/tools/opencode.js

@@ -1,21 +1,32 @@
 /**
- * OpenCode 适配器 (sst/opencode)
- * 配置文件: ~/.config/opencode/config.json 或 ~/.opencode/config.json
- * 格式: JSON，支持 providers 数组
+ * OpenCode 适配器 (anomalyco/opencode，原 sst/opencode)
+ *
+ * ⚠️ 重要：OpenCode 仓库已从 sst/opencode 迁移到 anomalyco/opencode
+ * 全局配置文件: ~/.config/opencode/opencode.json (不是 config.json!)
+ * 格式: JSON/JSONC，provider 配置格式如下:
  *
- * OpenCode provider 格式:
  * {
- *   "providers": {
+ *   "$schema": "https://opencode.ai/config.json",
+ *   "model": "anthropic/claude-sonnet-4-5",
+ *   "provider": {
  *     "anthropic": {
- *       "apiKey": "cr_xxx",
- *       "baseURL": "https://api.holysheep.ai"
+ *       "options": {
+ *         "baseURL": "https://api.holysheep.ai",
+ *         "apiKey": "cr_xxx"
+ *       }
  *     },
  *     "openai": {
- *       "apiKey": "cr_xxx",
- *       "baseURL": "https://api.holysheep.ai/v1"
+ *       "options": {
+ *         "baseURL": "https://api.holysheep.ai/v1",
+ *         "apiKey": "cr_xxx"
+ *       }
  *     }
  *   }
  * }
+ *
+ * 安装方式(推荐): brew install anomalyco/tap/opencode
+ * 或: npm i -g opencode-ai@latest
+ * 官方文档: https://opencode.ai/docs/config
  */
 const fs = require('fs')
 const path = require('path')
@@ -23,22 +34,30 @@ const os = require('os')
 
 function getConfigFile() {
   const candidates = [
+    // 新版标准路径（官方文档）
+    path.join(os.homedir(), '.config', 'opencode', 'opencode.json'),
+    // 旧版路径兼容
     path.join(os.homedir(), '.config', 'opencode', 'config.json'),
+    path.join(os.homedir(), '.opencode', 'opencode.json'),
     path.join(os.homedir(), '.opencode', 'config.json'),
     // Windows
-    path.join(os.homedir(), 'AppData', 'Roaming', 'opencode', 'config.json'),
+    path.join(os.homedir(), 'AppData', 'Roaming', 'opencode', 'opencode.json'),
   ]
   for (const f of candidates) {
     if (fs.existsSync(f)) return f
   }
-  // 默认路径
-  return path.join(os.homedir(), '.config', 'opencode', 'config.json')
+  // 默认路径（新版标准）
+  return path.join(os.homedir(), '.config', 'opencode', 'opencode.json')
 }
 
 function readConfig() {
   const file = getConfigFile()
   try {
-    if (fs.existsSync(file)) return JSON.parse(fs.readFileSync(file, 'utf8'))
+    if (fs.existsSync(file)) {
+      // 支持 JSONC（带注释的 JSON）
+      const content = fs.readFileSync(file, 'utf8')
+      return JSON.parse(content.replace(/\/\/[^\n]*/g, '').replace(/\/\*[\s\S]*?\*\//g, ''))
+    }
   } catch {}
   return {}
 }
@@ -57,33 +76,52 @@ module.exports = {
   },
   isConfigured() {
     const c = readConfig()
-    return !!(c.providers?.anthropic?.baseURL?.includes('holysheep') ||
-              c.providers?.openai?.baseURL?.includes('holysheep'))
+    return !!(
+      c.provider?.anthropic?.options?.baseURL?.includes('holysheep') ||
+      c.provider?.openai?.options?.baseURL?.includes('holysheep')
+    )
   },
   configure(apiKey, baseUrlAnthropicNoV1, baseUrlOpenAI) {
     const config = readConfig()
-    if (!config.providers) config.providers = {}
-    config.providers.anthropic = {
-      apiKey,
-      baseURL: baseUrlAnthropicNoV1,
+    if (!config.provider) config.provider = {}
+
+    // 设置 schema（方便编辑器自动补全）
+    if (!config['$schema']) config['$schema'] = 'https://opencode.ai/config.json'
+
+    // 配置 Anthropic provider（Claude 模型）
+    config.provider.anthropic = {
+      options: {
+        baseURL: baseUrlAnthropicNoV1,  // https://api.holysheep.ai (无 /v1)
+        apiKey,
+      },
     }
-    config.providers.openai = {
-      apiKey,
-      baseURL: baseUrlOpenAI,
+
+    // 配置 OpenAI provider（GPT 模型）
+    config.provider.openai = {
+      options: {
+        baseURL: baseUrlOpenAI,  // https://api.holysheep.ai/v1
+        apiKey,
+      },
+    }
+
+    // 设置默认模型
+    if (!config.model) {
+      config.model = 'anthropic/claude-sonnet-4-5'
     }
+
     writeConfig(config)
     return { file: getConfigFile(), hot: false }
   },
   reset() {
     const config = readConfig()
-    if (config.providers) {
-      delete config.providers.anthropic
-      delete config.providers.openai
+    if (config.provider) {
+      delete config.provider.anthropic
+      delete config.provider.openai
     }
     writeConfig(config)
   },
   getConfigPath() { return getConfigFile() },
-  hint: '切换后重启 OpenCode 生效',
-  installCmd: 'npm install -g opencode-ai',
-  docsUrl: 'https://github.com/sst/opencode',
+  hint: '切换后重启 OpenCode 生效；配置文件: ~/.config/opencode/opencode.json',
+  installCmd: 'brew install anomalyco/tap/opencode  # 或: npm i -g opencode-ai@latest',
+  docsUrl: 'https://opencode.ai',
 }