bingocode 1.1.130 → 1.1.131

package/.claude/settings.local.json

@@ -1,20 +1,10 @@
 {
   "permissions": {
     "allow": [
-      "Bash(node:*)",
-      "WebSearch",
-      "Bash(curl -s \"https://docs.anthropic.com/en/api/messages\" --max-time 30 -A \"Mozilla/5.0\")",
-      "Bash(curl -s \"https://docs.anthropic.com/en/api/messages-streaming\" --max-time 30 -A \"Mozilla/5.0\")",
-      "Bash(curl -sv \"https://docs.anthropic.com/en/api/messages\" --max-time 30)",
-      "Bash(curl -sv \"https://raw.githubusercontent.com/anthropics/anthropic-sdk-python/main/api.md\" --max-time 30)",
-      "Bash(curl -s \"https://raw.githubusercontent.com/anthropics/anthropic-sdk-python/refs/heads/main/README.md\" --max-time 30)",
-      "Bash(findstr /i goal)",
-      "Bash(bun run:*)",
-      "Bash(bunx tsc:*)",
-      "Bash(node_modules/.bin/tsc --noEmit --skipLibCheck)",
-      "WebFetch(domain:www.npmjs.com)",
-      "Bash(npm info:*)",
-      "Bash(npm pack:*)"
+      "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:*)"
     ]
   }
 }

package/package.json

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

package/src/manager/TopToolbar.tsx

