bingocode 1.0.30 → 1.0.32

package/bin/bingo-win.cjs

@@ -71,6 +71,32 @@ if (!bunExists()) {
 // 安装后 bun.exe 在固定位置；若在 PATH 里则直接用 "bun"
 const bun = fs.existsSync(bunPath) ? bunPath : 'bun';
 
+// ── 自动检测并安装 git ──
+function gitExists() {
+  const result = spawnSync('git', ['--version'], { stdio: 'ignore', shell: true });
+  return result.status === 0;
+}
+
+function installGit() {
+  console.log('[bingo] git 未检测到，正在通过 winget 自动安装...');
+  const result = spawnSync(
+    'winget',
+    ['install', '--id', 'Git.Git', '-e', '--source', 'winget',
+     '--accept-package-agreements', '--accept-source-agreements'],
+    { stdio: 'inherit', shell: true }
+  );
+  if (result.status !== 0) {
+    console.warn('[bingo] git 自动安装失败，请手动安装：https://git-scm.com');
+    // 不退出 —— git 不是启动必须依赖，缺少时仅降级部分功能
+  } else {
+    console.log('[bingo] git 安装完成，若 PATH 未生效请重启终端。');
+  }
+}
+
+if (!gitExists()) {
+  installGit();
+}
+
 // Bingo Manager 入口（窗口管理控制台，不走 cli.tsx 完整启动流程）
 const entry = path.join(__dirname, '..', 'src', 'entrypoints', 'manager.tsx');
 

package/bin/bingocode-win.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { spawn } = require('node:child_process');
+const { spawn, spawnSync } = require('node:child_process');
 const path = require('path');
 const os = require('os');
 const fs = require('fs');
@@ -33,11 +33,63 @@ process.env.NoDefaultCurrentDirectoryInExePath = '1';
   }
 })();
 
-// 自动定位 bun 路径
-const bun =
+// ── 自动定位并安装 bun ──
+const bunPath =
   process.env.BUN_PATH ||
   path.join(os.homedir(), '.bun', 'bin', 'bun.exe');
 
+function bunExists() {
+  if (fs.existsSync(bunPath)) return true;
+  const result = spawnSync('bun', ['--version'], { stdio: 'ignore', shell: true });
+  return result.status === 0;
+}
+
+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);
+  }
+  console.log('[bingocode] bun 安装完成，正在启动...');
+}
+
+if (!bunExists()) {
+  installBun();
+}
+
+const bun = fs.existsSync(bunPath) ? bunPath : 'bun';
+
+// ── 自动检测并安装 git ──
+function gitExists() {
+  const result = spawnSync('git', ['--version'], { stdio: 'ignore', shell: true });
+  return result.status === 0;
+}
+
+function installGit() {
+  console.log('[bingocode] git 未检测到，正在通过 winget 自动安装...');
+  const result = spawnSync(
+    'winget',
+    ['install', '--id', 'Git.Git', '-e', '--source', 'winget',
+     '--accept-package-agreements', '--accept-source-agreements'],
+    { stdio: 'inherit', shell: true }
+  );
+  if (result.status !== 0) {
+    console.warn('[bingocode] git 自动安装失败，请手动安装：https://git-scm.com');
+  } else {
+    console.log('[bingocode] git 安装完成，若 PATH 未生效请重启终端。');
+  }
+}
+
+if (!gitExists()) {
+  installGit();
+}
+
 // 主 CLI 入口
 const entry = path.join(__dirname, '..', 'src', 'entrypoints', 'cli.tsx');
 

package/bin/claude-win.cjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-const { spawn } = require('node:child_process');
+const { spawn, spawnSync } = require('node:child_process');
 const path = require('path');
 const os = require('os');
 const fs = require('fs');
@@ -32,11 +32,63 @@ process.env.NoDefaultCurrentDirectoryInExePath = '1';
   }
 })();
 
-// 自动定位 bun 路径
-const bun =
+// ── 自动定位并安装 bun ──
+const bunPath =
   process.env.BUN_PATH ||
   path.join(os.homedir(), '.bun', 'bin', 'bun.exe');
 
