bingocode 1.1.131 → 1.1.133

package/.claude/settings.local.json

@@ -1,10 +1,10 @@
 {
   "permissions": {
     "allow": [
+      "Read(//c/Users/qi.lin/.claude/**)",
       "Bash(dir \"F:\\\\Leanchy\\\\VirtuosAgent\\\\BingoCode\\\\src\\\\server\\\\proxy\")",
-      "Bash(dir \"F:\\\\Leanchy\\\\VirtuosAgent\\\\BingoCode\\\\src\\\\server\")",
-      "Bash(grep -rn \"stream\\\\|proxy\\\\|SSE\\\\|duplicate\\\\|repeat\\\\|render\" F:LeanchyVirtuosAgentBingoCodesrc --include=*.ts -l)",
-      "Bash(xargs grep:*)"
+      "Bash(ls src/**/)",
+      "Bash(cat config/*.json)"
     ]
   }
 }

package/package.json

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

package/src/manager/CliMenuManager.tsx

@@ -78,34 +78,46 @@ const TOP_H_COMPACT = Number(process.env.CLI_TOP_H_COMPACT || 3);
 // Bottom bar height
 const BOTTOM_H = Number(process.env.CLI_BOTTOM_H || 3);
 
+const LANG_OPTIONS = [
+  { label: 'English', value: 'en' as const },
+  { label: '中文',    value: 'zh' as const },
+  { label: '日本語',  value: 'ja' as const },
+];
+
 const i18nMap = {
-    zh: {
-      menu: {
-        newSession: 'New Session',
-        history: 'History',
-        provider: 'API Config',
-        settings: 'Settings',
-        about: 'About',
-        exit: 'Exit',
-      },
-      about: 'Bingo CLI - Version Info & About',
-      aboutContent: [
-        'Bingo is an AI assistant terminal client.',
-        '1. API Config: Press "P" or select "API Config" to set up your keys.',
-        '2. Model Slots: Configure specific models in the Provider panel.',
-        '3. Background Service: Bingo runs a local server to manage sessions.',
-        '4. Start Chat: Run `bingocode` or `claude` in any terminal to start.',
-      ].join('\n'),
-      aboutFooter: 'Author: leanchy (leanchy07@outlook.com)  ·  github.com/leanchy/bingo-claude-code-offline-installer',
-      mark: '→ Mark Session',
-      unmark: '→ Unmark Session',
-      tipsSimple: 'L Lang | ESC Back | ←→ Menu | ↩ Enter | ? Help',
-      noData: 'No data',
-      emptyHistory: 'Nothing here yet. Start a new session?',
-      deleting: 'Delete this session? (Irreversible)',
-      historyHint: 'Enter to open · j next · k first · q back',
-      helpTitle: 'Shortcuts',
+  zh: {
+    menu: {
+      newSession: '新建会话',
+      history: '会话历史',
+      provider: 'API 配置',
+      settings: '设置',
+      about: '关于',
+      exit: '退出',
     },
+    about: 'Bingo CLI 终端 - 版本信息与关于',
+    aboutContent: [
+      'Bingo 是一款 AI 助手终端客户端。',
+      '1. API 配置：按 "P" 或选择「API 配置」来设置你的密钥。',
+      '2. 模型槽：在 Provider 面板中配置各模型。',
+      '3. 后台服务：Bingo 会运行一个本地服务器来管理会话。',
+      '4. 开始聊天：在任意终端中运行 `bingocode` 或 `claude`。',
+    ].join('\n'),
+    aboutFooter: '作者: leanchy (leanchy07@outlook.com)  ·  github.com/leanchy/bingo-claude-code-offline-installer',
+    mark: '→ 标记会话',
+    unmark: '→ 取消标记',
+    tipsSimple: 'L 语言 | ESC 返回 | ←→ 菜单 | ↩ 确认 | ? 帮助',
+    noData: '暂无数据',
+    emptyHistory: '还没有会话，要新建一个吗？',
+    deleting: '确定删除此会话？（不可恢复）',
+    historyHint: '↩ 打开 · j 下一页 · k 首页 · q 返回',
+    helpTitle: '快捷键',
+    // Settings page
+    settingsTitle: '设置',
+    langLabel: '语言',
+    langPickerTitle: '选择语言',
+    settingsHint: '↑/k ↓/j 滚动 · ↩ 编辑 · ESC 返回',
+    langOptions: LANG_OPTIONS,
+  },
   en: {
     menu: {
       newSession: 'New Session',
@@ -132,7 +144,46 @@ const i18nMap = {
     deleting: 'Delete this session? (Irreversible)',
     historyHint: 'Enter to open · j next · k first · q back',
     helpTitle: 'Shortcuts',
-  }
+    // Settings page
+    settingsTitle: 'Settings',
+    langLabel: 'Language',
+    langPickerTitle: 'Select Language',
+    settingsHint: '↑/k ↓/j scroll · ↩ edit · ESC back',
+    langOptions: LANG_OPTIONS,
+  },
+  ja: {
+    menu: {
+      newSession: '新規セッション',
+      history: 'セッション履歴',
+      provider: 'API設定',
+      settings: '設定',
+      about: 'について',
+      exit: '終了',
+    },
+    about: 'Bingo CLI ターミナル - バージョン情報',
+    aboutContent: [
+      'BingoはAIアシスタントのターミナルクライアントです。',
+      '1. API設定: "P"キーまたは「API設定」を選択してキーを設定。',
+      '2. モデルスロット: Providerパネルで各モデルを設定。',
+      '3. バックグラウンドサービス: セッション管理用ローカルサーバーを起動。',
+      '4. チャット開始: 任意のターミナルで `bingocode` または `claude` を実行。',
+    ].join('\n'),
+    aboutFooter: '作者: leanchy (leanchy07@outlook.com)  ·  github.com/leanchy/bingo-claude-code-offline-installer',
+    mark: '→ セッションをマーク',
+    unmark: '→ マークを解除',
+    tipsSimple: 'L 言語 | ESC 戻る | ←→ メニュー | ↩ 決定 | ? ヘルプ',
+    noData: 'データなし',
+    emptyHistory: 'まだセッションがありません。新規作成しますか？',
+    deleting: 'このセッションを削除しますか？（元に戻せません）',
+    historyHint: '↩ 開く · j 次へ · k 最初へ · q 戻る',
+    helpTitle: 'ショートカット',
+    // Settings page
+    settingsTitle: '設定',
+    langLabel: '言語',
+    langPickerTitle: '言語を選択',
+    settingsHint: '↑/k ↓/j スクロール · ↩ 編集 · ESC 戻る',
+    langOptions: LANG_OPTIONS,
+  },
 };
 
 const menuKeys = [
@@ -243,7 +294,7 @@ export const CliMenuManager: React.FC = () => {
     if (configReady) {
       try {
         const cfg = getGlobalConfig();
-        if (cfg.language && (cfg.language === 'en' || cfg.language === 'zh')) {
+        if (cfg.language && (cfg.language === 'en' || cfg.language === 'zh' || cfg.language === 'ja')) {
           setLang(cfg.language as Lang);
         }
       } catch (e) {
@@ -294,6 +345,8 @@ export const CliMenuManager: React.FC = () => {
   const [settingData, setSettingData] = useState<any>(null);
   const [loadingSetting, setLoadingSetting] = useState(false);
   const [setErr, setSetErr] = useState<string | null>(null);
+  const [settingsStage, setSettingsStage] = useState<'list' | 'langPicker'>('list');
+  const [settingsCursor, setSettingsCursor] = useState(0);
 
   // Top toolbar state
   const [animEnabled, setAnimEnabled] = useState(true);
@@ -373,6 +426,8 @@ export const CliMenuManager: React.FC = () => {
     }
     if (page !== 'settings') {
       setSettingsOffset(0);
+      setSettingsStage('list');
+      setSettingsCursor(0);
     }
     // Close help overlay
     setShowHelp(false);
@@ -515,9 +570,10 @@ export const CliMenuManager: React.FC = () => {
 
   // Keyboard interactions
   useInput((input, key) => {
-    // Language toggle
+    // Language toggle (en → zh → ja → en)
     if (input === 'l' || input === 'L') {
-      const nextLang = lang === 'zh' ? 'en' : 'zh';
+      const langOrder: Lang[] = ['en', 'zh', 'ja'];
+      const nextLang = langOrder[(langOrder.indexOf(lang) + 1) % langOrder.length];
       setLang(nextLang);
       try {
         const cfg = getGlobalConfig();
@@ -563,6 +619,10 @@ export const CliMenuManager: React.FC = () => {
     if (key.escape) {
       if (showHelp) { setShowHelp(false); return; }
       if (page === 'provider') return; // Handled internally
+      // Settings: langPicker → back to list; list → back to main menu
+      if (page === 'settings') {
+        if (settingsStage === 'langPicker') { setSettingsStage('list'); return; }
+      }
       setPage(null);
       setHistoryMenuStage('list');
       setSelectedHistory(null);
@@ -670,18 +730,30 @@ export const CliMenuManager: React.FC = () => {
       }
     }
 
-    // Settings scrolling
-    if (!showHelp && page === 'settings' && settingData && typeof settingData === 'object') {
-      const total = Object.keys(settingData).length;
-      const visible = Math.max(1, MID_H - 1);
-      if (key.downArrow || input === 'j') {
-        setSettingsOffset(o => Math.min(Math.max(0, total - visible), o + 1));
-      }
-      if (key.upArrow || input === 'k') {
-        setSettingsOffset(o => Math.max(0, o - 1));
+    // Settings interactions
+    if (!showHelp && page === 'settings') {
+      if (settingsStage === 'list') {
+        // +1 for the fixed Language row prepended before settingData entries
+        const totalRows = 1 + (settingData && typeof settingData === 'object' ? Object.keys(settingData).length : 0);
+        const visible = Math.max(1, MID_H - 2);
+        if (key.downArrow || input === 'j') {
+          setSettingsCursor(c => Math.min(totalRows - 1, c + 1));
+          setSettingsOffset(o => Math.min(Math.max(0, totalRows - visible), o + 1));
+        }
+        if (key.upArrow || input === 'k') {
+          setSettingsCursor(c => Math.max(0, c - 1));
+          setSettingsOffset(o => Math.max(0, o - 1));
+        }
+        if (key.return) {
+          // Row 0 is the interactive Language row
+          if (settingsCursor === 0) {
+            setSettingsStage('langPicker');
+          }
+        }
       }
+      // langPicker stage: ESC handled above; selection via SelectInput onSelect
     }
-  }, [menuItems, page, historyMenuStage, historyList, historyHasMore, navIndex, sessionMessages, settingData, MID_H, MSGS_PAGE_SIZE, showHelp, theme]);
+  }, [menuItems, page, historyMenuStage, historyList, historyHasMore, navIndex, sessionMessages, settingData, MID_H, MSGS_PAGE_SIZE, showHelp, theme, settingsStage, settingsCursor]);
 
   function cleanText(text: string): string {
     return String(text ?? '').replace(/[\n\r]+/g, ' ').replace(/\u001b\[[0-9;]*m/g, '').trim();
@@ -915,7 +987,7 @@ export const CliMenuManager: React.FC = () => {
         <Text color="cyan">R</Text><Text>  Quick Resume</Text>
         <Text color="cyan">P</Text><Text>  Open Provider Config</Text>
         <Text color="cyan">G</Text><Text>  Toggle Theme (light/dark/highContrast)</Text>
-        <Text color="cyan">L</Text><Text>  Toggle Language (en/zh)</Text>
+        <Text color="cyan">L</Text><Text>  Toggle Language (en → zh → ja)</Text>
         <Text color="cyan">O</Text><Text>  Toggle Top Animation</Text>
         <Text color="cyan">T</Text><Text>  Toggle Top Tips</Text>
         <Text color="cyan">?</Text><Text>  Toggle Help</Text>
@@ -1130,18 +1202,84 @@ export const CliMenuManager: React.FC = () => {
     if (page === 'settings') {
       if (loadingSetting) return <StateDisplay type="loading" message="Loading settings..." />;
       if (setErr) return <StateDisplay type="error" message={setErr} />;
-      if (!settingData || typeof settingData !== 'object') return <StateDisplay type="empty" message="No settings found" />;
-      const entries = Object.entries(settingData);
-      const visible = Math.max(1, MID_H - 1);
-      const start = Math.min(settingsOffset, Math.max(0, entries.length - visible));
-      const sliced = entries.slice(start, start + visible);
+
+      const tS = i18nMap[lang];
+      const currentLangLabel = LANG_OPTIONS.find(o => o.value === lang)?.label ?? lang;
+
+      // --- langPicker sub-menu ---
+      if (settingsStage === 'langPicker') {
+        return (
+          <Box width={VIEW_W} height={MID_H} flexDirection="column">
+            <Box paddingX={1} marginBottom={1}>
+              <Text color="magenta" bold>{tS.langPickerTitle}</Text>
+            </Box>
+            <Box paddingX={2} flexGrow={1} flexDirection="column">
+              <SelectInput
+                items={tS.langOptions}
+                initialIndex={tS.langOptions.findIndex(o => o.value === lang)}
+                onSelect={(item: { label: string; value: Lang }) => {
+                  setLang(item.value);
+                  try {
+                    const cfg = getGlobalConfig();
+                    cfg.language = item.value;
+                    saveGlobalConfig(cfg);
+                  } catch {}
+                  setSettingsStage('list');
+                }}
+              />
+            </Box>
+            <Box paddingX={1}>
+              <Hint>↩ confirm · ESC back</Hint>
+            </Box>
+          </Box>
+        );
+      }
+
+      // --- settings list ---
+      type SettingRow = { key: string; label: string; value: string; interactive: boolean };
+      const fixedRows: SettingRow[] = [
+        { key: '__lang', label: tS.langLabel, value: currentLangLabel, interactive: true },
+      ];
+      const dataEntries = settingData && typeof settingData === 'object' ? Object.entries(settingData) : [];
+      const dataRows: SettingRow[] = dataEntries.map(([k, v]) => ({
+        key: k,
+        label: k,
+        value: typeof v === 'object' ? JSON.stringify(v) : String(v),
+        interactive: false,
+      }));
+      const allRows: SettingRow[] = [...fixedRows, ...dataRows];
+      const visible = Math.max(1, MID_H - 2);
+      const start = Math.min(settingsOffset, Math.max(0, allRows.length - visible));
+      const sliced = allRows.slice(start, start + visible);
+
       return (
         <Box width={VIEW_W} height={MID_H} flexDirection="column">
-          <ScrollBar total={entries.length} offset={start} height={visible - 1} />
-          {sliced.map(([k, v]) => <Text key={k}>{k}: {typeof v === 'object' ? JSON.stringify(v) : String(v)}</Text>)}
-          <Hint>
-            ↑/k and ↓/j scroll · {start+1}-{Math.min(start+visible, entries.length)}/{entries.length}
-          </Hint>
+          <Box flexDirection="row" position="relative" flexGrow={1}>
+            <Box flexDirection="column" flexGrow={1} paddingX={1} overflow="hidden">
+              {sliced.map((row, idx) => {
+                const absIdx = start + idx;
+                const isCursor = absIdx === settingsCursor;
+                const prefix = isCursor ? '>' : ' ';
+                const labelColor = isCursor ? 'cyan' : (row.interactive ? 'white' : 'gray');
+                const valueColor = row.interactive ? 'green' : undefined;
+                return (
+                  <Box key={row.key} height={1}>
+                    <Text color={labelColor}>
+                      {prefix} {row.label}:{'  '}
+                      <Text color={valueColor ?? (isCursor ? 'white' : 'gray')}>
+                        {row.value}
+                        {row.interactive ? '  ↩' : ''}
+                      </Text>
+                    </Text>
+                  </Box>
+                );
+              })}
+            </Box>
+            <ScrollBar total={allRows.length} offset={start} height={visible - 1} />
+          </Box>
+          <Box paddingX={1}>
+            <Hint>{tS.settingsHint}  ·  {start + 1}-{Math.min(start + visible, allRows.length)}/{allRows.length}</Hint>
+          </Box>
         </Box>
       );
     }

package/src/server/proxy/streaming/openaiChatStreamToAnthropic.ts

@@ -298,20 +298,40 @@ function extractReasoning(delta: DeltaEx): { thinking: string; signature: string
   return null
 }
 
-// ─── Main chunk processing ─────────────────────────────────
-
 /**
- * Process a single SSE chunk using dual-pass logic:
- *   Pass 1 — reasoning/thinking (if present)
- *   Pass 2 — text content (if present)
- *   Pass 3 — tool calls (if present; mutually exclusive with text/thinking)
- *
- * This avoids the single-return priority chain that caused spurious
- * close/open cycles when providers (Gemini via OpenRouter, DeepSeek, Qwen3, …)
- * send reasoning_content and content in the same chunk or in alternating chunks,
- * which previously produced multiple text content_block_start events and
- * duplicate rendering in Claude Code's Ink terminal UI.
+ * Determine what block type this chunk carries and whether it's a new block.
+ * Priority (matches LiteLLM): tool_calls > text > reasoning > ignore
  */
+function detectBlockTransition(
+  delta: DeltaEx,
+  state: StreamState,
+): { type: ContentBlockType; isNew: boolean } | null {
+  // Priority 1: Tool calls
+  if (delta.tool_calls && delta.tool_calls.length > 0) {
+    const tc = delta.tool_calls[0]
+    // A tool call with function.name signals a NEW tool block
+    const isNew = state.currentBlockType !== 'tool_use' || !!(tc.function?.name)
+    return { type: 'tool_use', isNew }
+  }
+
+  // Priority 2: Text content
+  if (delta.content != null && delta.content !== '') {
+    const isNew = state.currentBlockType !== 'text' || !state.blockStartSent
+    return { type: 'text', isNew }
+  }
+
+  // Priority 3: Reasoning/thinking
+  const reasoning = extractReasoning(delta)
+  if (reasoning) {
+    const isNew = state.currentBlockType !== 'thinking' || !state.blockStartSent
+    return { type: 'thinking', isNew }
+  }
+
+  return null
+}
+
+// ─── Main chunk processing ─────────────────────────────────
+
 function processChunk(chunk: OpenAIChatStreamChunk, state: StreamState): void {
   const choice = chunk.choices?.[0]
 
@@ -330,33 +350,31 @@ function processChunk(chunk: OpenAIChatStreamChunk, state: StreamState): void {
 
   const delta = choice.delta as DeltaEx
 
-  // Tool calls are mutually exclusive with text/thinking — handle separately
-  if (delta.tool_calls && delta.tool_calls.length > 0) {
-    // Close any open text/thinking block before entering tool_use
-    if (state.currentBlockType !== 'tool_use' && state.blockStartSent && !state.blockStopSent) {
-      closeCurrentBlock(state)
-    }
-    handleToolCalls(delta, state)
-  } else {
-    // Pass 1: reasoning/thinking
-    const reasoning = extractReasoning(delta)
-    if (reasoning) {
-      // If currently in a text block, close it before opening thinking
-      if (state.currentBlockType === 'text' && state.blockStartSent && !state.blockStopSent) {
+  // Detect what this chunk carries
+  const transition = detectBlockTransition(delta, state)
+
+  if (transition) {
+    // Handle block transition: close previous block if type changed
+    if (transition.isNew && state.blockStartSent && !state.blockStopSent) {
+      if (transition.type !== 'tool_use') {
+        // For text/thinking, close the current block
+        closeCurrentBlock(state)
+      } else if (state.currentBlockType !== 'tool_use') {
+        // Switching TO tool_use from text/thinking: close current
         closeCurrentBlock(state)
       }
-      handleThinking(delta, state)
     }
 
-    // Pass 2: text content
-    // After thinking is handled, resume/open text block independently.
-    // This is the key fix: text is NOT skipped when reasoning was also present.
-    if (delta.content != null && delta.content !== '') {
-      // If currently in a thinking block, close it before opening text
-      if (state.currentBlockType === 'thinking' && state.blockStartSent && !state.blockStopSent) {
-        closeCurrentBlock(state)
-      }
-      handleText(delta, state)
+    switch (transition.type) {
+      case 'thinking':
+        handleThinking(delta, state)
+        break
+      case 'text':
+        handleText(delta, state)
+        break
+      case 'tool_use':
+        handleToolCalls(delta, state)
+        break
     }
   }
 

package/src/server/proxy/transform/anthropicToOpenaiChat.ts

@@ -45,9 +45,13 @@ export function anthropicToOpenaiChat(body: AnthropicRequest): OpenAIChatRequest
 
   // max_tokens — cap to avoid upstream 400 errors from Claude's high defaults (e.g. 64k).
   // DeepSeek: tools/thinking fail above 8192. Other providers: 32768 covers most upstreams.
+  // GPT models (gpt-*): use max_completion_tokens instead of max_tokens (required by newer GPT models).
   if (body.max_tokens !== undefined) {
-    if (body.model.toLowerCase().includes('deepseek')) {
+    const modelLower = body.model.toLowerCase()
+    if (modelLower.includes('deepseek')) {
       result.max_tokens = Math.min(body.max_tokens, 8192)
+    } else if (modelLower.startsWith('gpt-') || modelLower.startsWith('o1') || modelLower.startsWith('o3') || modelLower.startsWith('o4')) {
+      result.max_completion_tokens = body.max_tokens
     } else {
       result.max_tokens = Math.min(body.max_tokens, 32768)
     }

package/src/utils/config.ts

@@ -242,7 +242,7 @@ export type GlobalConfig = {
   hasUsedBackgroundTask?: boolean // Whether the user has backgrounded a task (Ctrl+B)
   queuedCommandUpHintCount?: number // Counter for how many times the user has seen the queued command up hint
   diffTool?: DiffTool // Which tool to use for displaying diffs (terminal or vscode)
-  language: 'en' | 'zh' // User's preferred language for CLI menus
+  language: 'en' | 'zh' | 'ja' // User's preferred language for CLI menus
 
   // Terminal setup state tracking
   iterm2SetupInProgress?: boolean