bingocode 1.0.32 → 1.0.34

package/bin/bingo-win.cjs

@@ -7,31 +7,57 @@ const fs = require('fs');
 
 process.env.NoDefaultCurrentDirectoryInExePath = '1';
 
-// ── 首次部署：将默认 bingo 配置复制到 ~/.claude/bingo/ ──
-// 确保新电脑首次启动时 settings.json 存在（含占位符 ANTHROPIC_AUTH_TOKEN），
+// ── 部署 / 增量合并 bingo 默认配置到 ~/.claude/bingo/ ──
+// 首次安装：完整复制 settings.json（含占位符 ANTHROPIC_AUTH_TOKEN），
 // 这样 isOfficialMode() 返回 false，子进程不会走 OAuth 流程。
-// 用户通过 ProviderPanel 激活 provider 后 syncToSettings() 会覆盖此文件。
+// 升级安装：增量合并——只补充默认配置中有但用户配置中缺失的 key，
+// 保留用户已有的自定义值（如修改过的 ANTHROPIC_BASE_URL 等）。
 (function deployBingoDefaults() {
   const configDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
   const bingoDir = path.join(configDir, 'bingo');
   const targetSettings = path.join(bingoDir, 'settings.json');
+  const defaultsDir = path.join(__dirname, '..', 'config', 'bingo-defaults');
+  const srcSettings = path.join(defaultsDir, 'settings.json');
 
-  // 只在 settings.json 不存在时才部署（不覆盖已有配置）
-  if (!fs.existsSync(targetSettings)) {
-    const defaultsDir = path.join(__dirname, '..', 'config', 'bingo-defaults');
-    const srcSettings = path.join(defaultsDir, 'settings.json');
+  if (!fs.existsSync(srcSettings)) return;
 
-    if (fs.existsSync(srcSettings)) {
-      try {
-        if (!fs.existsSync(bingoDir)) {
-          fs.mkdirSync(bingoDir, { recursive: true });
+  try {
+    if (!fs.existsSync(bingoDir)) {
+      fs.mkdirSync(bingoDir, { recursive: true });
+    }
+
+    if (!fs.existsSync(targetSettings)) {
+      // 首次安装：直接复制
+      fs.copyFileSync(srcSettings, targetSettings);
+      console.log('[bingo] 首次启动：已部署默认配置到', targetSettings);
+    } else {
+      // 升级安装：增量合并缺失的 key
+      const defaults = JSON.parse(fs.readFileSync(srcSettings, 'utf-8'));
+      const current = JSON.parse(fs.readFileSync(targetSettings, 'utf-8'));
+      let changed = false;
+
+      for (const section of Object.keys(defaults)) {
+        if (typeof defaults[section] !== 'object' || defaults[section] === null) continue;
+        if (!current[section] || typeof current[section] !== 'object') {
+          current[section] = defaults[section];
+          changed = true;
+          continue;
+        }
+        for (const key of Object.keys(defaults[section])) {
+          if (!(key in current[section])) {
+            current[section][key] = defaults[section][key];
+            changed = true;
+          }
         }
-        fs.copyFileSync(srcSettings, targetSettings);
-        console.log('[bingo] 首次启动：已部署默认配置到', targetSettings);
-      } catch (err) {
-        console.warn('[bingo] 部署默认配置失败:', err.message);
+      }
+
+      if (changed) {
+        fs.writeFileSync(targetSettings, JSON.stringify(current, null, 2) + '\n');
+        console.log('[bingo] 升级：已合并新增默认配置到', targetSettings);
       }
     }
+  } catch (err) {
+    console.warn('[bingo] 部署默认配置失败:', err.message);
   }
 })();
 

package/bin/bingocode-win.cjs

@@ -7,29 +7,57 @@ const fs = require('fs');
 
 process.env.NoDefaultCurrentDirectoryInExePath = '1';
 
-// ── 首次部署：将默认 bingo 配置复制到 ~/.claude/bingo/ ──
-// 确保新电脑首次启动时 settings.json 存在（含占位符 ANTHROPIC_AUTH_TOKEN），
+// ── 部署 / 增量合并 bingo 默认配置到 ~/.claude/bingo/ ──
+// 首次安装：完整复制 settings.json（含占位符 ANTHROPIC_AUTH_TOKEN），
 // 这样 isAnthropicAuthEnabled() 返回 false，跳过 OAuth 流程。
+// 升级安装：增量合并——只补充默认配置中有但用户配置中缺失的 key，
+// 保留用户已有的自定义值（如修改过的 ANTHROPIC_BASE_URL 等）。
 (function deployBingoDefaults() {
   const configDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
   const bingoDir = path.join(configDir, 'bingo');
   const targetSettings = path.join(bingoDir, 'settings.json');
+  const defaultsDir = path.join(__dirname, '..', 'config', 'bingo-defaults');
+  const srcSettings = path.join(defaultsDir, 'settings.json');
 
-  if (!fs.existsSync(targetSettings)) {
-    const defaultsDir = path.join(__dirname, '..', 'config', 'bingo-defaults');
-    const srcSettings = path.join(defaultsDir, 'settings.json');
+  if (!fs.existsSync(srcSettings)) return;
 
-    if (fs.existsSync(srcSettings)) {
-      try {
-        if (!fs.existsSync(bingoDir)) {
-          fs.mkdirSync(bingoDir, { recursive: true });
+  try {
+    if (!fs.existsSync(bingoDir)) {
+      fs.mkdirSync(bingoDir, { recursive: true });
+    }
+
+    if (!fs.existsSync(targetSettings)) {
+      // 首次安装：直接复制
+      fs.copyFileSync(srcSettings, targetSettings);
+      console.log('[bingocode] 首次启动：已部署默认配置到', targetSettings);
+    } else {
+      // 升级安装：增量合并缺失的 key
+      const defaults = JSON.parse(fs.readFileSync(srcSettings, 'utf-8'));
+      const current = JSON.parse(fs.readFileSync(targetSettings, 'utf-8'));
+      let changed = false;
+
+      for (const section of Object.keys(defaults)) {
+        if (typeof defaults[section] !== 'object' || defaults[section] === null) continue;
+        if (!current[section] || typeof current[section] !== 'object') {
+          current[section] = defaults[section];
+          changed = true;
+          continue;
+        }
+        for (const key of Object.keys(defaults[section])) {
+          if (!(key in current[section])) {
+            current[section][key] = defaults[section][key];
+            changed = true;
+          }
         }
-        fs.copyFileSync(srcSettings, targetSettings);
-        console.log('[bingocode] 首次启动：已部署默认配置到', targetSettings);
-      } catch (err) {
-        console.warn('[bingocode] 部署默认配置失败:', err.message);
+      }
+
+      if (changed) {
+        fs.writeFileSync(targetSettings, JSON.stringify(current, null, 2) + '\n');
+        console.log('[bingocode] 升级：已合并新增默认配置到', targetSettings);
       }
     }
+  } catch (err) {
+    console.warn('[bingocode] 部署默认配置失败:', err.message);
   }
 })();
 

package/bin/claude-win.cjs

@@ -8,27 +8,53 @@ const fs = require('fs');
 // 使 Windows bun/spawn 更可靠
 process.env.NoDefaultCurrentDirectoryInExePath = '1';
 
-// ── 首次部署：将默认 bingo 配置复制到 ~/.claude/bingo/ ──
+// ── 部署 / 增量合并 bingo 默认配置到 ~/.claude/bingo/ ──
 (function deployBingoDefaults() {
   const configDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
   const bingoDir = path.join(configDir, 'bingo');
   const targetSettings = path.join(bingoDir, 'settings.json');
+  const defaultsDir = path.join(__dirname, '..', 'config', 'bingo-defaults');
+  const srcSettings = path.join(defaultsDir, 'settings.json');
 
-  if (!fs.existsSync(targetSettings)) {
-    const defaultsDir = path.join(__dirname, '..', 'config', 'bingo-defaults');
-    const srcSettings = path.join(defaultsDir, 'settings.json');
+  if (!fs.existsSync(srcSettings)) return;
 
-    if (fs.existsSync(srcSettings)) {
-      try {
-        if (!fs.existsSync(bingoDir)) {
-          fs.mkdirSync(bingoDir, { recursive: true });
+  try {
+    if (!fs.existsSync(bingoDir)) {
+      fs.mkdirSync(bingoDir, { recursive: true });
+    }
+
+    if (!fs.existsSync(targetSettings)) {
+      // 首次安装：直接复制
+      fs.copyFileSync(srcSettings, targetSettings);
+      console.log('[claude] 首次启动：已部署默认配置到', targetSettings);
+    } else {
+      // 升级安装：增量合并缺失的 key
+      const defaults = JSON.parse(fs.readFileSync(srcSettings, 'utf-8'));
+      const current = JSON.parse(fs.readFileSync(targetSettings, 'utf-8'));
+      let changed = false;
+
+      for (const section of Object.keys(defaults)) {
+        if (typeof defaults[section] !== 'object' || defaults[section] === null) continue;
+        if (!current[section] || typeof current[section] !== 'object') {
+          current[section] = defaults[section];
+          changed = true;
+          continue;
+        }
+        for (const key of Object.keys(defaults[section])) {
+          if (!(key in current[section])) {
+            current[section][key] = defaults[section][key];
+            changed = true;
+          }
         }
-        fs.copyFileSync(srcSettings, targetSettings);
-        console.log('[claude] 首次启动：已部署默认配置到', targetSettings);
-      } catch (err) {
-        console.warn('[claude] 部署默认配置失败:', err.message);
+      }
+
+      if (changed) {
+        fs.writeFileSync(targetSettings, JSON.stringify(current, null, 2) + '\n');
+        console.log('[claude] 升级：已合并新增默认配置到', targetSettings);
       }
     }
+  } catch (err) {
+    console.warn('[claude] 部署默认配置失败:', err.message);
   }
 })();
 

package/config/bingo-defaults/settings.json

@@ -1,6 +1,7 @@
 {
   "env": {
     "ANTHROPIC_AUTH_TOKEN": "pending-provider-setup",
-    "ANTHROPIC_BASE_URL": "http://127.0.0.1:3456"
+    "ANTHROPIC_BASE_URL": "http://127.0.0.1:3456",
+    "BINGO_SKIP_TRUST_DIALOG": "1"
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingocode",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "type": "module",
   "bin": {
     "claude": "bin/claude-win.cjs",
@@ -10,6 +10,7 @@
   },
   "scripts": {
     "preinstall": "node scripts/preinstall-stop.cjs",
+    "postinstall": "node scripts/postinstall-ripgrep.cjs",
     "start": "bun run ./bin/bingo-win.cjs",
     "bingo": "bun run ./bin/bingo-win.cjs",
     "bingocode": "bun run ./bin/bingocode-win.cjs",

package/scripts/postinstall-ripgrep.cjs

@@ -0,0 +1,299 @@
+#!/usr/bin/env node
+
+/**
+ * npm postinstall hook: download ripgrep binary for the current platform.
+ *
+ * The runtime code (src/utils/ripgrep.ts) expects the binary at:
+ *   src/vendor/ripgrep/{arch}-{platform}/rg[.exe]
+ *
+ * When installed via npm (non-bundled mode), there is no embedded ripgrep,
+ * and if the system `rg` is not on PATH, all Grep/file-search operations
+ * will hang. This script ensures a working ripgrep binary is always available.
+ *
+ * Must be CJS (.cjs) because npm executes lifecycle scripts with node,
+ * and package.json has "type": "module".
+ */
+
+const { execSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+const https = require('https');
+const http = require('http');
+
+// ── Configuration ──────────────────────────────────────────────────────────
+
+const RG_VERSION = '14.1.1';
+
+// Map Node.js platform/arch to ripgrep release asset names
+const PLATFORM_MAP = {
+  'x64-win32': {
+    asset: `ripgrep-${RG_VERSION}-x86_64-pc-windows-msvc.zip`,
+    binary: 'rg.exe',
+    archiveType: 'zip',
+  },
+  'x64-linux': {
+    asset: `ripgrep-${RG_VERSION}-x86_64-unknown-linux-musl.tar.gz`,
+    binary: 'rg',
+    archiveType: 'tar.gz',
+  },
+  'arm64-darwin': {
+    asset: `ripgrep-${RG_VERSION}-aarch64-apple-darwin.tar.gz`,
+    binary: 'rg',
+    archiveType: 'tar.gz',
+  },
+  'x64-darwin': {
+    asset: `ripgrep-${RG_VERSION}-x86_64-apple-darwin.tar.gz`,
+    binary: 'rg',
+    archiveType: 'tar.gz',
+  },
+  'arm64-linux': {
+    asset: `ripgrep-${RG_VERSION}-aarch64-unknown-linux-gnu.tar.gz`,
+    binary: 'rg',
+    archiveType: 'tar.gz',
+  },
+};
+
+// ── Path resolution ────────────────────────────────────────────────────────
+// Must match src/utils/ripgrep.ts path resolution:
+//   __dirname = src/  (one level up from src/utils/)
+//   rgRoot = src/vendor/ripgrep/
+//   binary = src/vendor/ripgrep/{arch}-{platform}/rg[.exe]
+
+const packageRoot = path.resolve(__dirname, '..');
+const rgRoot = path.join(packageRoot, 'src', 'vendor', 'ripgrep');
+
+const platformKey = `${process.arch}-${process.platform}`;
+const platformInfo = PLATFORM_MAP[platformKey];
+
+if (!platformInfo) {
+  console.log(
+    `[bingocode] postinstall: 当前平台 ${platformKey} 不在 ripgrep 预构建列表中，跳过下载。`
+  );
+  console.log(
+    '[bingocode] 请确保系统已安装 ripgrep (rg) 并在 PATH 中可用。'
+  );
+  process.exit(0);
+}
+
+const targetDir = path.join(rgRoot, platformKey);
+const targetBinary = path.join(targetDir, platformInfo.binary);
+
+// ── Skip if already present ────────────────────────────────────────────────
+
+if (fs.existsSync(targetBinary)) {
+  console.log(`[bingocode] postinstall: ripgrep 已存在 (${targetBinary})，跳过下载。`);
+  process.exit(0);
+}
+
+// ── Download helpers ───────────────────────────────────────────────────────
+
+const DOWNLOAD_BASE = `https://github.com/BurntSushi/ripgrep/releases/download/${RG_VERSION}`;
+const downloadUrl = `${DOWNLOAD_BASE}/${platformInfo.asset}`;
+
+/**
+ * Download a URL to a local file, following redirects (GitHub releases redirect
+ * to CDN). Returns a Promise that resolves when the file is fully written.
+ */
+function downloadFile(url, destPath, maxRedirects = 5) {
+  return new Promise((resolve, reject) => {
+    if (maxRedirects <= 0) {
+      return reject(new Error('Too many redirects'));
+    }
+
+    const protocol = url.startsWith('https') ? https : http;
+
+    protocol
+      .get(url, { headers: { 'User-Agent': 'bingocode-postinstall' } }, (res) => {
+        // Handle redirects (301, 302, 303, 307, 308)
+        if (res.statusCode >= 300 && res.statusCode < 400 && res.headers.location) {
+          res.resume(); // Drain the response
+          return downloadFile(res.headers.location, destPath, maxRedirects - 1)
+            .then(resolve)
+            .catch(reject);
+        }
+
+        if (res.statusCode !== 200) {
+          res.resume();
+          return reject(
+            new Error(`Download failed: HTTP ${res.statusCode} for ${url}`)
+          );
+        }
+
+        const fileStream = fs.createWriteStream(destPath);
+        res.pipe(fileStream);
+        fileStream.on('finish', () => {
+          fileStream.close(resolve);
+        });
+        fileStream.on('error', reject);
+      })
+      .on('error', reject);
+  });
+}
+
+// ── Extract helpers ────────────────────────────────────────────────────────
+
+/**
+ * Extract the rg binary from a .tar.gz archive.
+ * The archive structure is: ripgrep-{version}-{target}/rg
+ */
+function extractTarGz(archivePath, binaryName, destDir) {
+  // Use tar to list, find the rg binary, then extract just that file
+  const stripComponents = 1; // strip the top-level directory
+  fs.mkdirSync(destDir, { recursive: true });
+
+  try {
+    execSync(
+      `tar -xzf "${archivePath}" --strip-components=${stripComponents} -C "${destDir}" --wildcards "*/${binaryName}"`,
+      { stdio: 'pipe' }
+    );
+  } catch {
+    // Some tar implementations (e.g., macOS BSD tar) don't support --wildcards
+    // Fall back to extracting everything and moving the binary
+    const tmpExtract = path.join(os.tmpdir(), `rg-extract-${Date.now()}`);
+    fs.mkdirSync(tmpExtract, { recursive: true });
+
+    try {
+      execSync(`tar -xzf "${archivePath}" -C "${tmpExtract}"`, { stdio: 'pipe' });
+
+      // Find the rg binary in the extracted contents
+      const entries = fs.readdirSync(tmpExtract);
+      let found = false;
+      for (const entry of entries) {
+        const candidate = path.join(tmpExtract, entry, binaryName);
+        if (fs.existsSync(candidate)) {
+          fs.copyFileSync(candidate, path.join(destDir, binaryName));
+          found = true;
+          break;
+        }
+      }
+
+      if (!found) {
+        // Maybe the binary is directly in the tmp dir
+        const directCandidate = path.join(tmpExtract, binaryName);
+        if (fs.existsSync(directCandidate)) {
+          fs.copyFileSync(directCandidate, path.join(destDir, binaryName));
+        } else {
+          throw new Error(`Could not find ${binaryName} in extracted archive`);
+        }
+      }
+    } finally {
+      // Cleanup temp dir
+      try {
+        fs.rmSync(tmpExtract, { recursive: true, force: true });
+      } catch {
+        // Best effort
+      }
+    }
+  }
+}
+
+/**
+ * Extract the rg.exe binary from a .zip archive (Windows).
+ * Uses PowerShell's Expand-Archive on Windows.
+ */
+function extractZip(archivePath, binaryName, destDir) {
+  fs.mkdirSync(destDir, { recursive: true });
+
+  const tmpExtract = path.join(os.tmpdir(), `rg-extract-${Date.now()}`);
+  fs.mkdirSync(tmpExtract, { recursive: true });
+
+  try {
+    if (process.platform === 'win32') {
+      // Use PowerShell to extract
+      execSync(
+        `powershell -NoProfile -Command "Expand-Archive -Path '${archivePath}' -DestinationPath '${tmpExtract}' -Force"`,
+        { stdio: 'pipe' }
+      );
+    } else {
+      // Use unzip on non-Windows (unlikely but defensive)
+      execSync(`unzip -o "${archivePath}" -d "${tmpExtract}"`, { stdio: 'pipe' });
+    }
+
+    // Find the binary in extracted contents
+    const entries = fs.readdirSync(tmpExtract);
+    let found = false;
+    for (const entry of entries) {
+      const entryPath = path.join(tmpExtract, entry);
+      const stat = fs.statSync(entryPath);
+
+      if (stat.isDirectory()) {
+        const candidate = path.join(entryPath, binaryName);
+        if (fs.existsSync(candidate)) {
+          fs.copyFileSync(candidate, path.join(destDir, binaryName));
+          found = true;
+          break;
+        }
+      } else if (entry === binaryName) {
+        fs.copyFileSync(entryPath, path.join(destDir, binaryName));
+        found = true;
+        break;
+      }
+    }
+
+    if (!found) {
+      throw new Error(`Could not find ${binaryName} in extracted zip archive`);
+    }
+  } finally {
+    try {
+      fs.rmSync(tmpExtract, { recursive: true, force: true });
+    } catch {
+      // Best effort
+    }
+  }
+}
+
+// ── Main ───────────────────────────────────────────────────────────────────
+
+async function main() {
+  console.log(`[bingocode] postinstall: 正在下载 ripgrep v${RG_VERSION} (${platformKey})...`);
+  console.log(`[bingocode] URL: ${downloadUrl}`);
+
+  const tmpArchive = path.join(
+    os.tmpdir(),
+    `ripgrep-${RG_VERSION}-${Date.now()}${platformInfo.archiveType === 'zip' ? '.zip' : '.tar.gz'}`
+  );
+
+  try {
+    // 1. Download
+    await downloadFile(downloadUrl, tmpArchive);
+    console.log('[bingocode] postinstall: 下载完成，正在解压...');
+
+    // 2. Extract
+    if (platformInfo.archiveType === 'tar.gz') {
+      extractTarGz(tmpArchive, platformInfo.binary, targetDir);
+    } else {
+      extractZip(tmpArchive, platformInfo.binary, targetDir);
+    }
+
+    // 3. Set executable permission on non-Windows
+    if (process.platform !== 'win32') {
+      fs.chmodSync(targetBinary, 0o755);
+    }
+
+    // 4. Verify
+    if (fs.existsSync(targetBinary)) {
+      const stat = fs.statSync(targetBinary);
+      console.log(
+        `[bingocode] postinstall: ripgrep 安装成功！(${targetBinary}, ${(stat.size / 1024 / 1024).toFixed(1)} MB)`
+      );
+    } else {
+      throw new Error('Binary not found after extraction');
+    }
+  } catch (err) {
+    console.warn(`[bingocode] postinstall: ripgrep 下载/安装失败: ${err.message}`);
+    console.warn('[bingocode] 请手动安装 ripgrep: https://github.com/BurntSushi/ripgrep#installation');
+    console.warn('[bingocode] 或确保系统 PATH 中有 rg 命令可用。');
+    // Don't fail the install — ripgrep is a best-effort enhancement.
+    // The runtime will fall back to system rg if available.
+  } finally {
+    // Cleanup temp archive
+    try {
+      fs.rmSync(tmpArchive, { force: true });
+    } catch {
+      // Best effort
+    }
+  }
+}
+
+main();

package/src/interactiveHelpers.tsx

@@ -127,8 +127,8 @@ export async function showSetupScreens(root: Root, permissionMode: PermissionMod
   // and checks CLAUDE.md external includes. bypassPermissions mode
   // only affects tool execution permissions, not workspace trust.
   // Note: non-interactive sessions (CI/CD with -p) never reach showSetupScreens at all.
-  // Skip permission checks in claubbit
-  if (!isEnvTruthy(process.env.CLAUBBIT)) {
+  // Skip permission checks in claubbit or when BINGO_SKIP_TRUST_DIALOG is set
+  if (!isEnvTruthy(process.env.CLAUBBIT) && !isEnvTruthy(process.env.BINGO_SKIP_TRUST_DIALOG)) {
     // Fast-path: skip TrustDialog import+render when CWD is already trusted.
     // If it returns true, the TrustDialog would auto-resolve regardless of
     // security features, so we can skip the dynamic import and render cycle.