bingocode 1.0.17 → 1.0.19

package/bin/claude

@@ -9,7 +9,7 @@ cd "$ROOT_DIR"
 
 # When spawned by the desktop/web server as a child CLI process,
 # skip .env loading — the server has already set the correct env
-# via cc-haha/settings.json. Loading .env would re-inject stale
+# via bingo/settings.json. Loading .env would re-inject stale
 # provider keys (e.g., a MiniMax key as ANTHROPIC_API_KEY) that
 # override the active provider config.
 if [[ "${CC_HAHA_SKIP_DOTENV:-0}" == "1" ]]; then

package/package.json

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

package/src/cli/ProviderPanel.tsx

@@ -50,7 +50,8 @@ type Stage =
   | 'editing'
   | 'slot_config'
   | 'slot_loading'
-  | 'slot_select_model';
+  | 'slot_select_model'
+  | 'slot_input_label';
 
 export const ProviderPanel: React.FC<{
   apiUrl: string;
@@ -82,11 +83,14 @@ export const ProviderPanel: React.FC<{
   const [editKey, setEditKey] = useState('');
 
   // 槽位配置状态
-  type SlotEntry = { providerId: string; modelId: string } | null;
+  type SlotEntry = { providerId: string; modelId: string; label?: string | null } | null;
   const [slotTable, setSlotTable] = useState<Record<string, SlotEntry>>({});
   const [slotProviderModels, setSlotProviderModels] = useState<Record<string, string[]>>({});
   const [currentSlotName, setCurrentSlotName] = useState<string>('main');
   const [slotLoadingMsg, setSlotLoadingMsg] = useState<string>('');
+  const [tempSlotProviderId, setTempSlotProviderId] = useState<string>('');
+  const [tempSlotModelId, setTempSlotModelId] = useState<string>('');
+  const [slotLabelInput, setSlotLabelInput] = useState<string>('');
 
   const base = apiUrl.replace(/\/+$/, '');
 
@@ -609,7 +613,8 @@ export const ProviderPanel: React.FC<{
       const providerName = entry
         ? (providers.find(p => p.id === entry.providerId)?.name || entry.providerId)
         : null;
-      const status = entry ? `${providerName} / ${entry.modelId}` : '未配置';
+      const modelDisplayName = entry?.label || entry?.modelId || '未配置';
+      const status = entry ? `${providerName} / ${modelDisplayName}` : '未配置';
       const label = `[${s}]  ${status}  — ${SLOT_DESCS[s]}`;
       return { label, value: s };
     });
@@ -700,10 +705,42 @@ export const ProviderPanel: React.FC<{
             const sepIdx = val.indexOf('::');
             const providerId = val.slice(0, sepIdx);
             const modelId = val.slice(sepIdx + 2);
-            axios.put(`${base}/api/providers/slots/${currentSlotName}`, { providerId, modelId })
+            setTempSlotProviderId(providerId);
+            setTempSlotModelId(modelId);
+            setSlotLabelInput(modelId); // 默认建议使用模型名作为 Label
+            setStage('slot_input_label');
+          }}
+        />
+        <Text dimColor>↑↓ 选择模型，回车确认，ESC 返回</Text>
+      </Box>
+    );
+  }
+
+  if (stage === 'slot_input_label') {
+    return (
+      <Box flexDirection="column">
+        <Text color="cyan">配置槽位 [{currentSlotName}] — 设置显示名称</Text>
+        <Text>
+          模型：{providers.find(p => p.id === tempSlotProviderId)?.name || tempSlotProviderId} / {tempSlotModelId}
+        </Text>
+        <Box marginTop={1}>
+          <Text>显示名称 (Label)：</Text>
+          <TextInput
+            value={slotLabelInput}
+            onChange={setSlotLabelInput}
+            onSubmit={() => {
+              const label = slotLabelInput.trim() || tempSlotModelId;
+              axios.put(`${base}/api/providers/slots/${currentSlotName}`, {
+                providerId: tempSlotProviderId,
+                modelId: tempSlotModelId,
+                label,
+              })
               .then(() => {
-                setSlotTable(prev => ({ ...prev, [currentSlotName]: { providerId, modelId } }));
-                setOpMsg(`已配置 [${currentSlotName}] -> ${providers.find(p => p.id === providerId)?.name || providerId} / ${modelId}`);
+                setSlotTable(prev => ({
+                  ...prev,
+                  [currentSlotName]: { providerId: tempSlotProviderId, modelId: tempSlotModelId, label }
+                }));
+                setOpMsg(`已配置 [${currentSlotName}] -> ${label}`);
                 setErr(null);
                 setStage('slot_config');
               })
@@ -711,9 +748,10 @@ export const ProviderPanel: React.FC<{
                 setErr((e as any)?.response?.data?.message || (e as any)?.message || '保存失败');
                 setStage('slot_config');
               });
-          }}
-        />
-        <Text dimColor>↑↓ 选择模型，回车确认，ESC 返回</Text>
+            }}
+          />
+        </Box>
+        <Text dimColor>回车保存组件名称（显示在 Claude UI），ESC 返回模型选择</Text>
       </Box>
     );
   }

