bingocode 1.1.127 → 1.1.128

package/.claude/settings.local.json

@@ -11,7 +11,10 @@
       "Bash(findstr /i goal)",
       "Bash(bun run:*)",
       "Bash(bunx tsc:*)",
-      "Bash(node_modules/.bin/tsc --noEmit --skipLibCheck)"
+      "Bash(node_modules/.bin/tsc --noEmit --skipLibCheck)",
+      "WebFetch(domain:www.npmjs.com)",
+      "Bash(npm info:*)",
+      "Bash(npm pack:*)"
     ]
   }
 }

package/bin/bingo

@@ -18,10 +18,44 @@ fi
 
 cd "$ROOT_DIR"
 
+# ── bun 检测与自动安装 ──
+if ! command -v bun &>/dev/null && [[ ! -x "$HOME/.bun/bin/bun" ]]; then
+  echo "[bingocode] bun 未检测到，正在通过 npm 安装..."
+  _TMP_DIR="$(mktemp -d)"
+  _ARCH="$(uname -m)"
+  if [[ "$_ARCH" == "aarch64" || "$_ARCH" == "arm64" ]]; then
+    _BUN_PKG="@oven/bun-linux-aarch64"
+  else
+    _BUN_PKG="@oven/bun-linux-x64"
+  fi
+
+  if npm install "$_BUN_PKG" --prefix "$_TMP_DIR" --no-save --loglevel error; then
+    _BUN_SRC="$_TMP_DIR/node_modules/$_BUN_PKG/bin/bun"
+    if [[ -f "$_BUN_SRC" ]]; then
+      mkdir -p "$HOME/.bun/bin"
+      cp "$_BUN_SRC" "$HOME/.bun/bin/bun"
+      chmod +x "$HOME/.bun/bin/bun"
+      export PATH="$HOME/.bun/bin:$PATH"
+      echo "[bingocode] bun 安装完成，正在启动..."
+    else
+      echo "[bingocode] 安装失败：未找到 $_BUN_SRC" >&2
+      rm -rf "$_TMP_DIR"
+      exit 1
+    fi
+  else
+    echo "[bingocode] npm install $_BUN_PKG 失败，请手动安装 bun: https://bun.sh" >&2
+    rm -rf "$_TMP_DIR"
+    exit 1
+  fi
+  rm -rf "$_TMP_DIR"
+fi
+
+BUN_BIN="$(command -v bun 2>/dev/null || echo "$HOME/.bun/bin/bun")"
+
 if [[ -f .env ]]; then
   ENV_FILE_FLAG="--env-file=.env"
 else
   ENV_FILE_FLAG=""
 fi
 
-exec bun --preload ./preload.ts $ENV_FILE_FLAG ./src/entrypoints/manager.tsx "$@"
+exec "$BUN_BIN" --preload ./preload.ts $ENV_FILE_FLAG ./src/entrypoints/manager.tsx "$@"

package/bin/bingo-win.cjs

@@ -72,42 +72,44 @@ function bunExists() {
   }
 }
 
