bingocode 1.0.37 → 1.0.40

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-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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bingocode",
-  "version": "1.0.37",
+  "version": "1.0.40",
   "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/manager/CliMenuManager.tsx

@@ -980,7 +980,7 @@ export const CliMenuManager: React.FC = () => {
             </Box>
 
             {/* ── 消息区 ── */}
-            <Box height={MSGS_H} flexDirection="column" overflow="hidden">
+            <Box height={MSGS_H} flexDirection="column">
               {loadingMsgs && <Text color="yellow">加载消息中...</Text>}
               {msgsErr && <Text color="red">错误: {msgsErr}</Text>}
               {!loadingMsgs && !msgsErr && displayMsgs.length === 0 && (
@@ -1024,11 +1024,16 @@ export const CliMenuManager: React.FC = () => {
                 setHistoryMenuStage('window');
               }
             }}
-            itemComponent={({ isSelected, label, color, isGroup }) => (
-              <Text color={isGroup ? 'gray' : (color ? color : (isSelected ? 'cyan' : undefined))}>
-                {label}
-              </Text>
-            )}
+            itemComponent={({ isSelected, label }) => {
+              const it = groupedHistoryItems.find(i => i.label === label);
+              const isGroup = it?.isGroup;
+              const color = it?.color;
+              return (
+                <Text color={isGroup ? 'gray' : (color ? color : (isSelected ? 'cyan' : undefined))}>
+                  {label}
+                </Text>
+              )
+            }}
           />
           <Hint>{i18nMap[lang].historyHint}</Hint>
         </Box>

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/server/proxy/handler.ts

@@ -21,9 +21,28 @@ import { openaiChatStreamToAnthropic } from './streaming/openaiChatStreamToAnthr
 import { openaiResponsesStreamToAnthropic } from './streaming/openaiResponsesStreamToAnthropic.js'
 import type { AnthropicRequest } from './transform/types.js'
 import type { SlotName } from '../types/provider.js'
+import { logForDebugging } from '../../utils/debug.js'
+import { appendFile, mkdir } from 'node:fs/promises'
+import { join } from 'node:path'
+import { homedir } from 'node:os'
 
 const providerService = new ProviderService()
 
+async function logToFile(message: string) {
+  // Disabled log output for production
+}
+
+function sendAnthropicError(message: string, _model: string | undefined, status = 502): Response {
+  const fullMessage = `[Bingo Proxy] ${message}`
+  void logToFile(`ERROR: ${fullMessage} (status: ${status})`)
+
+  // 统一返回纯文本以规避 CLI 的 JSON 字符串打印行为，确保报错清晰且不带 JSON 外壳
+  return new Response(fullMessage, {
+    status: status,
+    headers: { 'Content-Type': 'text/plain' }
+  })
+}
+
 function buildUpstreamHeaders(apiKey: string): Record<string, string> {
   const headers: Record<string, string> = {
     'Content-Type': 'application/json',
@@ -43,23 +62,41 @@ function buildUpstreamHeaders(apiKey: string): Record<string, string> {
 
 /**
  * Identify which slot a model name belongs to.
- * Claude Code sends model names like "claude-3-5-haiku-20241022".
+ * Checks for exact matches in provider models first, then falls back to keyword matching.
  */
-function identifySlot(modelName: string): SlotName {
+async function identifySlot(modelName: string): Promise<SlotName> {
   const m = modelName.toLowerCase()
-  if (m.includes('haiku')) return 'haiku'
-  if (m.includes('sonnet')) return 'sonnet'
-  if (m.includes('opus')) return 'opus'
-  return 'main'
+  void logToFile(`Identifying slot. Input: "${modelName}"`)
+
+  try {
+    const { providers } = await providerService.listProviders()
+    for (const config of providers) {
+      if (config.models) {
+        for (const [slot, id] of Object.entries(config.models)) {
+          if (id && id.toLowerCase() === m) {
+            void logToFile(`Match found in config! Slot: ${slot} (ID: ${id})`)
+            return slot as SlotName
+          }
+        }
+      }
+    }
+  } catch (e) {
+    void logToFile(`Error reading providers for identification: ${e}`)
+  }
+
+  let result: SlotName = 'main'
+  if (m.includes('opus')) result = 'opus'
+  else if (m.includes('sonnet')) result = 'sonnet'
+  else if (m.includes('haiku')) result = 'haiku'
+
+  void logToFile(`Fallback identification result: ${result}`)
+  return result
 }
 
 export async function handleProxyRequest(req: Request, url: URL): Promise<Response> {
   // Only handle POST /proxy/v1/messages
   if (req.method !== 'POST' || url.pathname !== '/proxy/v1/messages') {
-    return Response.json(
-      { error: 'Not Found', message: 'Proxy only handles POST /proxy/v1/messages' },
-      { status: 404 },
-    )
+    return sendAnthropicError('Not Found: Proxy only handles POST /proxy/v1/messages', undefined, 404)
   }
 
   // Parse request body
@@ -67,20 +104,19 @@ export async function handleProxyRequest(req: Request, url: URL): Promise<Respon
   try {
     body = (await req.json()) as AnthropicRequest
   } catch {
-    return Response.json(
-      { type: 'error', error: { type: 'invalid_request_error', message: 'Invalid JSON in request body' } },
-      { status: 400 },
-    )
+    return sendAnthropicError('Invalid JSON in request body', undefined, 400)
   }
 
   const isStream = body.stream === true
 
   // --- Slot-based routing ---
-  const slot = identifySlot(body.model ?? '')
+  const slot = await identifySlot(body.model ?? '')
+  const reqId = Math.random().toString(36).substring(7)
+  void logToFile(`[${reqId}] Body Model: "${body.model}". Decided Slot: "${slot}"`)
+
   const slotConfig = await providerService.getProviderForSlot(slot)
 
   if (slotConfig) {
-    // Use the slot's configured modelId instead of the original Claude model name
     const proxiedBody: AnthropicRequest = { ...body, model: slotConfig.modelId }
     const baseUrl = slotConfig.baseUrl.replace(/\/+$/, '')
     const uiLabel = slotConfig.label || null
@@ -94,40 +130,20 @@ export async function handleProxyRequest(req: Request, url: URL): Promise<Respon
         return await handleOpenaiResponses(proxiedBody, baseUrl, slotConfig.apiKey, isStream, uiLabel)
       }
     } catch (err) {
-      console.error(`[Proxy] Slot "${slot}" upstream request failed:`, err)
-      return Response.json(
-        {
-          type: 'error',
-          error: {
-            type: 'api_error',
-            message: err instanceof Error ? err.message : String(err),
-          },
-        },
-        { status: 502 },
-      )
+      logForDebugging(`[HANDLER][${reqId}] Slot "${slot}" upstream connection failed: ${err}`, { level: 'error' })
+      return sendAnthropicError(`API Connection Failed: Ensure baseUrl is correct. Error: ${err instanceof Error ? err.message : String(err)}`, body.model, 502)
     }
   }
 
   // --- Fallback: legacy single-activeId routing ---
   const config = await providerService.getActiveProviderForProxy()
   if (!config) {
-    return Response.json(
-      {
-        type: 'error',
-        error: {
-          type: 'invalid_request_error',
-          message: `No provider configured for slot "${slot}". Please configure slots in the Provider panel.`,
-        },
-      },
-      { status: 400 },
-    )
+    logForDebugging(`[HANDLER][${reqId}] No provider configured for slot "${slot}"`, { level: 'warn' })
+    return sendAnthropicError(`No provider configured for slot "${slot}". Please configure slots in the Provider panel.`, body.model)
   }
 
   if (config.apiFormat === 'anthropic') {
-    return Response.json(
-      { type: 'error', error: { type: 'invalid_request_error', message: 'Active provider uses anthropic format — proxy not needed' } },
-      { status: 400 },
-    )
+    return sendAnthropicError('Active provider uses anthropic format — proxy not needed', body.model)
   }
 
   const baseUrl = config.baseUrl.replace(/\/+$/, '')
@@ -139,17 +155,8 @@ export async function handleProxyRequest(req: Request, url: URL): Promise<Respon
       return await handleOpenaiResponses(body, baseUrl, config.apiKey, isStream)
     }
   } catch (err) {
-    console.error('[Proxy] Upstream request failed:', err)
-    return Response.json(
-      {
-        type: 'error',
-        error: {
-          type: 'api_error',
-          message: err instanceof Error ? err.message : String(err),
-        },
-      },
-      { status: 502 },
-    )
+    logForDebugging(`[HANDLER][${reqId}] Upstream connection failed: ${err}`, { level: 'error' })
+    return sendAnthropicError(`API Connection Failed: Ensure baseUrl is correct. Error: ${err instanceof Error ? err.message : String(err)}`, body.model, 502)
   }
 }
 
@@ -176,12 +183,22 @@ async function handleAnthropicPassthrough(
     signal: isStream ? AbortSignal.timeout(30_000) : AbortSignal.timeout(300_000),
   })
 