package/src/manager/CliMenuManager.tsx

@@ -1,7 +1,7 @@
 //@C:M ID=M.CM.CliMenuManager;K=M;V=1.5;P=module;D=CLI;M=cli;S=main
 import React, { useState, useEffect, useMemo } from 'react';
 import axios from 'axios';
-import { Box, Text, useApp, useInput } from 'ink';
+import { Box, Text, useApp, useInput, useStdout } from 'ink';
 import SelectInput from 'ink-select-input';
 import ProviderPanel from '../cli/ProviderPanel.tsx';
 import { LogoV2 } from '../components/LogoV2/LogoV2.tsx';
@@ -24,9 +24,51 @@ import { getGlobalConfig, saveGlobalConfig } from '../utils/config.ts';
 // markedSessions 存到 ~/.claude-cli/ 固定目录，不受 cwd 影响
 const MARKED_FILE = path.join(os.homedir(), '.claude-cli', 'markedSessions.json');
 
-// 固定尺寸视口（可用环境变量覆盖）
-const VIEW_W = Number(process.env.CLI_VIEW_W || 96);
-const VIEW_H = Number(process.env.CLI_VIEW_H || 30);
+/**
+ * 判断是否处于"官方"模式（没有激活任何自定义 provider）。
+ * 逻辑与 ConversationService.shouldMarkManagedOAuth() 保持一致。
+ */
+function isOfficialMode(): boolean {
+  const configDir = process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude');
+  const settingsPath = path.join(configDir, 'bingo', 'settings.json');
+  try {
+    const raw = fs.readFileSync(settingsPath, 'utf-8');
+    const parsed = JSON.parse(raw) as { env?: Record<string, string> };
+    const env = parsed.env ?? {};
+    const hasProviderEnv = ['ANTHROPIC_API_KEY', 'ANTHROPIC_AUTH_TOKEN', 'ANTHROPIC_BASE_URL']
+      .some(key => typeof env[key] === 'string' && env[key]!.trim().length > 0);
+    return !hasProviderEnv;
+  } catch {
+    return true; // 读不到 settings.json → 按官方模式处理
+  }
+}
+
+/**
+ * 构造子进程的 spawn env。
+ * 官方模式下注入 CLAUDE_CODE_ENTRYPOINT=claude-desktop + CLAUDE_CODE_OAUTH_TOKEN，
+ * 使新建/恢复的 bingocode 窗口能直接走 OAuth，不显示"未登录"。
+ */
+async function buildSpawnEnv(): Promise<NodeJS.ProcessEnv> {
+  const base = { ...process.env };
+  if (!isOfficialMode()) return base;
+
+  // 官方模式：标记为 managed-OAuth，并注入 OAuth token
+  base.CLAUDE_CODE_ENTRYPOINT = 'claude-desktop';
+  try {
+    const { hahaOAuthService } = await import('../server/services/hahaOAuthService.js');
+    const token = await hahaOAuthService.ensureFreshAccessToken();
+    if (token) {
+      base.CLAUDE_CODE_OAUTH_TOKEN = token;
+    } else {
+      // 没有有效 token 时不注入，让 CLI 走正常登录流程
+      delete base.CLAUDE_CODE_OAUTH_TOKEN;
+    }
+  } catch {
+    delete base.CLAUDE_CODE_OAUTH_TOKEN;
+  }
+  return base;
+}
+
 // 顶部高度：首页适配 LogoV2 + Toolbar，其它页面更紧凑
 const TOP_H_HOME = Number(process.env.CLI_TOP_H_HOME || 9);
 const TOP_H_COMPACT = Number(process.env.CLI_TOP_H_COMPACT || 6);
