@simonyea/holysheep-cli 1.7.89 → 1.7.91

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "1.7.89",
+  "version": "1.7.91",
   "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/tools/antigravity.js

@@ -1,103 +1,42 @@
 /**
  * Antigravity 适配器 (Google Antigravity IDE)
  *
- * CLI 命令：agy（macOS/Linux），Windows 为桌面应用无 CLI
- * 配置文件：~/.gemini/settings.json（与 Gemini CLI 共享，只 merge 不覆盖）
- * 通过 apiEndpoint + apiKeyHeader 字段配置 HolySheep 代理
+ * ⚠️ 重要：Antigravity 不支持自定义 API 代理
+ * 它使用 Google OAuth + 专有后端 (cloudcode-pa.googleapis.com)，和 Gemini CLI 一样。
+ *
+ * HolySheep 暂不支持 Antigravity 中继。
+ * 建议用户使用 Claude Code / Codex / OpenCode / Aider 等支持中继的工具。
  */
 'use strict'
 
-const fs   = require('fs')
-const path = require('path')
-const os   = require('os')
 const { commandExists } = require('../utils/which')
 
-const GEMINI_DIR    = path.join(os.homedir(), '.gemini')
-const SETTINGS_FILE = path.join(GEMINI_DIR, 'settings.json')
-
-function readSettings() {
-  try {
-    if (fs.existsSync(SETTINGS_FILE)) {
-      return JSON.parse(fs.readFileSync(SETTINGS_FILE, 'utf8'))
-    }
-  } catch {}
-  return {}
-}
-
-function writeSettings(data) {
-  if (!fs.existsSync(GEMINI_DIR)) fs.mkdirSync(GEMINI_DIR, { recursive: true })
-  fs.writeFileSync(SETTINGS_FILE, JSON.stringify(data, null, 2), 'utf8')
-}
-
-const INSTALL_CMD = process.platform === 'win32'
-  ? 'winget install Google.Antigravity'
-  : process.platform === 'darwin'
-    ? 'brew install --cask antigravity'
-    : 'flatpak install flathub com.google.Antigravity'
-
-// Windows：通过注册表检测已安装的桌面应用（winget/MSI 安装均会注册）
-function isWindowsAppInstalled() {
-  const { execSync } = require('child_process')
-  for (const hive of ['HKLM', 'HKCU']) {
-    try {
-      const out = execSync(
-        `reg query "${hive}\\Software\\Microsoft\\Windows\\CurrentVersion\\Uninstall" /s /f "Antigravity" /d`,
-        { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 3000 }
-      )
-      if (out.includes('Antigravity')) return true
-    } catch {}
-  }
-  return false
-}
-
 module.exports = {
   name: 'Antigravity',
   id: 'antigravity',
 
-  // 桌面应用：即使检测不到也允许配置（只写 settings.json）
-  configOnly: true,
-
   checkInstalled() {
-    // CLI in PATH
-    if (commandExists('agy')) return true
-    // Windows: 注册表检测桌面应用
-    if (process.platform === 'win32') {
-      if (isWindowsAppInstalled()) return true
-      // 兜底：.gemini 目录存在说明 Antigravity/Gemini 曾运行过
-      if (fs.existsSync(GEMINI_DIR)) return true
-    }
-    // macOS: .app 检测
-    if (process.platform === 'darwin') return fs.existsSync('/Applications/Antigravity.app')
-    return false
+    return commandExists('agy')
   },
 
   isConfigured() {
-    const s = readSettings()
-    return !!(s.apiKey?.startsWith('cr_') && s.apiEndpoint?.includes('holysheep.ai'))
+    return false
   },
 
-  configure(apiKey, _baseUrlAnthropic, baseUrlOpenAI) {
-    const settings = readSettings()
-    settings.selectedAuthType = 'api-key'
-    settings.apiKey = apiKey
-    settings.apiEndpoint = baseUrlOpenAI   // https://api.holysheep.ai/v1
-    settings.apiKeyHeader = 'authorization'
-    writeSettings(settings)
-    return { file: SETTINGS_FILE, hot: true }
+  configure() {
+    return {
+      manual: true,
+      steps: [
+        'Antigravity 使用 Google OAuth 认证 + Google 专有后端，无法配置自定义 API 代理',
+        '建议使用 Claude Code / Codex / OpenCode / Aider 等支持自定义 API 的工具',
+      ],
+    }
   },
 
-  reset() {
-    const s = readSettings()
-    delete s.apiKey
-    delete s.apiEndpoint
-    delete s.apiKeyHeader
-    if (s.selectedAuthType === 'api-key') delete s.selectedAuthType
-    writeSettings(s)
-  },
+  reset() {},
 
-  getConfigPath() { return SETTINGS_FILE },
-  launchCmd: process.platform === 'win32' ? null : 'agy',
-  installCmd: INSTALL_CMD,
-  hint: '配置写入 ~/.gemini/settings.json',
+  getConfigPath() { return null },
+  hint: 'Antigravity 使用 Google 专有协议，不支持 HolySheep 中继',
   docsUrl: 'https://antigravity.google',
+  unsupported: true,
 }

package/src/tools/codex.js

@@ -26,6 +26,7 @@ const CONFIG_DIR  = path.join(os.homedir(), '.codex')
 const CONFIG_FILE = path.join(CONFIG_DIR, 'config.toml')
 // 保留 JSON 兼容性（老版本 TypeScript Codex 用）
 const CONFIG_FILE_JSON = path.join(CONFIG_DIR, 'config.json')
+const AUTH_FILE   = path.join(CONFIG_DIR, 'auth.json')
 
 function normalizeToml(content) {
   return String(content || '').replace(/\r\n/g, '\n')
@@ -149,6 +150,28 @@ function writeJsonConfigIfNeeded(apiKey, baseUrlOpenAI, model) {
   } catch {}
 }
 
+/**
+ * 清除 auth.json 中的 ChatGPT OAuth 认证，避免干扰 holysheep provider
+ * Codex RS bug: auth_mode=chatgpt 时 OAuth token 会覆盖自定义 provider 的 api_key
+ */
+function neutralizeAuthJson() {
+  try {
+    if (!fs.existsSync(AUTH_FILE)) return
+
+    const auth = JSON.parse(fs.readFileSync(AUTH_FILE, 'utf8'))
+
+    // 只在 chatgpt 模式时处理
+    if (auth.auth_mode !== 'chatgpt') return
+
+    // 切换为 api-key 模式，清除 OAuth tokens
+    auth.auth_mode = 'api-key'
+    auth.OPENAI_API_KEY = null
+    delete auth.tokens
+
+    fs.writeFileSync(AUTH_FILE, JSON.stringify(auth, null, 2), 'utf8')
+  } catch {}
+}
+
 module.exports = {
   name: 'Codex CLI',
   id: 'codex',
@@ -167,6 +190,12 @@ module.exports = {
     // 同时写 JSON（兼容旧版 TypeScript Codex）
     writeJsonConfigIfNeeded(apiKey, baseUrlOpenAI, model)
 
+    // 清除 auth.json 中的 ChatGPT OAuth 认证
+    // Codex RS 在 auth_mode=chatgpt 时会用 OAuth JWT token 做 Authorization header，
+    // 即使 config.toml 里设置了自定义 model_provider 的 api_key 也会被覆盖，
+    // 导致 holysheep 收到非 cr_ 前缀的 token 返回 401。
+    neutralizeAuthJson()
+
     return {
       file: CONFIG_FILE,
       hot:  false,

package/src/tools/index.js

@@ -7,5 +7,4 @@ module.exports = [
   require('./droid'),
   require('./opencode'),
   require('./openclaw'),
-  require('./antigravity'),
 ]

package/src/webui/server.js

@@ -122,13 +122,6 @@ const AUTO_INSTALL = {
   'opencode':    { cmd: 'npm install -g opencode-ai' },
   'openclaw':    { cmd: 'npm install -g openclaw@latest --ignore-scripts' },
   'aider':       { cmd: 'pip install aider-chat' },
-  'antigravity': {
-    cmd: process.platform === 'win32'
-      ? 'winget install Google.Antigravity'
-      : process.platform === 'darwin'
-        ? 'brew install --cask antigravity'
-        : 'flatpak install flathub com.google.Antigravity',
-  },
 }
 
 // ── UPGRADABLE_TOOLS (from upgrade.js) ───────────────────────────────────────
@@ -147,15 +140,6 @@ const UPGRADABLE_TOOLS = [
   { name: 'OpenCode', id: 'opencode', command: 'opencode', versionCmd: 'opencode --version', npmPkg: 'opencode-ai', installCmd: 'npm install -g opencode-ai@latest' },
   { name: 'OpenClaw', id: 'openclaw', command: 'openclaw', versionCmd: 'openclaw --version', npmPkg: 'openclaw', installCmd: 'npm install -g openclaw@latest --ignore-scripts' },
   { name: 'Gemini CLI', id: 'gemini-cli', command: 'gemini', versionCmd: 'gemini --version', npmPkg: '@google/gemini-cli', installCmd: 'npm install -g @google/gemini-cli@latest' },
-  {
-    name: 'Antigravity', id: 'antigravity', command: 'agy',
-    versionCmd: 'agy --version', npmPkg: null,
-    installCmd: process.platform === 'win32'
-      ? 'winget install Google.Antigravity'
-      : process.platform === 'darwin'
-        ? 'brew install --cask antigravity'
-        : 'flatpak install flathub com.google.Antigravity',
-  },
 ]
 
 // ── Update check (cached, refreshes every 30min) ────────────────────────────
@@ -304,12 +288,11 @@ async function handleDoctor(_req, res) {
 async function handleTools(_req, res) {
   const tools = await Promise.all(TOOLS.map(async t => {
     const installed = t.checkInstalled()
-    const canConfigure = installed || !!t.configOnly
     return {
       id: t.id,
       name: t.name,
-      installed: canConfigure,
-      configured: canConfigure ? (t.isConfigured?.() || false) : false,
+      installed,
+      configured: installed ? (t.isConfigured?.() || false) : false,
       version: installed ? await getVersionAsync(t) : null,
       installCmd: t.installCmd,
       hint: t.hint || null,
@@ -537,7 +520,7 @@ async function handleToolConfigure(req, res) {
 
   sseStart(res)
 
-  if (!tool.checkInstalled() && !tool.configOnly) {
+  if (!tool.checkInstalled()) {
     sseEmit(res, { type: 'error', message: `${tool.name} 未安装` })
     sseEmit(res, { type: 'done', success: false })
     return res.end()