-  // ... (existing error checks)
+  if (!upstream.ok) {
+    const errText = await upstream.text().catch(() => '')
+    const errorMessage = `Upstream returned HTTP ${upstream.status}: ${errText.slice(0, 500)}`
+    return sendAnthropicError(errorMessage, body.model, 502)
+  }
 
   if (isStream) {
-    // Anthropic pass-through doesn't easily support label injection without parsing SSE
-    // So for native anthropic format, we might just pass original stream
-    return new Response(upstream.body, { /* ... */ })
+    if (!upstream.body) {
+      return sendAnthropicError('Upstream returned no body for stream', body.model)
+    }
+    return new Response(upstream.body, {
+      status: 200,
+      headers: {
+        'Content-Type': 'application/json',
+      },
+    })
   }
 
   const responseBody = await upstream.json()
@@ -209,12 +226,21 @@ async function handleOpenaiChat(
   })
 
   if (!upstream.ok) {
-    // ... error handling
+    const errText = await upstream.text().catch(() => '')
+    let errorMessage = `Upstream returned HTTP ${upstream.status}: ${errText.slice(0, 500)}`
+    let status = upstream.status
+
+    if (upstream.status === 404) {
+      status = 502
+      errorMessage = `API Connection Failed: The baseUrl path might be incorrect (404 Not Found). Detail: ${errText}`
+    }
+
+    return sendAnthropicError(errorMessage, body.model, status)
   }
 
   if (isStream) {
     if (!upstream.body) {
-      return Response.json(/* ... */)
+      return sendAnthropicError('Upstream returned no body for stream', body.model)
     }
     const anthropicStream = openaiChatStreamToAnthropic(upstream.body, uiLabel || body.model)
     return new Response(anthropicStream, {
@@ -252,24 +278,20 @@ async function handleOpenaiResponses(
 
   if (!upstream.ok) {
     const errText = await upstream.text().catch(() => '')
-    return Response.json(
-      {
-        type: 'error',
-        error: {
-          type: 'api_error',
-          message: `Upstream returned HTTP ${upstream.status}: ${errText.slice(0, 500)}`,
-        },
-      },
-      { status: upstream.status },
-    )
+    let errorMessage = `Upstream returned HTTP ${upstream.status}: ${errText.slice(0, 500)}`
+    let status = upstream.status
+
+    if (upstream.status === 404) {
+      status = 502
+      errorMessage = `API Connection Failed: The baseUrl path might be incorrect (404 Not Found). Detail: ${errText}`
+    }
+
+    return sendAnthropicError(errorMessage, body.model, status)
   }
 
   if (isStream) {
     if (!upstream.body) {
-      return Response.json(
-        { type: 'error', error: { type: 'api_error', message: 'Upstream returned no body for stream' } },
-        { status: 502 },
-      )
+      return sendAnthropicError('Upstream returned no body for stream', body.model)
     }
     const anthropicStream = openaiResponsesStreamToAnthropic(upstream.body, uiLabel || body.model)
     return new Response(anthropicStream, {