bingocode 1.0.36 → 1.0.38

package/LICENSE

@@ -1,29 +1,29 @@
-MIT License
-
-Copyright (c) 2025-2026 Leanchy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
-BingoCode is an independent open-source project by Leanchy, built upon and
-substantially modified from Claude Code (originally developed by Anthropic, PBC).
-Original upstream components remain the property of their respective copyright holders.
-All modifications, extensions, and original contributions in this repository are
-copyright Leanchy, released under the MIT License above.
+MIT License
+
+Copyright (c) 2025-2026 Leanchy
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+---
+
+BingoCode is an independent open-source project by Leanchy, built upon and
+substantially modified from Claude Code (originally developed by Anthropic, PBC).
+Original upstream components remain the property of their respective copyright holders.
+All modifications, extensions, and original contributions in this repository are
+copyright Leanchy, released under the MIT License above.

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/bingo-win.cjs

@@ -8,17 +8,38 @@ const fs = require('fs');
 process.env.NoDefaultCurrentDirectoryInExePath = '1';
 
 // ── 首次部署：将默认 bingo 配置复制到 ~/.claude/bingo/ ──
-// 确保新电脑首次启动时 settings.json 存在（含占位符 ANTHROPIC_AUTH_TOKEN），
-// 这样 isOfficialMode() 返回 false，子进程不会走 OAuth 流程。
-// 用户通过 ProviderPanel 激活 provider 后 syncToSettings() 会覆盖此文件。
+/**
+ * 更加健壮的根目录定位：
+ * 1. 如果 preload.ts 在 ../ (当前 bin/ 目录下运行)
+ * 2. 否则查找同级及上级目录中的 package.json
+ */
+function getProjectRoot() {
+  let curr = __dirname;
+  try {
+    while (curr !== path.dirname(curr)) {
+      if (fs.existsSync(path.join(curr, 'preload.ts')) || fs.existsSync(path.join(curr, 'package.json'))) {
+        return curr;
+      }
+      const parent = path.dirname(curr);
+      if (fs.existsSync(path.join(parent, 'preload.ts'))) return parent;
+      curr = parent;
+    }
+  } catch (err) {
+    // 防止权限拒绝等导致挂死
+  }
+  return path.join(__dirname, '..');
+}
+
+const ROOT_DIR = getProjectRoot();
+
 (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');
 
-  // 只在 settings.json 不存在时才部署（不覆盖已有配置）
+  // 只在 settings.json 不存在时才部署
   if (!fs.existsSync(targetSettings)) {
-    const defaultsDir = path.join(__dirname, '..', 'config', 'bingo-defaults');
+    const defaultsDir = path.join(ROOT_DIR, 'config', 'bingo-defaults');
     const srcSettings = path.join(defaultsDir, 'settings.json');
 
     if (fs.existsSync(srcSettings)) {
@@ -40,42 +61,53 @@ const bunPath =
   process.env.BUN_PATH ||
   path.join(os.homedir(), '.bun', 'bin', 'bun.exe');
 
-// 检查 bun 是否可用（先看固定路径，再看 PATH）
+// 检查 bun 是否可用
 function bunExists() {
   if (fs.existsSync(bunPath)) return true;
-  // 尝试 PATH 中的 bun
-  const result = spawnSync('bun', ['--version'], { stdio: 'ignore', shell: true });
-  return result.status === 0;
+  try {
+    const result = spawnSync('bun', ['--version'], { stdio: 'ignore', shell: true });
+    return result.status === 0;
+  } catch (e) {
+    return false;
+  }
 }
 
-// 安装 bun（Windows PowerShell 方式）
+// 安装 bun
 function installBun() {
   console.log('[bingocode] bun 未检测到，正在自动安装...');
-  const result = spawnSync(
-    'powershell',
-    ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command',
-     'irm bun.sh/install.ps1 | iex'],
-    { stdio: 'inherit', shell: false }
-  );
-  if (result.status !== 0) {
-    console.error('[bingocode] bun 安装失败，请手动安装：https://bun.sh');
-    process.exit(1);
+  try {
+    const result = spawnSync(
+      'powershell',
+      ['-NoProfile', '-ExecutionPolicy', 'Bypass', '-Command',
+       'irm bun.sh/install.ps1 | iex'],
+      { stdio: 'inherit', shell: false }
+    );
+    if (result.status !== 0) {
+      throw new Error(`Exit code ${result.status}`);
+    }
+    console.log('[bingocode] bun 安装完成，正在启动...');
+  } catch (err) {
+    console.error(`[bingocode] bun 自动安装失败: ${err.message}`);
+    console.log('[bingocode] 请手动从 https://bun.sh 安装 Bun 后重试。');
+    return false;
   }
-  console.log('[bingocode] bun 安装完成，正在启动...');
+  return true;
 }
 
 if (!bunExists()) {
-  installBun();
+  if (!installBun()) {
+    process.exit(1);
+  }
 }
 
 // 安装后 bun.exe 在固定位置；若在 PATH 里则直接用 "bun"
 const bun = fs.existsSync(bunPath) ? bunPath : 'bun';
 
-// Bingo Manager 入口（窗口管理控制台，不走 cli.tsx 完整启动流程）
-const entry = path.join(__dirname, '..', 'src', 'entrypoints', 'manager.tsx');
+// Bingo Manager 入口
+const entry = path.join(ROOT_DIR, 'src', 'entrypoints', 'manager.tsx');
 
-// preload shim（定义 MACRO 全局变量）——必须用绝对路径，bunfig.toml 在 npm 全局安装后不生效
-const preload = path.join(__dirname, '..', 'preload.ts');
+// preload shim
+const preload = path.join(ROOT_DIR, 'preload.ts');
 if (!fs.existsSync(preload)) {
   console.error('[bingocode] 找不到 preload.ts，MACRO 将无法注入：' + preload);
   process.exit(1);
@@ -83,7 +115,7 @@ if (!fs.existsSync(preload)) {
 
 // 检查 .env
 let envFlag = '';
-const envPath = path.join(__dirname, '..', '.env');
+const envPath = path.join(ROOT_DIR, '.env');
 if (fs.existsSync(envPath)) {
   envFlag = `--env-file=${envPath}`;
 }

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.36",
+  "version": "1.0.38",
   "type": "module",
   "bin": {
     "claude": "bin/claude-win.cjs",

package/src/entrypoints/manager.tsx

@@ -1,10 +1,10 @@
-/**
- * Bingo Manager 入口
- * 直接渲染 CliMenuManager（窗口管理控制台），不走 cli.tsx 的完整启动流程。
- * 由 bin/bingo-win.cjs 和 bin/bingo 调用。
- */
-import React from 'react';
-import { render } from 'ink';
-import { CliMenuManager } from '../manager/CliMenuManager.tsx';
-
-render(<CliMenuManager />);
+/**
+ * Bingo Manager 入口
+ * 直接渲染 CliMenuManager（窗口管理控制台），不走 cli.tsx 的完整启动流程。
+ * 由 bin/bingo-win.cjs 和 bin/bingo 调用。
+ */
+import React from 'react';
+import { render } from 'ink';
+import { CliMenuManager } from '../manager/CliMenuManager.tsx';
+
+render(<CliMenuManager />);

package/src/server/cli/providersMenu.tsx

@@ -82,11 +82,11 @@ const ProvidersMenu: React.FC = () => {
             refresh();
           });
         }
-      } else if (inputKey.toLowerCase() === 'q') {
+      } else if (inputKey.toLowerCase() === 'q' || key.escape) {
         setRemoveConfirm(false); setMode('list');
       }
     }
-  });
+  }, { isActive: mode === 'list' || mode === 'removeConfirm' });
 
   // ADD模式交互
   useInput((inputKey, key) => {
@@ -102,7 +102,7 @@ const ProvidersMenu: React.FC = () => {
       else if (key.upArrow) setModelSelectIdx(idx => Math.max(0, idx - 1));
       else if (key.return) { setAddStep(1); }
     }
-  });
+  }, { isActive: mode === 'add' });
 
   // 新增表单
   const addSubmit = async (keyInput: string) => {

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())