+function bunExists() {
+  if (fs.existsSync(bunPath)) return true;
+  const result = spawnSync('bun', ['--version'], { stdio: 'ignore', shell: true });
+  return result.status === 0;
+}
+
+function installBun() {
+  console.log('[claude] 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('[claude] bun 安装失败，请手动安装：https://bun.sh');
+    process.exit(1);
+  }
+  console.log('[claude] bun 安装完成，正在启动...');
+}
+
+if (!bunExists()) {
+  installBun();
+}
+
+const bun = fs.existsSync(bunPath) ? bunPath : 'bun';
+
+// ── 自动检测并安装 git ──
+function gitExists() {
+  const result = spawnSync('git', ['--version'], { stdio: 'ignore', shell: true });
+  return result.status === 0;
+}
+
+function installGit() {
+  console.log('[claude] git 未检测到，正在通过 winget 自动安装...');
+  const result = spawnSync(
+    'winget',
+    ['install', '--id', 'Git.Git', '-e', '--source', 'winget',
+     '--accept-package-agreements', '--accept-source-agreements'],
+    { stdio: 'inherit', shell: true }
+  );
+  if (result.status !== 0) {
+    console.warn('[claude] git 自动安装失败，请手动安装：https://git-scm.com');
+  } else {
+    console.log('[claude] git 安装完成，若 PATH 未生效请重启终端。');
+  }
+}
+
+if (!gitExists()) {
+  installGit();
+}
+
 // 主 CLI 入口
 const entry = path.join(__dirname, '..', 'src', 'entrypoints', 'cli.tsx');
 

package/package.json

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

package/scripts/preinstall-stop.cjs