@@ -1,98 +1,98 @@
-//@C:M ID=M.UI.TopToolbar;K=M;V=1.3;P=top toolbar;D=CLI;M=cli;S=ui
-import React, { memo, useMemo } from 'react';
-import { Box, Text } from 'ink';
-import { Chip } from './CliMenuUi.tsx';
-import { useTheme } from '../components/design-system/ThemeProvider.js';
-import { getGlobalConfig } from '../utils/config.ts';
-import type { ClawdPose } from '../components/LogoV2/Clawd.tsx';
-import { Clawd } from '../components/LogoV2/Clawd.tsx';
-import { AnimatedClawd } from '../components/LogoV2/AnimatedClawd.tsx';
-
-type Props = {
-  ready: boolean;
-  page: string | null;
-  animEnabled: boolean;
-  tipsEnabled: boolean;
-  ip?: string;
-};
-
-//@C:F ID=F.UI.TopToolbar;K=F;V=1.4;P=toolbar;D=CLI;M=cli;S=ui;In=Props;Out=JSX.Element
-export const TopToolbar: React.FC<Props> = memo(({ ready, page, animEnabled, tipsEnabled, ip }) => {
-  const [theme] = useTheme();
-
-  const { version } = useMemo(() => {
-    try {
-      const cfg = getGlobalConfig();
-      return { version: (cfg as any)?.version ?? '' };
-    } catch {
-      return { version: '' };
-    }
-  }, []);
-
-  const themeLabel = String(theme || (ready ? (getGlobalConfig()?.theme ?? 'system') : '…'));
-  const uiChipValue = `Anim ${animEnabled ? 'On' : 'Off'} · Tips ${tipsEnabled ? 'On' : 'Off'}`;
-  const uiTone = (String(theme) === 'dark') ? 'accent' : (String(theme) === 'highContrast' ? 'warning' : 'info');
-
-  const clawdPose: ClawdPose = useMemo(() => {
-    if (!ready) return 'default';
-    if (page === null) return animEnabled ? 'arms-up' : 'default';
-    return tipsEnabled ? 'look-left' : 'look-right';
-  }, [ready, page, animEnabled, tipsEnabled]);
-
-  // ── Compact mode (page !== null): single line, no logo ──────────────
-  if (page !== null) {
-    return (
-      <Box flexDirection="row" alignItems="center">
-        <Text bold>Bingo Code</Text>
-        <Box marginLeft={1}>
-          <Chip label="Theme" value={themeLabel} tone="accent" />
-        </Box>
-        <Chip label="UI" value={uiChipValue} tone={uiTone as any} />
-        {ip ? (
-          <Text color="green" dimColor> · IP: {ip}</Text>
-        ) : (
-          <Text color="yellow" dimColor> · {ready ? 'Server ready' : 'Starting…'}</Text>
-        )}
-      </Box>
-    );
-  }
-
-  // ── Home mode (page === null): Clawd left + 3-row right column ───────
-  return (
-    <Box flexDirection="row" alignItems="flex-start">
-      {/* Left: Clawd sprite */}
-      <Box marginRight={2}>
-        {animEnabled ? <AnimatedClawd /> : <Clawd pose={clawdPose} />}
-      </Box>
-
-      {/* Right: 3 rows */}
-      <Box flexDirection="column">
-        {/* Row 1: brand + version + chips */}
-        <Box flexDirection="row" alignItems="center">
-          <Text bold>Welcome to Bingo Code</Text>
-          {version ? <Text dimColor> v{version}</Text> : null}
-          <Box marginLeft={1}>
-            <Chip label="Theme" value={themeLabel} tone="accent" />
-          </Box>
-          <Chip label="UI" value={uiChipValue} tone={uiTone as any} />
-        </Box>
-
-        {/* Row 2: IP / server status */}
-        <Box>
-          {ip ? (
-            <Text color="green" dimColor>IP: {ip}</Text>
-          ) : (
-            <Text color="yellow" dimColor>{ready ? 'Server ready' : 'Starting server…'}</Text>
-          )}
-        </Box>
-
-        {/* Row 3: keyboard shortcuts */}
-        <Box>
-          <Text dimColor>N New · R Resume · P Provider · G Theme · ? Help</Text>
-        </Box>
-      </Box>
-    </Box>
-  );
-});
-
-export default TopToolbar;
+//@C:M ID=M.UI.TopToolbar;K=M;V=1.3;P=top toolbar;D=CLI;M=cli;S=ui
+import React, { memo, useMemo } from 'react';
+import { Box, Text } from 'ink';
+import { Chip } from './CliMenuUi.tsx';
+import { useTheme } from '../components/design-system/ThemeProvider.js';
+import { getGlobalConfig } from '../utils/config.ts';
+import type { ClawdPose } from '../components/LogoV2/Clawd.tsx';
+import { Clawd } from '../components/LogoV2/Clawd.tsx';
+import { AnimatedClawd } from '../components/LogoV2/AnimatedClawd.tsx';
+
+type Props = {
+  ready: boolean;
+  page: string | null;
+  animEnabled: boolean;
+  tipsEnabled: boolean;
+  ip?: string;
+};
+
+//@C:F ID=F.UI.TopToolbar;K=F;V=1.4;P=toolbar;D=CLI;M=cli;S=ui;In=Props;Out=JSX.Element
+export const TopToolbar: React.FC<Props> = memo(({ ready, page, animEnabled, tipsEnabled, ip }) => {
+  const [theme] = useTheme();
+
+  const { version } = useMemo(() => {
+    try {
+      const cfg = getGlobalConfig();
+      return { version: (cfg as any)?.version ?? '' };
+    } catch {
+      return { version: '' };
+    }
+  }, []);
+
+  const themeLabel = String(theme || (ready ? (getGlobalConfig()?.theme ?? 'system') : '…'));
+  const uiChipValue = `Anim ${animEnabled ? 'On' : 'Off'} · Tips ${tipsEnabled ? 'On' : 'Off'}`;
+  const uiTone = (String(theme) === 'dark') ? 'accent' : (String(theme) === 'highContrast' ? 'warning' : 'info');
+
+  const clawdPose: ClawdPose = useMemo(() => {
+    if (!ready) return 'default';
+    if (page === null) return animEnabled ? 'arms-up' : 'default';
+    return tipsEnabled ? 'look-left' : 'look-right';
+  }, [ready, page, animEnabled, tipsEnabled]);
+
+  // ── Compact mode (page !== null): single line, no logo ──────────────
+  if (page !== null) {
+    return (
+      <Box flexDirection="row" alignItems="center">
+        <Text bold>Bingo Code</Text>
+        <Box marginLeft={1}>
+          <Chip label="Theme" value={themeLabel} tone="accent" />
+        </Box>
+        <Chip label="UI" value={uiChipValue} tone={uiTone as any} />
+        {ip ? (
+          <Text color="green" dimColor> · IP: {ip}</Text>
+        ) : (
+          <Text color="yellow" dimColor> · {ready ? 'Server ready' : 'Starting…'}</Text>
+        )}
+      </Box>
+    );
+  }
+
+  // ── Home mode (page === null): Clawd left + 3-row right column ───────
+  return (
+    <Box flexDirection="row" alignItems="flex-start">
+      {/* Left: Clawd sprite */}
+      <Box marginRight={2}>
+        {animEnabled ? <AnimatedClawd /> : <Clawd pose={clawdPose} />}
+      </Box>
+
+      {/* Right: 3 rows */}
+      <Box flexDirection="column">
+        {/* Row 1: brand + version + chips */}
+        <Box flexDirection="row" alignItems="center">
+          <Text bold>Welcome to Bingo Code</Text>
+          {version ? <Text dimColor> v{version}</Text> : null}
+          <Box marginLeft={1}>
+            <Chip label="Theme" value={themeLabel} tone="accent" />
+          </Box>
+          <Chip label="UI" value={uiChipValue} tone={uiTone as any} />
+        </Box>
+
+        {/* Row 2: IP / server status */}
+        <Box>
+          {ip ? (
+            <Text color="green" dimColor>IP: {ip}</Text>
+          ) : (
+            <Text color="yellow" dimColor>{ready ? 'Server ready' : 'Starting server…'}</Text>
+          )}
+        </Box>
+
+        {/* Row 3: keyboard shortcuts */}
+        <Box>
+          <Text dimColor>N New · R Resume · P Provider · G Theme · ? Help</Text>
+        </Box>
+      </Box>
+    </Box>
+  );
+});
+
+export default TopToolbar;

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

@@ -298,40 +298,20 @@ function extractReasoning(delta: DeltaEx): { thinking: string; signature: string
   return null
 }
 
-/**
- * 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 ─────────────────────────────────
 
+/**
+ * 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.
+ */
 function processChunk(chunk: OpenAIChatStreamChunk, state: StreamState): void {
   const choice = chunk.choices?.[0]
 
@@ -350,31 +330,33 @@ function processChunk(chunk: OpenAIChatStreamChunk, state: StreamState): void {
 
   const delta = choice.delta as DeltaEx
 
-  // 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
+  // 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) {
         closeCurrentBlock(state)
       }
+      handleThinking(delta, state)
     }
 
-    switch (transition.type) {
-      case 'thinking':
-        handleThinking(delta, state)
-        break
-      case 'text':
-        handleText(delta, state)
-        break
-      case 'tool_use':
-        handleToolCalls(delta, state)
-        break
+    // 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)
     }
   }