@simonyea/holysheep-cli 2.0.1 → 2.0.3

package/README.md

@@ -225,6 +225,7 @@ A: OpenClaw 需要 Node.js 20+，运行 `node --version` 确认版本后重试
 
 ## Changelog
 
+- **v2.0.2** — `hs web` 现在内置 AionUi runtime（含 darwin-arm64 bun 运行时），不再依赖开发机上的 `/Users/.../AionUi` 源码目录；npm 安装后可直接起 HolySheep 登录版 AionUi
 - **v2.0.1** — `hs web` 默认切到 HolySheep 登录版 AionUi runtime；本机检测到 AionUi + bun 时直接接管 WebUI，起不来才回退旧版 shell
 - **v2.0.0** — 修复 `hs web` 的关键可用性问题：工具探测改为异步缓存，避免 WebUI 首屏请求卡死；workspace 对话上游请求增加超时保护，防止发送消息时接口悬挂
 - **v1.7.135** — Droid CLI 的 GPT-5.4 配置切回官方要求的 `provider=openai + https://api.holysheep.ai/v1`；同时服务端兼容桥接 `gpt-5.4` 的 `/responses` 请求到 `/v1/chat/completions`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simonyea/holysheep-cli",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "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.",
   "scripts": {
     "test": "node tests/droid.test.js && node tests/workspace-store.test.js"

package/src/commands/webui.js

@@ -6,6 +6,19 @@
 const chalk = require('chalk')
 const { execSync } = require('child_process')
 
+// AionUi runtime is opt-in. The bundled vendor/ directory is stripped from
+// the npm package (see .npmignore) because it only works on darwin-arm64 and
+// bloated 2.0.2 to 160MB. Developers who keep vendor/ around locally can
+// still run AionUi via HOLYSHEEP_WEBUI_AIONUI=1. The legacy WebUI is the
+// default for everyone else.
+function shouldTryAionUi() {
+  if (process.env.HOLYSHEEP_WEBUI_AIONUI === '1') return true
+  // Back-compat: HOLYSHEEP_WEBUI_LEGACY used to be the only way to force
+  // legacy. It now has no effect (legacy is already the default) but we
+  // intentionally don't crash if someone still sets it.
+  return false
+}
+
 async function webui(opts) {
   const port = Number(opts.port) || 9876
 
@@ -18,15 +31,15 @@ async function webui(opts) {
     let child = null
     let mode = 'legacy'
 
-    if (process.env.HOLYSHEEP_WEBUI_LEGACY !== '1') {
+    if (shouldTryAionUi()) {
       try {
         const { startAionUiRuntime } = require('../webui/aionui-runtime')
         const result = await startAionUiRuntime(port)
         child = result.child
         mode = 'aionui'
-        console.log(chalk.green(`✓ AionUi runtime 已接管 hs web`))
+        console.log(chalk.green('✓ AionUi runtime 已接管 hs web'))
       } catch (error) {
-        console.log(chalk.yellow(`! 未切到 AionUi runtime，回退旧版 WebUI: ${error.message}`))
+        console.log(chalk.yellow(`! AionUi runtime 启动失败，回退旧版 WebUI: ${error.message}`))
       }
     }
 

package/src/webui/aionui-runtime.js

@@ -7,6 +7,10 @@ const http = require('http')
 const { execSync, spawn } = require('child_process')
 
 function resolveBunPath() {
+  const bundledBun = path.join(__dirname, 'vendor', 'bun-darwin-arm64')
+  if (process.platform === 'darwin' && process.arch === 'arm64' && fs.existsSync(bundledBun)) {
+    return bundledBun
+  }
   if (process.env.BUN && fs.existsSync(process.env.BUN)) return process.env.BUN
   try {
     const resolved = execSync('which bun', {
@@ -23,6 +27,7 @@ function resolveBunPath() {
 function getRuntimeCandidates() {
   const home = os.homedir()
   return [
+    path.join(__dirname, 'vendor', 'aionui'),
     process.env.HOLYSHEEP_AIONUI_DIR,
     path.join(home, 'AionUi'),
     path.join(home, 'Projects', 'AionUi'),
@@ -81,12 +86,14 @@ function waitForReady(port, timeoutMs = 15000) {
 async function startAionUiRuntime(port) {
   const runtimeDir = resolveAionUiRuntimeDir()
   if (!runtimeDir) {
-    throw new Error('AionUi runtime not found')
+    throw new Error(
+      'AionUi runtime not bundled in this build — set HOLYSHEEP_WEBUI_AIONUI=1 with a local vendor/ directory to enable'
+    )
   }
 
   const bunPath = resolveBunPath()
   if (!bunPath) {
-    throw new Error('bun is required to start the AionUi runtime')
+    throw new Error('bun is required to start the AionUi runtime (install: https://bun.sh)')
   }
 
   const child = spawn(bunPath, ['dist-server/server.mjs'], {

package/tests/droid.test.js

@@ -1,75 +0,0 @@
-const assert = require('assert')
-const fs = require('fs')
-const os = require('os')
-const path = require('path')
-
-const tempHome = fs.mkdtempSync(path.join(os.tmpdir(), 'hs-droid-test-'))
-process.env.HOME = tempHome
-
-const droid = require('../src/tools/droid')
-
-const factoryDir = path.join(tempHome, '.factory')
-const settingsFile = path.join(factoryDir, 'settings.json')
-const configFile = path.join(factoryDir, 'config.json')
-
-fs.mkdirSync(factoryDir, { recursive: true })
-fs.writeFileSync(settingsFile, JSON.stringify({
-  customModels: [
-    {
-      model: 'gpt-5.4',
-      id: 'custom:gpt-5.4-0',
-      baseUrl: 'https://api.holysheep.ai',
-      provider: 'anthropic',
-    },
-    {
-      model: 'local-test',
-      id: 'custom:local-test',
-      baseUrl: 'http://localhost:11434/v1',
-      provider: 'generic-chat-completion-api',
-    },
-  ],
-}, null, 2))
-fs.writeFileSync(configFile, JSON.stringify({
-  customModels: [
-    {
-      model: 'gpt-5.4',
-      id: 'custom:gpt-5.4-0',
-      baseUrl: 'https://api.holysheep.ai',
-      provider: 'anthropic',
-    },
-  ],
-}, null, 2))
-
-droid.configure(
-  'cr_test',
-  'https://api.holysheep.ai',
-  'https://api.holysheep.ai/v1',
-  'gpt-5.4',
-  ['gpt-5.4', 'claude-sonnet-4-6', 'MiniMax-M2.7-highspeed'],
-)
-
-const settings = JSON.parse(fs.readFileSync(settingsFile, 'utf8'))
-const legacy = JSON.parse(fs.readFileSync(configFile, 'utf8'))
-
-for (const config of [settings, legacy]) {
-  const gpt = config.customModels.find((entry) => entry.id === 'custom:gpt-5.4-0')
-  assert.ok(gpt, 'GPT-5.4 custom model should be present')
-  assert.strictEqual(gpt.model, 'gpt-5.4')
-  assert.strictEqual(gpt.provider, 'openai')
-  assert.strictEqual(gpt.baseUrl, 'https://api.holysheep.ai/v1')
-
-  const sonnet = config.customModels.find((entry) => entry.id === 'custom:claude-sonnet-4-6-0')
-  assert.ok(sonnet, 'Sonnet custom model should be present')
-  assert.strictEqual(sonnet.provider, 'anthropic')
-  assert.strictEqual(sonnet.baseUrl, 'https://api.holysheep.ai')
-
-  const minimax = config.customModels.find((entry) => entry.id === 'custom:MiniMax-M2.7-highspeed-0')
-  assert.ok(minimax, 'MiniMax custom model should be present')
-  assert.strictEqual(minimax.provider, 'anthropic')
-  assert.strictEqual(minimax.baseUrl, 'https://api.holysheep.ai/minimax')
-}
-
-const preserved = settings.customModels.find((entry) => entry.id === 'custom:local-test')
-assert.ok(preserved, 'non-HolySheep custom models should be preserved')
-
-console.log('droid config test passed')

package/tests/workspace-store.test.js

@@ -1,57 +0,0 @@
-const assert = require('assert')
-const fs = require('fs')
-const os = require('os')
-const path = require('path')
-
-const tempHome = fs.mkdtempSync(path.join(os.tmpdir(), 'hs-workspace-test-'))
-process.env.HOME = tempHome
-
-const store = require('../src/webui/workspace-store')
-
-store.saveHolySheepApiConfig({
-  apiKey: 'cr_test_runtime',
-  baseUrl: 'https://api.holysheep.ai/v1',
-  model: 'gpt-5.4',
-})
-
-const conversation = store.createConversation({
-  title: 'Build workspace shell',
-  toolId: 'codex',
-})
-
-store.addMessage(conversation.id, {
-  role: 'user',
-  content: 'Need AionUi-style sidebar and search box',
-})
-
-store.addMessage(conversation.id, {
-  role: 'assistant',
-  content: 'Implement the shell and keep the HolySheep tool APIs intact.',
-})
-
-const task = store.saveTask({
-  title: 'Nightly summary',
-  prompt: 'Summarize the latest workspace changes',
-  schedule: '1h',
-  active: true,
-})
-
-const stateFile = store.STATE_FILE
-assert.ok(fs.existsSync(stateFile), 'workspace state file should be created')
-
-const loadedConversation = store.getConversation(conversation.id)
-assert.ok(loadedConversation, 'conversation should be persisted')
-assert.strictEqual(loadedConversation.messages.length, 2, 'conversation messages should be stored')
-
-const search = store.searchWorkspace('sidebar')
-assert.strictEqual(search.conversations.length, 1, 'conversation search should match message content')
-
-const tasks = store.listTasks()
-assert.strictEqual(tasks.length, 1, 'scheduled task should be persisted')
-assert.strictEqual(tasks[0].id, task.id, 'task id should remain stable')
-
-const runtime = store.getHolySheepApiConfig()
-assert.strictEqual(runtime.apiKey, 'cr_test_runtime', 'runtime api key should be stored')
-assert.strictEqual(runtime.model, 'gpt-5.4', 'runtime model should be stored')
-
-console.log('workspace store test passed')