bingocode 1.0.35 → 1.0.37

package/bin/bingo

@@ -1,27 +1,27 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-export CALLER_DIR="${CALLER_DIR:-$(pwd -W 2>/dev/null || pwd)}"
-
-# ── 首次部署：将默认 bingo 配置复制到 ~/.claude/bingo/ ──
-_BINGO_CONFIG_DIR="${CLAUDE_CONFIG_DIR:-$HOME/.claude}"
-_BINGO_DIR="$_BINGO_CONFIG_DIR/bingo"
-_BINGO_TARGET="$_BINGO_DIR/settings.json"
-_BINGO_SRC="$ROOT_DIR/config/bingo-defaults/settings.json"
-
-if [ ! -f "$_BINGO_TARGET" ] && [ -f "$_BINGO_SRC" ]; then
-  mkdir -p "$_BINGO_DIR"
-  cp "$_BINGO_SRC" "$_BINGO_TARGET" 2>/dev/null && \
-    echo "[bingo] 首次启动：已部署默认配置到 $_BINGO_TARGET" || true
-fi
-
-cd "$ROOT_DIR"
-
-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 "$@"
+#!/usr/bin/env bash
+set -euo pipefail
+
+ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+export CALLER_DIR="${CALLER_DIR:-$(pwd -W 2>/dev/null || pwd)}"
+
+# ── 首次部署：将默认 bingo 配置复制到 ~/.claude/bingo/ ──
+_BINGO_CONFIG_DIR="${CLAUDE_CONFIG_DIR:-$HOME/.claude}"
+_BINGO_DIR="$_BINGO_CONFIG_DIR/bingo"
+_BINGO_TARGET="$_BINGO_DIR/settings.json"
+_BINGO_SRC="$ROOT_DIR/config/bingo-defaults/settings.json"
+
+if [ ! -f "$_BINGO_TARGET" ] && [ -f "$_BINGO_SRC" ]; then
+  mkdir -p "$_BINGO_DIR"
+  cp "$_BINGO_SRC" "$_BINGO_TARGET" 2>/dev/null && \
+    echo "[bingo] 首次启动：已部署默认配置到 $_BINGO_TARGET" || true
+fi
+
+cd "$ROOT_DIR"
+
+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 "$@"

package/bin/bingocode-win.cjs

@@ -33,10 +33,11 @@ process.env.NoDefaultCurrentDirectoryInExePath = '1';
   }
 })();
 
-// 自动定位 bun 路径
-const bun =
+// 自动定位 bun 路径（优先用环境变量，再检查默认安装位置，最后 fallback 到 PATH）
+const bunPath =
   process.env.BUN_PATH ||
   path.join(os.homedir(), '.bun', 'bin', 'bun.exe');
+const bun = fs.existsSync(bunPath) ? bunPath : 'bun';
 
 // 主 CLI 入口
 const entry = path.join(__dirname, '..', 'src', 'entrypoints', 'cli.tsx');

package/bin/claude-win.cjs

@@ -32,10 +32,11 @@ process.env.NoDefaultCurrentDirectoryInExePath = '1';
   }
 })();
 
-// 自动定位 bun 路径
-const bun =
+// 自动定位 bun 路径（优先用环境变量，再检查默认安装位置，最后 fallback 到 PATH）
+const bunPath =
   process.env.BUN_PATH ||
   path.join(os.homedir(), '.bun', 'bin', 'bun.exe');
+const bun = fs.existsSync(bunPath) ? bunPath : 'bun';
 
 // 主 CLI 入口
 const entry = path.join(__dirname, '..', 'src', 'entrypoints', 'cli.tsx');

package/config/bingo-defaults/settings.json

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

package/package.json

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

package/src/entrypoints/cli.tsx

@@ -30,13 +30,15 @@ if (feature('ABLATION_BASELINE') && process.env.CLAUDE_CODE_ABLATION_BASELINE) {
  * All imports are dynamic to minimize module evaluation for fast paths.
  * Fast-path for --version has zero imports beyond this file.
  */
-import { CliMenuManager } from '../manager/CliMenuManager';
-import { render } from 'ink';
 
 async function main(): Promise<void> {
   const args = process.argv.slice(2);
   // 兼容demo参数：只渲染CLI新主菜单管理器，不影响原有逻辑
+  // CliMenuManager 和 ink 改为动态 import，避免顶层 import 导致模块副作用
+  // 抢占 stdin，使新电脑首次启动时 TrustDialog 卡死
   if (args.includes('--cli-menu-demo')) {
+    const { CliMenuManager } = await import('../manager/CliMenuManager');
+    const { render } = await import('ink');
     render(<CliMenuManager />);
     return;
   }

package/src/server/ensureSingletonLocalServer.ts

@@ -19,7 +19,7 @@
 
   const DEFAULT_HOST = '127.0.0.1';
   const DEFAULT_PORT = Number(process.env.SERVER_PORT || 3456);
-  const HEALTH_TIMEOUT_MS = 12000;
+  const HEALTH_TIMEOUT_MS = Number(process.env.HEALTH_TIMEOUT_MS || 20000);
   const HEALTH_RETRY_MS = 300;
 
   function mkdirp(p: string) { fs.mkdirSync(p, { recursive: true }); }

package/src/utils/config.ts

@@ -720,6 +720,21 @@ function computeTrustDialogAccepted(): boolean {
     return true
   }
 
+  // Fallback: also check the raw original CWD path directly.
+  // This handles the case where trust was saved under CWD (no .git at the time),
+  // but now .git exists so getProjectPathForConfig() returns the git root instead.
+  // Without this fallback the old trust entry would never be found, causing the
+  // trust dialog to reappear after `git init` / `git clone`.
+  const normalizedOriginalCwd = normalizePathForConfigKey(
+    resolve(getOriginalCwd()),
+  )
+  if (normalizedOriginalCwd !== projectPath) {
+    const cwdConfig = config.projects?.[normalizedOriginalCwd]
+    if (cwdConfig?.hasTrustDialogAccepted) {
+      return true
+    }
+  }
+
   // Now check from current working directory and its parents
   // Normalize paths for consistent JSON key lookup
   let currentPath = normalizePathForConfigKey(getCwd())