@@ -0,0 +1,164 @@
+#!/usr/bin/env node
+
+/**
+ * npm preinstall hook: gracefully stop running bingo/bingocode processes
+ * so that npm can overwrite files without EBUSY/EPERM on Windows.
+ *
+ * On Windows, running processes hold mandatory file locks on their loaded .js
+ * files and dependencies. When `npm install -g bingocode` tries to overwrite
+ * these files, it fails with EBUSY or EPERM. This script discovers all running
+ * bingo/bingocode processes via their PID files and stops them before npm
+ * writes any files.
+ *
+ * PID file locations (matching the runtime code):
+ *   - Singleton server: ~/.claude-cli/runtime/server.lock.json  { pid, port, ... }
+ *   - Active sessions:  ~/.claude/sessions/<pid>.json            { pid, sessionId, ... }
+ *
+ * Must be CJS (.cjs) because npm executes lifecycle scripts with node,
+ * and package.json has "type": "module".
+ */
+
+const { spawnSync } = require('child_process');
+const fs = require('fs');
+const path = require('path');
+const os = require('os');
+
+// ── Paths (mirroring the runtime code) ──────────────────────────────────────
+
+const configDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
+const runtimeDir = path.join(os.homedir(), '.claude-cli', 'runtime');
+const serverLockPath = path.join(runtimeDir, 'server.lock.json');
+const leasesDir = path.join(runtimeDir, 'leases');
+const sessionsDir = path.join(configDir, 'sessions');
+
+// ── Helpers ─────────────────────────────────────────────────────────────────
+
+function isPidAlive(pid) {
+  try {
+    process.kill(pid, 0);
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function killPid(pid) {
+  try {
+    if (process.platform === 'win32') {
+      // /T = kill the entire process tree; /F = force
+      spawnSync('taskkill', ['/PID', String(pid), '/T', '/F'], {
+        stdio: 'ignore',
+      });
+    } else {
+      process.kill(pid, 'SIGTERM');
+    }
+  } catch {
+    // Process may have already exited
+  }
+}
+
+function readJsonSafe(filePath) {
+  try {
+    return JSON.parse(fs.readFileSync(filePath, 'utf-8'));
+  } catch {
+    return null;
+  }
+}
+
+function sleepMs(ms) {
+  // Cross-platform synchronous sleep via spawnSync
+  if (process.platform === 'win32') {
+    // "ping -n 2 127.0.0.1" sleeps ~1s (more reliable than timeout in non-interactive)
+    spawnSync('ping', ['-n', '2', '127.0.0.1'], { stdio: 'ignore' });
+  } else {
+    spawnSync('sleep', [String(ms / 1000)], { stdio: 'ignore' });
+  }
+}
+
+// ── Collect PIDs ────────────────────────────────────────────────────────────
+
+const pidsToKill = new Set();
+
+// 1. Singleton server PID from server.lock.json
+const serverLock = readJsonSafe(serverLockPath);
+if (serverLock && serverLock.pid && isPidAlive(serverLock.pid)) {
+  pidsToKill.add(serverLock.pid);
+}
+
+// 2. Active session PIDs from ~/.claude/sessions/<pid>.json
+try {
+  const files = fs.readdirSync(sessionsDir);
+  for (const f of files) {
+    // Strict filename guard: only "<digits>.json" files are PID files
+    if (!/^\d+\.json$/.test(f)) continue;
+    const data = readJsonSafe(path.join(sessionsDir, f));
+    if (data && data.pid && isPidAlive(data.pid)) {
+      pidsToKill.add(data.pid);
+    }
+  }
+} catch {
+  // sessionsDir may not exist yet — that's fine
+}
+
+// ── Nothing to do ───────────────────────────────────────────────────────────
+
+if (pidsToKill.size === 0) {
+  // No running processes, npm can proceed safely
+  process.exit(0);
+}
+
+// ── Kill processes ──────────────────────────────────────────────────────────
+
+console.log(
+  `[bingocode] 检测到 ${pidsToKill.size} 个运行中的进程，正在停止以便安装...`
+);
+
+for (const pid of pidsToKill) {
+  console.log(`  停止 PID ${pid}`);
+  killPid(pid);
+}
+
+// ── Wait for processes to exit (max 5 seconds) ─────────────────────────────
+
+const MAX_WAIT_MS = 5000;
+const deadline = Date.now() + MAX_WAIT_MS;
+
+while (Date.now() < deadline) {
+  const alive = [...pidsToKill].filter(isPidAlive);
+  if (alive.length === 0) break;
+  sleepMs(500);
+}
+
+// Check if any processes are still alive after timeout
+const stillAlive = [...pidsToKill].filter(isPidAlive);
+if (stillAlive.length > 0) {
+  console.warn(
+    `[bingocode] 警告：${stillAlive.length} 个进程未能在 ${MAX_WAIT_MS / 1000} 秒内停止 (PIDs: ${stillAlive.join(', ')})`
+  );
+  console.warn(
+    '[bingocode] 安装可能仍会因文件锁定而失败，请手动关闭这些进程后重试'
+  );
+}
+
+// ── Clean up stale lock/lease files ─────────────────────────────────────────
+
+try {
+  fs.rmSync(serverLockPath, { force: true });
+} catch {
+  // Ignore — file may not exist or may already be cleaned up
+}
+
+try {
+  const leaseFiles = fs.readdirSync(leasesDir);
+  for (const f of leaseFiles) {
+    try {
+      fs.rmSync(path.join(leasesDir, f), { force: true });
+    } catch {
+      // Best-effort cleanup
+    }
+  }
+} catch {
+  // leasesDir may not exist
+}
+
+console.log('[bingocode] 进程已停止，继续安装...');

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/manager/CliMenuManager.tsx

@@ -280,19 +280,33 @@ export const CliMenuManager: React.FC = () => {
   // 配置就绪探测（用于避免 Logo 早期读取）
   const [configReady, setConfigReady] = useState(false);
 
-  // 启动/复用本地唯一服务，并注入 apiUrl
+  // 启动/复用本地唯一服务，并注入 apiUrl（含重试机制）
   useEffect(() => {
     let mounted = true;
     (async () => {
-      try {
-        if (apiUrl) return;
-        const entry = path.resolve(import.meta.dir, '../server/index.ts');
-        const handle = await ensureSingletonLocalServer({ serverEntry: entry });
-        if (!mounted) { await handle.stopIfLast(); return; }
-        setApiUrl(handle.baseUrl);
-        setStopIfLast(() => handle.stopIfLast);
-      } catch (e: any) {
-        setBootErr(e.message || '本地服务启动失败');
+      if (apiUrl) return;
+      const entry = path.resolve(import.meta.dir, '../server/index.ts');
+      const MAX_RETRIES = 3;
+      const RETRY_DELAYS = [0, 2000, 5000]; // 首次无延迟，第2次2秒，第3次5秒
+      for (let attempt = 0; attempt < MAX_RETRIES; attempt++) {
+        if (!mounted) return;
+        if (attempt > 0) {
+          setBootErr(`第 ${attempt} 次启动失败，${RETRY_DELAYS[attempt] / 1000}秒后重试...`);
+          await new Promise(r => setTimeout(r, RETRY_DELAYS[attempt]));
+        }
+        if (!mounted) return;
+        try {
+          const handle = await ensureSingletonLocalServer({ serverEntry: entry });
+          if (!mounted) { await handle.stopIfLast(); return; }
+          setApiUrl(handle.baseUrl);
+          setStopIfLast(() => handle.stopIfLast);
+          setBootErr(null);
+          return; // 成功，退出重试
+        } catch (e: any) {
+          if (attempt === MAX_RETRIES - 1) {
+            setBootErr(e.message || '本地服务启动失败');
+          }
+        }
       }
     })();
     return () => { mounted = false; if (stopIfLast) stopIfLast(); };
@@ -653,7 +667,8 @@ export const CliMenuManager: React.FC = () => {
   }
 
   // 新增：会话恢复（供快捷键和右侧菜单复用）
-  async function resumeSession(sessionId: string) {
+  // workDir: 会话原始工作目录，用于跨文件夹恢复（确保新进程能找到 session 文件）
+  async function resumeSession(sessionId: string, workDir?: string | null) {
     try {
       const fsReq = require('fs');
       const pathReq = require('path');
@@ -673,7 +688,7 @@ export const CliMenuManager: React.FC = () => {
         : ['-c', `${binName} --resume ${sessionId}`];
       const spawnEnv = await buildSpawnEnv();
       spawn(spawnCmd, spawnArgs, {
-        cwd: process.env.CALLER_DIR || process.cwd(),
+        cwd: workDir || process.env.CALLER_DIR || process.cwd(),
         env: spawnEnv,
         detached: true,
         stdio: 'ignore'
@@ -749,7 +764,7 @@ export const CliMenuManager: React.FC = () => {
         toggleMarkSession(selectedHistory.id);
         break;
       case '__continue':
-        resumeSession(selectedHistory.id);
+        resumeSession(selectedHistory.id, selectedHistory.workDir);
         break;
       case '__delete':
         setHistoryMenuStage('deleteConfirm');
@@ -810,7 +825,7 @@ export const CliMenuManager: React.FC = () => {
             setSelectedHistory(null);
             setMsgsPage(0);
           } else if (item.value === '__continue') {
-            resumeSession(selectedHistory.id);
+            resumeSession(selectedHistory.id, selectedHistory.workDir);
           } else if (item.value === '__delete') {
             setHistoryMenuStage('deleteConfirm');
           } else if (item.value === '__toggle_mark') {
@@ -870,9 +885,17 @@ export const CliMenuManager: React.FC = () => {
       const WELCOME_W = 58;
       const leftPad = Math.max(0, Math.floor((VIEW_W - WELCOME_W) / 2));
       return (
-        <Box flexDirection="row" width={VIEW_W} height={MID_H}>
-          <Box width={leftPad} flexShrink={0} />
-          <WelcomeV2 />
+        <Box flexDirection="column" width={VIEW_W} height={MID_H}>
+          <Box flexDirection="row" width={VIEW_W} flexGrow={1}>
+            <Box width={leftPad} flexShrink={0} />
+            <WelcomeV2 />
+          </Box>
+          {!apiUrl && !bootErr && (
+            <Text color="yellow">⏳ 服务启动中...</Text>
+          )}
+          {bootErr && (
+            <Text color="red">服务启动失败: {bootErr}</Text>
+          )}
         </Box>
       );
     }
@@ -1014,6 +1037,14 @@ export const CliMenuManager: React.FC = () => {
 
     // Provider
     if (page === 'provider') {
+      if (!apiUrl) {
+        return (
+          <Box width={VIEW_W} height={MID_H} flexDirection="column">
+            <Text color="yellow">{bootErr ? `服务启动失败: ${bootErr}` : '⏳ 服务启动中，请稍候...'}</Text>
+            <Text dimColor>ESC 返回主菜单</Text>
+          </Box>
+        );
+      }
       return (
         <Box width={VIEW_W} height={MID_H} flexDirection="column">
           <ProviderPanel apiUrl={apiUrl} onBack={() => setPage(null)} />

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