@@ -107,6 +149,27 @@ type ChatMessage = {
 
 //@C:F ID=F.CM.CliMenuManager;K=F;V=1.5;P=CLI 主菜单;D=CLI;M=cli;S=main;In=;Out=JSX.Element
 export const CliMenuManager: React.FC = () => {
+  const { stdout } = useStdout();
+  const [terminalSize, setTerminalSize] = useState({
+    columns: stdout?.columns || 80,
+    rows: stdout?.rows || 24
+  });
+
+  useEffect(() => {
+    const onResize = () => {
+      setTerminalSize({
+        columns: stdout?.columns || 80,
+        rows: stdout?.rows || 24
+      });
+    };
+    stdout?.on('resize', onResize);
+    return () => { stdout?.off('resize', onResize); };
+  }, [stdout]);
+
+  // 动态视口（默认优先使用环境变量，否则使用当前终端宽度并留一点余量）
+  const VIEW_W = Number(process.env.CLI_VIEW_W || Math.min(terminalSize.columns, 96));
+  const VIEW_H = Number(process.env.CLI_VIEW_H || terminalSize.rows);
+
   const [apiUrl, setApiUrl] = useState<string | null>(process.env.BASE_API_URL || null);
   const [stopIfLast, setStopIfLast] = useState<null | (() => Promise<void>)>(null);
   const [bootErr, setBootErr] = useState<string | null>(null);
@@ -259,9 +322,10 @@ export const CliMenuManager: React.FC = () => {
       const spawnCmd = isWin ? 'cmd' : 'sh';
       // Windows 直接调全局 bingocode 命令，不用 bun 前缀
       const spawnArgs = isWin ? ['/c', 'start', 'cmd', '/k', 'bingocode'] : ['-c', `${binName}`];
+      const spawnEnv = await buildSpawnEnv();
       spawn(spawnCmd, spawnArgs, {
         cwd: process.env.CALLER_DIR || process.cwd(),
-        env: process.env,
+        env: spawnEnv,
         detached: true,
         stdio: 'ignore'
       }).unref();
@@ -524,7 +588,7 @@ export const CliMenuManager: React.FC = () => {
   }
 
   // 新增：会话恢复（供快捷键和右侧菜单复用）
-  function resumeSession(sessionId: string) {
+  async function resumeSession(sessionId: string) {
     try {
       const fsReq = require('fs');
       const pathReq = require('path');
@@ -542,9 +606,10 @@ export const CliMenuManager: React.FC = () => {
       const spawnArgs = isWin
         ? ['/c', 'start', 'cmd', '/k', `bingocode --resume ${sessionId}`]
         : ['-c', `${binName} --resume ${sessionId}`];
+      const spawnEnv = await buildSpawnEnv();
       spawn(spawnCmd, spawnArgs, {
         cwd: process.env.CALLER_DIR || process.cwd(),
-        env: process.env,
+        env: spawnEnv,
         detached: true,
         stdio: 'ignore'
       }).unref();
@@ -923,6 +988,17 @@ export const CliMenuManager: React.FC = () => {
     return <Box width={VIEW_W} height={MID_H} />;
   }
 
+  // 退出逻辑
+  if (terminalSize.columns < 60 || terminalSize.rows < 15) {
+    return (
+      <Box flexDirection="column" padding={2}>
+        <Text color="red">终端窗口太小！ / Terminal too small!</Text>
+        <Text>当前 / Current: {terminalSize.columns}x{terminalSize.rows}</Text>
+        <Text>请调节窗口大小以继续... / Please resize to continue...</Text>
+      </Box>
+    );
+  }
+
   // 根渲染：上-中-下三段
   return (
     <Box flexDirection="column" width={VIEW_W}>

package/src/server/__tests__/conversation-service.test.ts

@@ -14,7 +14,7 @@ describe('ConversationService', () => {
   let originalOAuthToken: string | undefined
 
   beforeEach(async () => {
-    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'cc-haha-conversation-service-'))
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'bingo-conversation-service-'))
     originalConfigDir = process.env.CLAUDE_CONFIG_DIR
     originalAuthToken = process.env.ANTHROPIC_AUTH_TOKEN
     originalBaseUrl = process.env.ANTHROPIC_BASE_URL
@@ -56,7 +56,7 @@ describe('ConversationService', () => {
 
   test('keeps inherited provider env when no desktop provider config exists', async () => {
     const service = new ConversationService() as any
-    const env = (await service.buildChildEnv('D:\\workspace\\code\\myself_code\\cc-haha')) as Record<string, string>
+    const env = (await service.buildChildEnv('D:\\workspace\\code\\myself_code\\bingo')) as Record<string, string>
 
     expect(env.ANTHROPIC_AUTH_TOKEN).toBe('test-token')
     expect(env.ANTHROPIC_BASE_URL).toBe('https://example.invalid/anthropic')
@@ -64,7 +64,7 @@ describe('ConversationService', () => {
   })
 
   test('strips inherited provider env when desktop provider config exists', async () => {
-    const ccHahaDir = path.join(tmpDir, 'cc-haha')
+    const ccHahaDir = path.join(tmpDir, 'bingo')
     await fs.mkdir(ccHahaDir, { recursive: true })
     await fs.writeFile(
       path.join(ccHahaDir, 'providers.json'),
@@ -73,7 +73,7 @@ describe('ConversationService', () => {
     )
 
     const service = new ConversationService() as any
-    const env = (await service.buildChildEnv('D:\\workspace\\code\\myself_code\\cc-haha')) as Record<string, string>
+    const env = (await service.buildChildEnv('D:\\workspace\\code\\myself_code\\bingo')) as Record<string, string>
 
     expect(env.ANTHROPIC_AUTH_TOKEN).toBeUndefined()
     expect(env.ANTHROPIC_BASE_URL).toBeUndefined()
@@ -81,7 +81,7 @@ describe('ConversationService', () => {
   })
 
   test('buildChildEnv injects CLAUDE_CODE_OAUTH_TOKEN when official mode + haha oauth token exists', async () => {
-    const ccHahaDir = path.join(tmpDir, 'cc-haha')
+    const ccHahaDir = path.join(tmpDir, 'bingo')
     await fs.mkdir(ccHahaDir, { recursive: true })
     await fs.writeFile(
       path.join(ccHahaDir, 'settings.json'),
@@ -106,7 +106,7 @@ describe('ConversationService', () => {
   })
 
   test('buildChildEnv does NOT inject CLAUDE_CODE_OAUTH_TOKEN when not official mode', async () => {
-    const ccHahaDir = path.join(tmpDir, 'cc-haha')
+    const ccHahaDir = path.join(tmpDir, 'bingo')
     await fs.mkdir(ccHahaDir, { recursive: true })
     await fs.writeFile(
       path.join(ccHahaDir, 'settings.json'),
@@ -131,7 +131,7 @@ describe('ConversationService', () => {
   })
 
   test('buildChildEnv does not leak inherited CLAUDE_CODE_OAUTH_TOKEN when official token is unavailable', async () => {
-    const ccHahaDir = path.join(tmpDir, 'cc-haha')
+    const ccHahaDir = path.join(tmpDir, 'bingo')
     await fs.mkdir(ccHahaDir, { recursive: true })
     await fs.writeFile(
       path.join(ccHahaDir, 'settings.json'),

package/src/server/__tests__/haha-oauth-service.test.ts

@@ -49,7 +49,7 @@ describe('HahaOAuthService — file storage', () => {
     }
     await service.saveTokens(tokens)
 
-    const oauthPath = path.join(tmpDir, 'cc-haha', 'oauth.json')
+    const oauthPath = path.join(tmpDir, 'bingo', 'oauth.json')
     const stat = await fs.stat(oauthPath)
     expect(stat.mode & 0o777).toBe(0o600)
 

package/src/server/__tests__/providers-real.test.ts

@@ -1,7 +1,7 @@
 /**
  * 用真实的 Provider 配置测试 ProviderService
- * 验证添加、激活、cc-haha/settings.json 同步是否正确
- * (provider env 写到 ~/.claude/cc-haha/settings.json，不污染原版 settings.json)
+ * 验证添加、激活、bingo/settings.json 同步是否正确
+ * (provider env 写到 ~/.claude/bingo/settings.json，不污染原版 settings.json)
  */
 
 import { describe, test, expect, beforeEach, afterEach } from 'bun:test'
@@ -34,7 +34,7 @@ describe('Real Provider Configs', () => {
 
   // Helper: read the Haha-specific settings file
   async function readCcHahaSettings(): Promise<Record<string, unknown>> {
-    const raw = await fs.readFile(path.join(tmpDir, 'cc-haha', 'settings.json'), 'utf-8')
+    const raw = await fs.readFile(path.join(tmpDir, 'bingo', 'settings.json'), 'utf-8')
     return JSON.parse(raw)
   }
 
@@ -48,7 +48,7 @@ describe('Real Provider Configs', () => {
     }
   }
 
-  test('添加 MiniMax Provider 并激活 — 写入 cc-haha/settings.json', async () => {
+  test('添加 MiniMax Provider 并激活 — 写入 bingo/settings.json', async () => {
     const minimax = await service.addProvider({
       presetId: 'minimax',
       name: 'MiniMax',
@@ -63,7 +63,7 @@ describe('Real Provider Configs', () => {
     // 激活 provider
     await service.activateProvider(minimax.id)
 
-    // 验证写入 cc-haha/settings.json
+    // 验证写入 bingo/settings.json
     const settings = await readCcHahaSettings()
     expect((settings.env as Record<string, string>).ANTHROPIC_BASE_URL).toBe('https://api.minimaxi.com/anthropic')
     expect((settings.env as Record<string, string>).ANTHROPIC_AUTH_TOKEN).toBe('sk-fake-test-key-for-testing-only')
@@ -72,10 +72,10 @@ describe('Real Provider Configs', () => {
     // 验证原版 settings.json 没有被创建
     expect(await originalSettingsExists()).toBe(false)
 
-    console.log('✅ Provider 写入 cc-haha/settings.json，原版 settings.json 未被污染')
+    console.log('✅ Provider 写入 bingo/settings.json，原版 settings.json 未被污染')
   })
 
-  test('切换 Provider — 更新 cc-haha/settings.json', async () => {
+  test('切换 Provider — 更新 bingo/settings.json', async () => {
     const minimax = await service.addProvider({
       presetId: 'minimax',
       name: 'MiniMax',
@@ -116,14 +116,14 @@ describe('Real Provider Configs', () => {
     // 原版 settings.json 依然不存在
     expect(await originalSettingsExists()).toBe(false)
 
-    console.log('✅ 切换 Provider 成功，cc-haha/settings.json 更新正确')
+    console.log('✅ 切换 Provider 成功，bingo/settings.json 更新正确')
   })
 
-  test('cc-haha/settings.json 保留已有字段', async () => {
-    // 预写一个有内容的 cc-haha/settings.json（模拟用户已有配置）
-    await fs.mkdir(path.join(tmpDir, 'cc-haha'), { recursive: true })
+  test('bingo/settings.json 保留已有字段', async () => {
+    // 预写一个有内容的 bingo/settings.json（模拟用户已有配置）
+    await fs.mkdir(path.join(tmpDir, 'bingo'), { recursive: true })
     await fs.writeFile(
-      path.join(tmpDir, 'cc-haha', 'settings.json'),
+      path.join(tmpDir, 'bingo', 'settings.json'),
       JSON.stringify({
         customField: 'should_be_preserved',
         env: {
@@ -157,7 +157,7 @@ describe('Real Provider Configs', () => {
     expect(settings.customField).toBe('should_be_preserved')
     expect((settings.env as Record<string, string>).EXISTING_VAR).toBe('should_be_preserved')
 
-    console.log('✅ cc-haha/settings.json 已有字段全部保留')
+    console.log('✅ bingo/settings.json 已有字段全部保留')
   })
 
   test('activateOfficial 清除 provider env', async () => {
@@ -205,7 +205,7 @@ describe('Real Provider Configs', () => {
     console.log('   error:', result.connectivity.error)
   })
 
-  test('providers.json 和 cc-haha/settings.json 独立于 settings.json', async () => {
+  test('providers.json 和 bingo/settings.json 独立于 settings.json', async () => {
     // 模拟原版 Claude Code 的 settings.json 已存在
     await fs.writeFile(
       path.join(tmpDir, 'settings.json'),
@@ -234,7 +234,7 @@ describe('Real Provider Configs', () => {
     expect((original.env as Record<string, string>).ANTHROPIC_AUTH_TOKEN).toBe('original-key')
     expect(original.effortLevel).toBe('high')
 
-    // 验证 cc-haha/settings.json 是 Haha 自己的
+    // 验证 bingo/settings.json 是 Haha 自己的
     const haha = await readCcHahaSettings()
     expect((haha.env as Record<string, string>).ANTHROPIC_BASE_URL).toBe('https://api.minimaxi.com/anthropic')
     expect((haha.env as Record<string, string>).ANTHROPIC_AUTH_TOKEN).toBe('sk-haha-key')

package/src/server/api/computer-use.ts

@@ -109,7 +109,7 @@ const DEFAULT_CONFIG: ComputerUseConfig = {
   grantFlags: { clipboardRead: true, clipboardWrite: true, systemKeyCombos: true },
 }
 
-const configPath = join(claudeHome, 'cc-haha', 'computer-use-config.json')
+const configPath = join(claudeHome, 'bingo', 'computer-use-config.json')
 
 //@C:ID=F.CU.getRequirementsPath;K=F;V=1.0;P=Get path to requirements file;D=System;M=ComputerUse;S=Paths;In=void;Out=string
 // Paths that resolve correctly in both dev and bundled modes
@@ -393,7 +393,7 @@ async function runSetup(): Promise<SetupResult> {
 
 //@C:ID=F.CU.loadConfig;K=F;V=1.0;P=Load computer use configuration;D=API;M=ComputerUse;S=Authorization;In=void;Out=Promise<ComputerUseConfig>
 // ============================================================================
-// Authorized Apps configuration — stored in ~/.claude/cc-haha/computer-use-config.json
+// Authorized Apps configuration — stored in ~/.claude/bingo/computer-use-config.json
 // ============================================================================
 async function loadConfig(): Promise<ComputerUseConfig> {
   console.log("F.CU.loadConfig");

package/src/server/api/providers.ts

@@ -81,8 +81,12 @@ export async function handleProvidersApi(
       const parsed = SlotNameSchema.safeParse(action)
       if (!parsed.success) throw ApiError.badRequest(`Invalid slot name: ${action}. Must be one of main, haiku, sonnet, opus`)
       const body = await parseJsonBody(req)
-      // body can be { providerId, modelId } or null
-      const entry = body === null ? null : { providerId: String(body.providerId), modelId: String(body.modelId) }
+      // body can be { providerId, modelId, label } or null
+      const entry = body === null ? null : {
+        providerId: String(body.providerId),
+        modelId: String(body.modelId),
+        label: body.label ? String(body.label) : null,
+      }
       const result = await providerService.setSlot(parsed.data as SlotName, entry)
       return Response.json(result)
     }

package/src/server/cli/listProviders.ts

@@ -4,7 +4,7 @@ import os from 'os'
 
 // 统一读取与服务端一致的 providers.json 位置
 const home = process.env.CLAUDE_CONFIG_DIR || os.homedir();
-const configPath = path.resolve(home, '.claude', 'cc-haha', 'providers.json')
+const configPath = path.resolve(home, '.claude', 'bingo', 'providers.json')
 
 async function main() {
   try {

package/src/server/cli/providerManager.ts

@@ -6,7 +6,7 @@ import { ProvidersIndex, SavedProvider, CreateProviderInput, UpdateProviderInput
 
 // 统一与服务端一致的 provider 存储路径
 const home = process.env.CLAUDE_CONFIG_DIR || os.homedir();
-const PROVIDERS_PATH = path.resolve(home, '.claude', 'cc-haha', 'providers.json');
+const PROVIDERS_PATH = path.resolve(home, '.claude', 'bingo', 'providers.json');
 
 export class ProviderManager {
   static async load(): Promise<ProvidersIndex> {