@simonyea/holysheep-cli 1.5.9 → 1.6.0

package/README.md

@@ -38,6 +38,7 @@ Instead of manually editing config files for each tool, run one command and you'
 |------|-------------|--------|
 | [Claude Code](https://docs.anthropic.com/claude-code) | `~/.claude/settings.json` | ✅ Auto |
 | [Codex CLI](https://github.com/openai/codex) | `~/.codex/config.toml` | ✅ Auto |
+| Droid CLI | `~/.factory/config.json` | ✅ Auto |
 | [Aider](https://aider.chat) | `~/.aider.conf.yml` | ✅ Auto |
 | [Continue.dev](https://continue.dev) | `~/.continue/config.yaml` | ✅ Auto |
 | [OpenCode](https://github.com/anomalyco/opencode) | `~/.config/opencode/opencode.json` | ✅ Auto |
@@ -113,6 +114,7 @@ npx openclaw gateway --port 18789
 |------|------|------|
 | [Claude Code](https://docs.anthropic.com/claude-code) | ✅ 自动 | Anthropic 官方 CLI |
 | [Codex CLI](https://github.com/openai/codex) | ✅ 自动 | OpenAI 官方 CLI |
+| Droid CLI | ✅ 自动 | Factory AI 终端智能体 |
 | [Aider](https://aider.chat) | ✅ 自动 | AI 结对编程 |
 | [Continue.dev](https://continue.dev) | ✅ 自动 | VS Code/JetBrains 插件 |
 | [OpenCode](https://github.com/anomalyco/opencode) | ✅ 自动 | 终端 AI 编程助手 |
@@ -195,6 +197,7 @@ A: OpenClaw 需要 Node.js 20+，运行 `node --version` 确认版本后重试
 
 ## Changelog
 
+- **v1.6.0** — 新增 Droid CLI 一键配置，默认写入 GPT-5.4 / Sonnet 4.6 / Opus 4.6 / MiniMax 2.7 Highspeed / Haiku 4.5
 - **v1.5.2** — OpenClaw 安装失败（无 git 环境）时自动降级为 npx 模式继续配置
 - **v1.5.0** — OpenClaw gateway 无需 token，直接浏览器打开 http://127.0.0.1:18789/
 - **v1.4.6** — 基于实测正确配置格式，彻底修复 OpenClaw 401 认证问题

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.5.9",
+  "version": "1.6.0",
   "description": "Claude Code/Cursor/Cline API relay for China — ¥1=$1, WeChat/Alipay payment, no credit card, no VPN. One command setup for all AI coding tools.",
   "keywords": [
     "openai-china",

package/src/commands/doctor.js

@@ -94,6 +94,7 @@ function getVersion(toolId) {
   const cmds = {
     'claude-code': 'claude --version',
     'codex':       'codex --version',
+    'droid':       'droid --version',
     'gemini-cli':  'gemini --version',
     'opencode':    'opencode --version',
     'openclaw':    'openclaw --version',

package/src/commands/setup.js

@@ -112,9 +112,11 @@ async function setup(options) {
 
   // 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 },
+    { name: 'gpt-5.4             (GPT 5.4, 通用编码)',    value: 'gpt-5.4',                 checked: true },
+    { 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.7-highspeed (高速经济版)',         value: 'MiniMax-M2.7-highspeed',  checked: true },
+    { name: 'claude-haiku-4-5    (Haiku 4.5, 轻快便宜)',  value: 'claude-haiku-4-5',        checked: true },
   ]
   const { selectedModels } = await inquirer.prompt([{
     type: 'checkbox',

package/src/index.js

@@ -56,7 +56,7 @@ program
 🐑  HolySheep CLI v${pkg.version}
 官方 Claude / GPT / Gemini API · ¥1=$1 · https://holysheep.ai
 
-支持工具: Claude Code · Codex · Gemini CLI · OpenCode · OpenClaw · Aider · Cursor · Continue
+支持工具: Claude Code · Codex · Droid · Gemini CLI · OpenCode · OpenClaw · Aider · Cursor · Continue
 `)
 
 // ── login ────────────────────────────────────────────────────────────────────

package/src/tools/droid.js

@@ -0,0 +1,149 @@
+/**
+ * Droid CLI 适配器
+ * 配置文件: ~/.factory/config.json
+ *
+ * 使用 Droid 原生 customModels 配置 HolySheep 的多个模型入口：
+ * - GPT 走 OpenAI 兼容入口:   https://api.holysheep.ai/openai
+ * - Claude 走 Anthropic 入口: https://api.holysheep.ai
+ * - MiniMax 走 Anthropic 入口: https://api.holysheep.ai/minimax
+ */
+const fs = require('fs')
+const path = require('path')
+const os = require('os')
+
+const CONFIG_DIR = path.join(os.homedir(), '.factory')
+const CONFIG_FILE = path.join(CONFIG_DIR, 'config.json')
+
+const DEFAULT_MODELS = [
+  {
+    model: 'gpt-5.4',
+    id: 'custom:gpt-5.4-0',
+    baseUrlSuffix: '/openai',
+    displayName: 'GPT-5.4',
+    provider: 'openai',
+  },
+  {
+    model: 'claude-sonnet-4-6',
+    id: 'custom:claude-sonnet-4-6-0',
+    baseUrlSuffix: '',
+    displayName: 'Sonnet 4.6',
+    provider: 'anthropic',
+  },
+  {
+    model: 'claude-opus-4-6',
+    id: 'custom:claude-opus-4-6-0',
+    baseUrlSuffix: '',
+    displayName: 'Opus 4.6',
+    provider: 'anthropic',
+  },
+  {
+    model: 'MiniMax-M2.7-highspeed',
+    id: 'custom:MiniMax-M2.7-highspeed-0',
+    baseUrlSuffix: '/minimax',
+    displayName: 'MiniMax 2.7 Highspeed',
+    provider: 'anthropic',
+  },
+  {
+    model: 'claude-haiku-4-5',
+    id: 'custom:claude-haiku-4-5-0',
+    baseUrlSuffix: '',
+    displayName: 'Haiku 4.5',
+    provider: 'anthropic',
+  },
+]
+
+function readConfig() {
+  try {
+    if (fs.existsSync(CONFIG_FILE)) {
+      return JSON.parse(fs.readFileSync(CONFIG_FILE, 'utf8'))
+    }
+  } catch {}
+  return {}
+}
+
+function writeConfig(data) {
+  fs.mkdirSync(CONFIG_DIR, { recursive: true })
+  fs.writeFileSync(CONFIG_FILE, JSON.stringify(data, null, 2), 'utf8')
+}
+
+function normalizeSelectedModels(selectedModels) {
+  const selected = new Set(
+    Array.isArray(selectedModels) && selectedModels.length > 0
+      ? selectedModels
+      : DEFAULT_MODELS.map((item) => item.model)
+  )
+  const models = DEFAULT_MODELS.filter((item) => selected.has(item.model)).map((item, index) => ({
+    model: item.model,
+    id: item.id,
+    index,
+    baseUrlSuffix: item.baseUrlSuffix,
+    displayName: item.displayName,
+    provider: item.provider,
+  }))
+
+  return models.length > 0 ? models : DEFAULT_MODELS.map((item, index) => ({ ...item, index }))
+}
+
+function buildCustomModels(apiKey, baseUrlAnthropic, selectedModels) {
+  const rootUrl = String(baseUrlAnthropic || '').replace(/\/+$/, '')
+  return normalizeSelectedModels(selectedModels).map((item) => ({
+    model: item.model,
+    id: item.id,
+    index: item.index,
+    baseUrl: `${rootUrl}${item.baseUrlSuffix}`,
+    apiKey,
+    displayName: item.displayName,
+    maxOutputTokens: 64000,
+    noImageSupport: true,
+    provider: item.provider,
+  }))
+}
+
+module.exports = {
+  name: 'Droid CLI',
+  id: 'droid',
+  checkInstalled() {
+    return require('../utils/which').commandExists('droid')
+  },
+  isConfigured() {
+    const config = readConfig()
+    const customModels = Array.isArray(config.customModels) ? config.customModels : []
+    return customModels.some((item) =>
+      typeof item.baseUrl === 'string' && item.baseUrl.includes('api.holysheep.ai')
+    )
+  },
+  configure(apiKey, baseUrlAnthropic, _baseUrlOpenAI, _primaryModel, selectedModels) {
+    const config = readConfig()
+    const preservedModels = Array.isArray(config.customModels)
+      ? config.customModels.filter(
+          (item) => !(typeof item.baseUrl === 'string' && item.baseUrl.includes('api.holysheep.ai'))
+        )
+      : []
+
+    config.customModels = [
+      ...buildCustomModels(apiKey, baseUrlAnthropic, selectedModels),
+      ...preservedModels,
+    ]
+    config.logoAnimation = 'off'
+    writeConfig(config)
+
+    return {
+      file: CONFIG_FILE,
+      hot: true,
+    }
+  },
+  reset() {
+    const config = readConfig()
+    if (Array.isArray(config.customModels)) {
+      config.customModels = config.customModels.filter(
+        (item) => !(typeof item.baseUrl === 'string' && item.baseUrl.includes('api.holysheep.ai'))
+      )
+    }
+    writeConfig(config)
+  },
+  getConfigPath() { return CONFIG_FILE },
+  hint: '已写入 ~/.factory/config.json；重启 Droid 后可见 HolySheep 模型列表',
+  launchCmd: 'droid',
+  installCmd: 'brew install --cask droid',
+  docsUrl: 'https://docs.factory.ai/cli/getting-started/overview',
+}

package/src/tools/index.js

@@ -4,6 +4,7 @@
 module.exports = [
   require('./claude-code'),
   require('./codex'),
+  require('./droid'),
   require('./gemini-cli'),
   require('./opencode'),
   require('./openclaw'),