@simonyea/holysheep-cli 2.1.40 → 2.1.41

package/src/utils/shell.js

@@ -1,342 +0,0 @@
-/**
- * Shell RC 文件管理 — 写入/清理环境变量
- */
-const fs = require('fs')
-const path = require('path')
-const os = require('os')
-const { execSync } = require('child_process')
-const pkg = require('../../package.json')
-
-const MARKER_START = '# >>> holysheep-cli managed >>>'
-const MARKER_END   = '# <<< holysheep-cli managed <<<'
-
-function getShellRcFiles() {
-  const home = os.homedir()
-
-  // Windows：不写 shell rc，改用 setx 写系统环境变量
-  if (process.platform === 'win32') return []
-
-  const shell = process.env.SHELL || ''
-  const candidates = []
-
-  if (shell.includes('zsh'))  candidates.push(path.join(home, '.zshrc'))
-  if (shell.includes('bash')) candidates.push(path.join(home, '.bashrc'), path.join(home, '.bash_profile'))
-  if (shell.includes('fish')) candidates.push(path.join(home, '.config', 'fish', 'config.fish'))
-
-  // 默认兜底
-  if (candidates.length === 0) {
-    const zshrc  = path.join(home, '.zshrc')
-    const bashrc = path.join(home, '.bashrc')
-    if (fs.existsSync(zshrc))  candidates.push(zshrc)
-    if (fs.existsSync(bashrc)) candidates.push(bashrc)
-    if (candidates.length === 0) candidates.push(zshrc)
-  }
-
-  return candidates
-}
-
-function removeHsBlock(content) {
-  const re = new RegExp(
-    `\\n?${escapeRegex(MARKER_START)}[\\s\\S]*?${escapeRegex(MARKER_END)}\\n?`,
-    'g'
-  )
-  return content.replace(re, '')
-}
-
-/**
- * 移除 rc 文件里用户手动写的同名 export/set -gx 行
- * 防止旧值在 holysheep-cli managed 块之后覆盖新值
- */
-function removeStaleExports(content, keys, isFish = false) {
-  let result = content
-  for (const key of keys) {
-    if (isFish) {
-      // fish: set -gx KEY "..." 或 set -gx KEY ...
-      result = result.replace(new RegExp(`\\n?set\\s+-gx\\s+${escapeRegex(key)}\\s+[^\\n]*\\n?`, 'g'), '\n')
-    } else {
-      // bash/zsh: export KEY="..." 或 export KEY=...
-      result = result.replace(new RegExp(`\\n?export\\s+${escapeRegex(key)}=[^\\n]*\\n?`, 'g'), '\n')
-    }
-  }
-  // 清理多余空行
-  return result.replace(/\n{3,}/g, '\n\n')
-}
-
-function buildEnvBlock(envVars, isFish = false) {
-  const lines = [MARKER_START]
-  for (const [k, v] of Object.entries(envVars)) {
-    // fish shell 用 set -gx，其他 shell 用 export
-    lines.push(isFish ? `set -gx ${k} "${v}"` : `export ${k}="${v}"`)
-  }
-  lines.push(MARKER_END)
-  return '\n' + lines.join('\n') + '\n'
-}
-
-function ensureWindowsUserPathHasNpmBin() {
-  if (process.platform !== 'win32') return []
-
-  const appData = process.env.APPDATA
-  if (!appData) return []
-
-  const npmBin = path.join(appData, 'npm')
-  let currentPath = ''
-  try {
-    currentPath = execSync(
-      'powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::GetEnvironmentVariable(\'Path\', \'User\')"',
-      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }
-    ).trim()
-  } catch {
-    currentPath = process.env.PATH || ''
-  }
-
-  const parts = currentPath
-    .split(';')
-    .map((item) => item.trim())
-    .filter(Boolean)
-
-  const hasNpmBin = parts.some((item) => item.toLowerCase() === npmBin.toLowerCase())
-  if (hasNpmBin) return []
-
-  const nextPath = [...parts, npmBin].join(';')
-  try {
-    const escapedPath = nextPath.replace(/'/g, "''")
-    execSync(
-      `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::SetEnvironmentVariable('Path', '${escapedPath}', 'User')"`,
-      { stdio: 'ignore' }
-    )
-    return ['[用户 PATH] %APPDATA%\\npm']
-  } catch {
-    try {
-      const chalk = require('chalk')
-      console.warn(chalk.yellow(
-        `  ⚠️  无法自动更新 PATH，请手动将以下路径加入系统环境变量 PATH：\n     ${npmBin}`
-      ))
-    } catch {}
-    return []
-  }
-}
-
-/**
- * [HolySheep fork v2.1.36 / hs25] Same mechanism as
- * `ensureWindowsUserPathHasNpmBin`, but targets `%USERPROFILE%\.local\bin`.
- *
- * Background: Claude Code's official Windows installer (irm
- * https://claude.ai/install.ps1 | iex) drops `claude.exe` under
- * `C:\Users\<user>\.local\bin` and prints a warning that this directory
- * is NOT on PATH. Our CLI Manager page then calls `commandExists('claude')`
- * which runs `where claude` — finds nothing — and reports 未安装, even
- * though the install succeeded.
- *
- * This helper:
- *   1. Persists `.local\bin` into the USER-level Path (so new terminals
- *      see it too).
- *   2. Appends it to `process.env.PATH` of the current process, so that
- *      the very next `commandExists('claude')` call in the same Node
- *      instance resolves correctly — no restart required.
- *
- * Returns a list of human-readable lines describing what was touched.
- * No-op on non-Windows (returns []).
- */
-function ensureWindowsUserPathHasLocalBin() {
-  if (process.platform !== 'win32') return []
-
-  const userProfile = process.env.USERPROFILE || os.homedir()
-  if (!userProfile) return []
-
-  const localBin = path.join(userProfile, '.local', 'bin')
-
-  let currentPath = ''
-  try {
-    currentPath = execSync(
-      'powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::GetEnvironmentVariable(\'Path\', \'User\')"',
-      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'] }
-    ).trim()
-  } catch {
-    currentPath = process.env.PATH || ''
-  }
-
-  const parts = currentPath
-    .split(';')
-    .map((item) => item.trim())
-    .filter(Boolean)
-
-  const hasLocalBin = parts.some((item) => item.toLowerCase() === localBin.toLowerCase())
-
-  // Always also hot-patch the in-process PATH so the immediate follow-up
-  // `commandExists('claude')` check sees the new directory. This covers
-  // the (common) case where the persisted user PATH already has it but
-  // our own process was spawned before the PowerShell installer ran.
-  const procParts = (process.env.PATH || '').split(';').map((p) => p.trim()).filter(Boolean)
-  const inProcessHasIt = procParts.some((item) => item.toLowerCase() === localBin.toLowerCase())
-  if (!inProcessHasIt) {
-    process.env.PATH = [...procParts, localBin].join(';')
-  }
-
-  if (hasLocalBin) return inProcessHasIt ? [] : ['[当前进程 PATH] %USERPROFILE%\\.local\\bin']
-
-  const nextPath = [...parts, localBin].join(';')
-  try {
-    const escapedPath = nextPath.replace(/'/g, "''")
-    execSync(
-      `powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::SetEnvironmentVariable('Path', '${escapedPath}', 'User')"`,
-      { stdio: 'ignore' }
-    )
-    return ['[用户 PATH] %USERPROFILE%\\.local\\bin']
-  } catch {
-    try {
-      const chalk = require('chalk')
-      console.warn(chalk.yellow(
-        `  ⚠️  无法自动更新 PATH，请手动将以下路径加入系统环境变量 PATH：\n     ${localBin}`
-      ))
-    } catch {}
-    return []
-  }
-}
-
-function installWindowsCliShims() {
-  if (process.platform !== 'win32') return []
-
-  const appData = process.env.APPDATA
-  if (!appData) return []
-
-  const npmBin = path.join(appData, 'npm')
-  fs.mkdirSync(npmBin, { recursive: true })
-
-  // 如果 hs.cmd 已存在（npm install -g 生成的），不覆盖
-  if (fs.existsSync(path.join(npmBin, 'hs.cmd'))) return []
-
-  const cliSpec = `@simonyea/holysheep-cli@${pkg.version}`
-  // 用 %APPDATA% 展开路径（比 %~dp0 在 cmd.exe 里更可靠）
-  const cmdContent = [
-    '@echo off',
-    'setlocal',
-    'if exist "%APPDATA%\\npm\\node_modules\\@simonyea\\holysheep-cli\\bin\\hs.js" (',
-    '  node "%APPDATA%\\npm\\node_modules\\@simonyea\\holysheep-cli\\bin\\hs.js" %*',
-    ') else if exist "%~dp0npx.cmd" (',
-    `  call "%~dp0npx.cmd" ${cliSpec} %*`,
-    ') else (',
-    `  call npx ${cliSpec} %*`,
-    ')',
-    ''
-  ].join('\r\n')
-
-  const ps1Content = [
-    '$localPkg = "$env:APPDATA\\npm\\node_modules\\@simonyea\\holysheep-cli\\bin\\hs.js"',
-    'if (Test-Path $localPkg) {',
-    '  & node $localPkg @args',
-    '} elseif (Test-Path (Join-Path $PSScriptRoot "npx.cmd")) {',
-    `  & (Join-Path $PSScriptRoot "npx.cmd") "${cliSpec}" @args`,
-    '} else {',
-    `  & npx "${cliSpec}" @args`,
-    '}',
-    ''
-  ].join('\r\n')
-
-  const written = []
-  for (const name of ['hs', 'holysheep']) {
-    fs.writeFileSync(path.join(npmBin, `${name}.cmd`), cmdContent, 'utf8')
-    fs.writeFileSync(path.join(npmBin, `${name}.ps1`), ps1Content, 'utf8')
-    written.push(`[启动器] %APPDATA%\\npm\\${name}.cmd`)
-  }
-
-  return written
-}
-
-function writeEnvToShell(envVars) {
-  // Windows: 用 setx 写入用户级环境变量（需重启终端生效）
-  if (process.platform === 'win32') {
-    const written = []
-    for (const [k, v] of Object.entries(envVars)) {
-      try {
-        execSync(`setx ${k} "${v}"`, { stdio: 'ignore' })
-        written.push(`[系统环境变量] ${k}`)
-      } catch {}
-    }
-    written.push(...installWindowsCliShims())
-    written.push(...ensureWindowsUserPathHasNpmBin())
-    if (written.length > 0) {
-      const chalk = require('chalk')
-      console.log(chalk.yellow('\n  ⚠️  Windows 环境变量已写入，需要重启终端后生效'))
-    }
-    return written
-  }
-
-  const files = getShellRcFiles()
-  const written = []
-
-  for (const file of files) {
-    let content = ''
-    try { content = fs.readFileSync(file, 'utf8') } catch {}
-    const isFish = file.endsWith('config.fish')
-    // 1. 清理旧的 holysheep managed 块
-    content = removeHsBlock(content)
-    // 2. 清理用户手动写的同名 export（防止旧值覆盖新值）
-    content = removeStaleExports(content, Object.keys(envVars), isFish)
-    // 3. 追加新的 managed 块
-    content += buildEnvBlock(envVars, isFish)
-    fs.writeFileSync(file, content, 'utf8')
-    written.push(file)
-  }
-  return written
-}
-
-function removeWindowsUserEnvVars(keys = []) {
-  if (process.platform !== 'win32') return []
-
-  const removed = []
-  for (const key of keys) {
-    try {
-      execSync(
-        `powershell.exe -NoProfile -Command "[Environment]::SetEnvironmentVariable('${key}', $null, 'User')"`,
-        { stdio: 'ignore' }
-      )
-      delete process.env[key]
-      removed.push(`[系统环境变量] ${key}`)
-    } catch {}
-  }
-  return removed
-}
-
-function removeEnvFromShell(extraKeys = []) {
-  // 默认清理的 key 列表（holysheep 相关的所有环境变量）
-  const HS_KEYS = [
-    'ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_API_KEY', 'ANTHROPIC_BASE_URL',
-    'OPENAI_API_KEY', 'OPENAI_BASE_URL',
-    'HOLYSHEEP_API_KEY',
-    ...extraKeys,
-  ]
-
-  // Windows：通过 PowerShell 删除用户级注册表环境变量
-  if (process.platform === 'win32') {
-    return removeWindowsUserEnvVars(HS_KEYS)
-  }
-
-  const files = getShellRcFiles()
-  const cleaned = []
-  for (const file of files) {
-    if (!fs.existsSync(file)) continue
-    const isFish = file.endsWith('config.fish')
-    let content = fs.readFileSync(file, 'utf8')
-    let updated = removeHsBlock(content)
-    updated = removeStaleExports(updated, HS_KEYS, isFish)
-    if (updated !== content) {
-      fs.writeFileSync(file, updated, 'utf8')
-      cleaned.push(file)
-    }
-  }
-  return cleaned
-}
-
-function escapeRegex(s) {
-  return s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-}
-
-module.exports = {
-  getShellRcFiles,
-  writeEnvToShell,
-  removeEnvFromShell,
-  ensureWindowsUserPathHasNpmBin,
-  ensureWindowsUserPathHasLocalBin,
-  installWindowsCliShims,
-  removeWindowsUserEnvVars
-}

package/src/utils/which.js

@@ -1,176 +0,0 @@
-/**
- * 跨平台检测命令是否存在
- * Windows 用 where，Unix 用 which，兜底用 --version
- *
- * [HolySheep fork v2.1.40 / hs27] Windows-specific fallbacks.
- *
- * Background: some installers (notably Claude Code's Windows installer
- * irm https://claude.ai/install.ps1 | iex) drop their binary into
- * `%USERPROFILE%\.local\bin\` and print a warning that this directory
- * is NOT on PATH. The *current* Node process started by hs web has a
- * frozen process.env.PATH snapshot, so even after
- * ensureWindowsUserPathHasLocalBin() persists the User PATH in the
- * registry, `where claude` still reports "not found" until the next
- * terminal is opened. The UI then shows 未安装 despite a successful
- * install.
- *
- * Fix strategy (Windows only):
- *   1. Enumerate known install locations as a fallback AFTER `where` fails:
- *        %USERPROFILE%\.local\bin\<cmd>.exe     (Claude official installer)
- *        %APPDATA%\npm\<cmd>.cmd                (npm global bin)
- *        %LOCALAPPDATA%\Programs\<cmd>\<cmd>.exe
- *        %LOCALAPPDATA%\<cmd>\<cmd>.exe
- *   2. Also re-read the USER-level PATH from the registry via PowerShell
- *      so we catch updates that landed after this process started.
- */
-const path = require('path')
-const fs = require('fs')
-const { exec, execSync } = require('child_process')
-
-function canRun(command, options = {}) {
-  try {
-    execSync(command, { stdio: 'ignore', ...options })
-    return true
-  } catch {
-    return false
-  }
-}
-
-function canRunAsync(command, options = {}) {
-  return new Promise((resolve) => {
-    exec(command, { timeout: 3000, windowsHide: true, ...options }, (error) => {
-      resolve(!error)
-    })
-  })
-}
-
-// [HolySheep fork v2.1.40 / hs27]
-// Known absolute install locations per-CLI on Windows. Checked AFTER
-// PATH lookup fails but BEFORE we report "not found". Keeping this list
-// small on purpose — only locations that official installers actually use.
-function getWindowsKnownPaths(cmd) {
-  if (process.platform !== 'win32') return []
-  const home = process.env.USERPROFILE || process.env.HOME || ''
-  const appData = process.env.APPDATA || ''
-  const localAppData = process.env.LOCALAPPDATA || ''
-  const paths = []
-  // Claude official installer → %USERPROFILE%\.local\bin\claude.exe
-  if (home) paths.push(path.join(home, '.local', 'bin', `${cmd}.exe`))
-  // npm global → %APPDATA%\npm\<cmd>.{cmd,exe,ps1}
-  if (appData) {
-    paths.push(path.join(appData, 'npm', `${cmd}.cmd`))
-    paths.push(path.join(appData, 'npm', `${cmd}.exe`))
-  }
-  // Programs directories → %LOCALAPPDATA%\Programs\<cmd>\<cmd>.exe
-  if (localAppData) {
-    paths.push(path.join(localAppData, 'Programs', cmd, `${cmd}.exe`))
-    paths.push(path.join(localAppData, cmd, `${cmd}.exe`))
-    paths.push(path.join(localAppData, 'factory', `${cmd}.exe`)) // droid
-  }
-  return paths
-}
-
-function checkKnownPathsSync(cmd) {
-  for (const p of getWindowsKnownPaths(cmd)) {
-    try {
-      if (fs.existsSync(p)) return p
-    } catch {}
-  }
-  return null
-}
-
-// Refresh this process's PATH from the USER-level registry PATH. Cheap — only
-// runs once per commandExists miss. Noop on non-Windows. Guarded by a module
-// flag so we don't run it more than once per short window.
-let _userPathRefreshedAt = 0
-function refreshWindowsUserPath() {
-  if (process.platform !== 'win32') return
-  const now = Date.now()
-  if (now - _userPathRefreshedAt < 5000) return
-  _userPathRefreshedAt = now
-  try {
-    const out = execSync(
-      'powershell.exe -NoProfile -ExecutionPolicy Bypass -Command "[Environment]::GetEnvironmentVariable(\'Path\', \'User\')"',
-      { encoding: 'utf8', stdio: ['ignore', 'pipe', 'ignore'], timeout: 5000 }
-    ).trim()
-    if (!out) return
-    const userParts = out.split(';').map((s) => s.trim()).filter(Boolean)
-    const curParts = (process.env.PATH || '').split(';').map((s) => s.trim()).filter(Boolean)
-    const curSet = new Set(curParts.map((s) => s.toLowerCase()))
-    const added = []
-    for (const p of userParts) {
-      if (!curSet.has(p.toLowerCase())) {
-        curParts.push(p)
-        added.push(p)
-      }
-    }
-    if (added.length) {
-      process.env.PATH = curParts.join(';')
-    }
-  } catch {
-    // noop
-  }
-}
-
-function commandExists(cmd) {
-  if (process.platform === 'win32') {
-    const variants = [cmd, `${cmd}.cmd`, `${cmd}.exe`, `${cmd}.bat`]
-    for (const variant of variants) {
-      if (canRun(`where ${variant}`)) return true
-    }
-
-    // Windows 上很多 npm 全局命令实际是 .cmd 包装器，需要交给 cmd.exe 执行。
-    for (const variant of variants) {
-      if (canRun(`cmd /d /s /c "${variant} --version"`, { timeout: 3000 })) return true
-    }
-
-    // [HolySheep fork v2.1.40 / hs27] Last-resort: re-read the USER-level
-    // registry PATH (catches recently installed binaries) and check a
-    // handful of known install locations before giving up.
-    refreshWindowsUserPath()
-    for (const variant of variants) {
-      if (canRun(`where ${variant}`)) return true
-    }
-    if (checkKnownPathsSync(cmd)) return true
-
-    return false
-  }
-
-  if (canRun(`which ${cmd}`)) return true
-
-  // 兜底：直接跑 --version
-  return canRun(`${cmd} --version`, { timeout: 3000 })
-}
-
-async function commandExistsAsync(cmd) {
-  if (process.platform === 'win32') {
-    const variants = [cmd, `${cmd}.cmd`, `${cmd}.exe`, `${cmd}.bat`]
-    for (const variant of variants) {
-      if (await canRunAsync(`where ${variant}`)) return true
-    }
-
-    for (const variant of variants) {
-      if (await canRunAsync(`cmd /d /s /c "${variant} --version"`)) return true
-    }
-
-    // [HolySheep fork v2.1.40 / hs27] Last-resort (see commandExists).
-    refreshWindowsUserPath()
-    for (const variant of variants) {
-      if (await canRunAsync(`where ${variant}`)) return true
-    }
-    if (checkKnownPathsSync(cmd)) return true
-
-    return false
-  }
-
-  if (await canRunAsync(`which ${cmd}`)) return true
-  return canRunAsync(`${cmd} --version`)
-}
-
-module.exports = {
-  commandExists,
-  commandExistsAsync,
-  // test-only exports
-  _getWindowsKnownPaths: getWindowsKnownPaths,
-  _refreshWindowsUserPath: refreshWindowsUserPath,
-}