-// 安装 bun
+// 安装 bun（通过 npm 拉取官方包，不走 GitHub/bun.sh）
 function installBun() {
-  // 优先：从包内 runtime/bun.exe 直接部署（离线，无需 PowerShell 权限）
-  const bundledBun = path.join(ROOT_DIR, 'runtime', 'bun.exe');
-  if (fs.existsSync(bundledBun)) {
-    console.log('[bingocode] 正在从包内部署 bun.exe...');
-    try {
-      const destDir = path.join(os.homedir(), '.bun', 'bin');
-      if (!fs.existsSync(destDir)) fs.mkdirSync(destDir, { recursive: true });
-      fs.copyFileSync(bundledBun, bunPath);
-      console.log('[bingocode] bun 已部署，正在启动...');
-      return true;
-    } catch (err) {
-      console.warn(`[bingocode] 包内部署失败: ${err.message}，尝试在线安装...`);
-    }
-  }
+  console.log('[bingocode] bun 未检测到，正在通过 npm 安装...');
 
-  // 兜底：在线安装
-  console.log('[bingocode] bun 未检测到，正在自动安装...');
+  // 用 npm install 拉取平台对应包，安装到临时目录后复制 bun.exe
+  const tmpDir = path.join(os.tmpdir(), 'bingocode-bun-install');
   try {
-    const result = spawnSync(
-      'powershell',
-      ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command',
-       'irm bun.sh/install.ps1 | iex'],
-      { stdio: 'inherit', shell: false }
+    fs.mkdirSync(tmpDir, { recursive: true });
+
+    // npm install @oven/bun-windows-x64 到临时目录
+    const npmResult = spawnSync(
+      'npm',
+      ['install', '@oven/bun-windows-x64', '--prefix', tmpDir, '--no-save', '--loglevel', 'error'],
+      { stdio: 'inherit', shell: true }
     );
-    if (result.status !== 0) {
-      throw new Error(`Exit code ${result.status}`);
+    if (npmResult.status !== 0) {
+      throw new Error(`npm install 失败，exit code ${npmResult.status}`);
     }
+
+    // 从 node_modules 复制 bun.exe → ~/.bun/bin/bun.exe
+    const src = path.join(tmpDir, 'node_modules', '@oven', 'bun-windows-x64', 'bin', 'bun.exe');
+    if (!fs.existsSync(src)) {
+      throw new Error(`未找到 ${src}`);
+    }
+    const destDir = path.dirname(bunPath);
+    if (!fs.existsSync(destDir)) fs.mkdirSync(destDir, { recursive: true });
+    fs.copyFileSync(src, bunPath);
+
     console.log('[bingocode] bun 安装完成，正在启动...');
+    return true;
   } catch (err) {
     console.error(`[bingocode] bun 自动安装失败: ${err.message}`);
-    console.log('[bingocode] 请手动从 https://bun.sh 安装 Bun 后重试。');
+    console.log('[bingocode] 请手动安装 bun: npm install -g @oven/bun-windows-x64');
     return false;
+  } finally {
+    // 清理临时目录（非阻塞）
+    try { fs.rmSync(tmpDir, { recursive: true, force: true }); } catch (_) {}
   }
-  return true;
 }
 
 if (!bunExists()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingocode",
-  "version": "1.1.127",
+  "version": "1.1.128",
   "type": "module",
   "bin": {
     "claude": "bin/claude-win.cjs",

package/scripts/install-skills.cjs

@@ -47,9 +47,3 @@ for (const skill of skills) {
   }
 }
 
-// Deploy bundled bun.exe (Windows only, skips if already present)
-try {
-  require('./install-bun.cjs')
-} catch (err) {
-  console.warn(`[bingocode] bun deploy step failed (non-fatal): ${err.message}`)
-}

package/scripts/install-bun.cjs

@@ -1,89 +0,0 @@
-#!/usr/bin/env node
-/**
- * postinstall helper: deploy bundled bun.exe → ~/.bun/bin/bun.exe
- *
- * Rules:
- *   - Only runs on Windows (win32). No-op on Linux/Mac.
- *   - Skips if ~/.bun/bin/bun.exe already exists (respect user's own install).
- *   - Appends %USERPROFILE%\.bun\bin to HKCU\Environment PATH via reg.exe (no admin needed).
- *   - CJS, no dependencies beyond Node built-ins.
- */
-
-'use strict'
-
-const fs = require('node:fs')
-const path = require('node:path')
-const os = require('node:os')
-const { spawnSync } = require('node:child_process')
-
-// Only relevant on Windows
-if (process.platform !== 'win32') process.exit(0)
-
-const home = os.homedir()
-if (!home) process.exit(0)
-
-const dest = path.join(home, '.bun', 'bin', 'bun.exe')
-
-// Already installed — skip
-if (fs.existsSync(dest)) {
-  console.log('[bingocode] bun already present, skipping bundled deploy.')
-  process.exit(0)
-}
-
-const src = path.join(__dirname, '..', 'runtime', 'bun.exe')
-if (!fs.existsSync(src)) {
-  console.warn('[bingocode] runtime/bun.exe not found in package, skipping.')
-  process.exit(0)
-}
-
-// Copy bun.exe
-try {
-  fs.mkdirSync(path.dirname(dest), { recursive: true })
-  fs.copyFileSync(src, dest)
-  fs.chmodSync(dest, 0o755)
-  console.log(`[bingocode] deployed bun.exe → ${dest}`)
-} catch (err) {
-  console.warn(`[bingocode] failed to deploy bun.exe: ${err.message}`)
-  process.exit(0)
-}
-
-// Add ~/.bun/bin to HKCU PATH (no admin required)
-try {
-  const bunBinDir = path.dirname(dest)
-
-  // Read current HKCU PATH
-  const query = spawnSync(
-    'reg',
-    ['query', 'HKCU\\Environment', '/v', 'PATH'],
-    { encoding: 'utf8', shell: false }
-  )
-
-  let currentPath = ''
-  if (query.status === 0 && query.stdout) {
-    const match = query.stdout.match(/PATH\s+REG(?:_EXPAND)?_SZ\s+(.+)/i)
-    if (match) currentPath = match[1].trim()
-  }
-
-  // Already in PATH
-  if (currentPath.toLowerCase().includes(bunBinDir.toLowerCase())) {
-    console.log('[bingocode] PATH already contains bun bin dir.')
-    process.exit(0)
-  }
-
-  const newPath = currentPath ? `${currentPath};${bunBinDir}` : bunBinDir
-
-  const reg = spawnSync(
-    'reg',
-    ['add', 'HKCU\\Environment', '/v', 'PATH', '/t', 'REG_EXPAND_SZ', '/d', newPath, '/f'],
-    { encoding: 'utf8', shell: false }
-  )
-
-  if (reg.status === 0) {
-    console.log(`[bingocode] added ${bunBinDir} to user PATH.`)
-    console.log('[bingocode] NOTE: restart your terminal for PATH change to take effect.')
-  } else {
-    console.warn(`[bingocode] could not update PATH: ${reg.stderr}`)
-  }
-} catch (err) {
-  console.warn(`[bingocode] PATH update failed (non-fatal): ${err.message}`)
-}