bingocode 1.1.200 → 1.1.202-beta.1

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

@@ -1,220 +1,220 @@
-/**
- * Request transformation: Anthropic Messages → OpenAI Chat Completions
- * Derived from cc-switch (https://github.com/farion1231/cc-switch)
- * Original work by Jason Young, MIT License
- */
-
-import type {
-  AnthropicRequest,
-  AnthropicContentBlock,
-  AnthropicMessage,
-  OpenAIChatRequest,
-  OpenAIChatMessage,
-  OpenAIChatContentPart,
-  OpenAIToolCall,
-  OpenAITool,
-} from './types.js'
-
-/**
- * Convert Anthropic Messages request to OpenAI Chat Completions request.
- */
-export function anthropicToOpenaiChat(body: AnthropicRequest): OpenAIChatRequest {
-  const messages: OpenAIChatMessage[] = []
-
-  // Convert system prompt
-  if (body.system) {
-    if (typeof body.system === 'string') {
-      messages.push({ role: 'system', content: body.system })
-    } else if (Array.isArray(body.system)) {
-      const text = body.system.map((b) => b.text).join('\n')
-      messages.push({ role: 'system', content: text })
-    }
-  }
-
-  // Convert messages
-  for (const msg of body.messages) {
-    convertMessage(msg, messages, body.model)
-  }
-
-  // Build request
-  const result: OpenAIChatRequest = {
-    model: body.model,
-    messages,
-    stream: body.stream,
-  }
-
-  // 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) {
-    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)
-    }
-  }
-
-  // temperature & top_p
-  if (body.temperature !== undefined) result.temperature = body.temperature
-  if (body.top_p !== undefined) result.top_p = body.top_p
-
-  // frequency_penalty: suppress repetition loops during multi-tool-call sequences.
-  // Anthropic API has no equivalent; inject for all OpenAI-compatible upstreams.
-  // Configurable via BINGO_FREQUENCY_PENALTY (default 0.1).
-  const fp = parseFloat(process.env.BINGO_FREQUENCY_PENALTY ?? '0.1')
-  if (!isNaN(fp) && fp !== 0) result.frequency_penalty = fp
-
-  // stop_sequences → stop
-  if (body.stop_sequences && body.stop_sequences.length > 0) {
-    result.stop = body.stop_sequences
-  }
-
-  // tools
-  if (body.tools && body.tools.length > 0) {
-    result.tools = body.tools
-      .filter((t) => t.name !== 'BatchTool')
-      .map((t): OpenAITool => ({
-        type: 'function',
-        function: {
-          name: t.name,
-          description: t.description,
-          parameters: t.input_schema,
-        },
-      }))
-  }
-
-  // tool_choice
-  if (body.tool_choice !== undefined) {
-    result.tool_choice = convertToolChoice(body.tool_choice)
-  }
-
-  // thinking → reasoning_effort
-  if (body.thinking) {
-    const budget = body.thinking.budget_tokens
-    if (budget !== undefined) {
-      if (budget <= 1024) result.reasoning_effort = 'low'
-      else if (budget <= 8192) result.reasoning_effort = 'medium'
-      else result.reasoning_effort = 'high'
-    } else if (body.thinking.type === 'enabled') {
-      result.reasoning_effort = 'high'
-    }
-  }
-
-  return result
-}
-
-function convertMessage(msg: AnthropicMessage, output: OpenAIChatMessage[], model: string = ''): void {
-  const content = msg.content
-
-  // Simple string content
-  if (typeof content === 'string') {
-    output.push({ role: msg.role, content })
-    return
-  }
-
-  // Array content blocks
-  if (!Array.isArray(content) || content.length === 0) {
-    output.push({ role: msg.role, content: '' })
-    return
-  }
-
-  if (msg.role === 'user') {
-    convertUserMessage(content, output)
-  } else {
-    convertAssistantMessage(content, output, model)
-  }
-}
-
-function convertUserMessage(blocks: AnthropicContentBlock[], output: OpenAIChatMessage[]): void {
-  // Separate tool_result blocks from other content
-  const contentParts: OpenAIChatContentPart[] = []
-
-  for (const block of blocks) {
-    if (block.type === 'text') {
-      contentParts.push({ type: 'text', text: block.text })
-    } else if (block.type === 'image') {
-      const url = `data:${block.source.media_type};base64,${block.source.data}`
-      contentParts.push({ type: 'image_url', image_url: { url } })
-    } else if (block.type === 'tool_result') {
-      // tool_result → separate tool message
-      const rawContent = typeof block.content === 'string'
-        ? block.content
-        : Array.isArray(block.content)
-          ? block.content.filter((b): b is Extract<AnthropicContentBlock, { type: 'text' }> => b.type === 'text').map((b) => b.text).join('\n')
-          : ''
-      const resultContent = block.is_error
-        ? `<error>${rawContent}</error>`
-        : rawContent
-      output.push({
-        role: 'tool',
-        tool_call_id: block.tool_use_id,
-        content: resultContent,
-      })
-    }
-  }
-
-  if (contentParts.length > 0) {
-    output.push({
-      role: 'user',
-      content: contentParts.length === 1 && contentParts[0].type === 'text'
-        ? contentParts[0].text
-        : contentParts,
-    })
-  }
-}
-
-function convertAssistantMessage(blocks: AnthropicContentBlock[], output: OpenAIChatMessage[], model: string = ''): void {
-  let textContent = ''
-  let reasoningContent = ''
-  const toolCalls: OpenAIToolCall[] = []
-
-  for (const block of blocks) {
-    if (block.type === 'text') {
-      textContent += block.text
-    } else if (block.type === 'thinking') {
-      reasoningContent += block.thinking
-    } else if (block.type === 'tool_use') {
-      toolCalls.push({
-        id: block.id,
-        type: 'function',
-        function: {
-          name: block.name,
-          arguments: typeof block.input === 'string' ? block.input : JSON.stringify(block.input),
-        },
-      })
-    }
-  }
-
-  const msg: OpenAIChatMessage = {
-    role: 'assistant',
-    content: textContent || null,
-  }
-
-  // Only pass reasoning_content back for DeepSeek models to satisfy their mandatory back-transmission rule
-  if (reasoningContent && model.toLowerCase().includes('deepseek')) {
-    (msg as any).reasoning_content = reasoningContent
-  }
-
-  if (toolCalls.length > 0) {
-    msg.tool_calls = toolCalls
-  }
-
-  output.push(msg)
-}
-
-function convertToolChoice(choice: unknown): unknown {
-  if (typeof choice === 'string') return choice
-  if (typeof choice === 'object' && choice !== null) {
-    const c = choice as Record<string, unknown>
-    if (c.type === 'auto') return 'auto'
-    if (c.type === 'any') return 'required'
-    if (c.type === 'none') return 'none'
-    if (c.type === 'tool' && typeof c.name === 'string') {
-      return { type: 'function', function: { name: c.name } }
-    }
-  }
-  return 'auto'
-}
+/**
+ * Request transformation: Anthropic Messages → OpenAI Chat Completions
+ * Derived from cc-switch (https://github.com/farion1231/cc-switch)
+ * Original work by Jason Young, MIT License
+ */
+
+import type {
+  AnthropicRequest,
+  AnthropicContentBlock,
+  AnthropicMessage,
+  OpenAIChatRequest,
+  OpenAIChatMessage,
+  OpenAIChatContentPart,
+  OpenAIToolCall,
+  OpenAITool,
+} from './types.js'
+
+/**
+ * Convert Anthropic Messages request to OpenAI Chat Completions request.
+ */
+export function anthropicToOpenaiChat(body: AnthropicRequest): OpenAIChatRequest {
+  const messages: OpenAIChatMessage[] = []
+
+  // Convert system prompt
+  if (body.system) {
+    if (typeof body.system === 'string') {
+      messages.push({ role: 'system', content: body.system })
+    } else if (Array.isArray(body.system)) {
+      const text = body.system.map((b) => b.text).join('\n')
+      messages.push({ role: 'system', content: text })
+    }
+  }
+
+  // Convert messages
+  for (const msg of body.messages) {
+    convertMessage(msg, messages, body.model)
+  }
+
+  // Build request
+  const result: OpenAIChatRequest = {
+    model: body.model,
+    messages,
+    stream: body.stream,
+  }
+
+  // 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) {
+    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)
+    }
+  }
+
+  // temperature & top_p
+  if (body.temperature !== undefined) result.temperature = body.temperature
+  if (body.top_p !== undefined) result.top_p = body.top_p
+
+  // frequency_penalty: suppress repetition loops during multi-tool-call sequences.
+  // Anthropic API has no equivalent; inject for all OpenAI-compatible upstreams.
+  // Configurable via BINGO_FREQUENCY_PENALTY (default 0, opt-in).
+  const fp = parseFloat(process.env.BINGO_FREQUENCY_PENALTY ?? '0')
+  if (!isNaN(fp) && fp !== 0) result.frequency_penalty = fp
+
+  // stop_sequences → stop
+  if (body.stop_sequences && body.stop_sequences.length > 0) {
+    result.stop = body.stop_sequences
+  }
+
+  // tools
+  if (body.tools && body.tools.length > 0) {
+    result.tools = body.tools
+      .filter((t) => t.name !== 'BatchTool')
+      .map((t): OpenAITool => ({
+        type: 'function',
+        function: {
+          name: t.name,
+          description: t.description,
+          parameters: t.input_schema,
+        },
+      }))
+  }
+
+  // tool_choice
+  if (body.tool_choice !== undefined) {
+    result.tool_choice = convertToolChoice(body.tool_choice)
+  }
+
+  // thinking → reasoning_effort
+  if (body.thinking) {
+    const budget = body.thinking.budget_tokens
+    if (budget !== undefined) {
+      if (budget <= 1024) result.reasoning_effort = 'low'
+      else if (budget <= 8192) result.reasoning_effort = 'medium'
+      else result.reasoning_effort = 'high'
+    } else if (body.thinking.type === 'enabled') {
+      result.reasoning_effort = 'high'
+    }
+  }
+
+  return result
+}
+
+function convertMessage(msg: AnthropicMessage, output: OpenAIChatMessage[], model: string = ''): void {
+  const content = msg.content
+
+  // Simple string content
+  if (typeof content === 'string') {
+    output.push({ role: msg.role, content })
+    return
+  }
+
+  // Array content blocks
+  if (!Array.isArray(content) || content.length === 0) {
+    output.push({ role: msg.role, content: '' })
+    return
+  }
+
+  if (msg.role === 'user') {
+    convertUserMessage(content, output)
+  } else {
+    convertAssistantMessage(content, output, model)
+  }
+}
+
+function convertUserMessage(blocks: AnthropicContentBlock[], output: OpenAIChatMessage[]): void {
+  // Separate tool_result blocks from other content
+  const contentParts: OpenAIChatContentPart[] = []
+
+  for (const block of blocks) {
+    if (block.type === 'text') {
+      contentParts.push({ type: 'text', text: block.text })
+    } else if (block.type === 'image') {
+      const url = `data:${block.source.media_type};base64,${block.source.data}`
+      contentParts.push({ type: 'image_url', image_url: { url } })
+    } else if (block.type === 'tool_result') {
+      // tool_result → separate tool message
+      const rawContent = typeof block.content === 'string'
+        ? block.content
+        : Array.isArray(block.content)
+          ? block.content.filter((b): b is Extract<AnthropicContentBlock, { type: 'text' }> => b.type === 'text').map((b) => b.text).join('\n')
+          : ''
+      const resultContent = block.is_error
+        ? `<error>${rawContent}</error>`
+        : rawContent
+      output.push({
+        role: 'tool',
+        tool_call_id: block.tool_use_id,
+        content: resultContent,
+      })
+    }
+  }
+
+  if (contentParts.length > 0) {
+    output.push({
+      role: 'user',
+      content: contentParts.length === 1 && contentParts[0].type === 'text'
+        ? contentParts[0].text
+        : contentParts,
+    })
+  }
+}
+
+function convertAssistantMessage(blocks: AnthropicContentBlock[], output: OpenAIChatMessage[], model: string = ''): void {
+  let textContent = ''
+  let reasoningContent = ''
+  const toolCalls: OpenAIToolCall[] = []
+
+  for (const block of blocks) {
+    if (block.type === 'text') {
+      textContent += block.text
+    } else if (block.type === 'thinking') {
+      reasoningContent += block.thinking
+    } else if (block.type === 'tool_use') {
+      toolCalls.push({
+        id: block.id,
+        type: 'function',
+        function: {
+          name: block.name,
+          arguments: typeof block.input === 'string' ? block.input : JSON.stringify(block.input),
+        },
+      })
+    }
+  }
+
+  const msg: OpenAIChatMessage = {
+    role: 'assistant',
+    content: textContent || null,
+  }
+
+  // Only pass reasoning_content back for DeepSeek models to satisfy their mandatory back-transmission rule
+  if (reasoningContent && model.toLowerCase().includes('deepseek')) {
+    (msg as any).reasoning_content = reasoningContent
+  }
+
+  if (toolCalls.length > 0) {
+    msg.tool_calls = toolCalls
+  }
+
+  output.push(msg)
+}
+
+function convertToolChoice(choice: unknown): unknown {
+  if (typeof choice === 'string') return choice
+  if (typeof choice === 'object' && choice !== null) {
+    const c = choice as Record<string, unknown>
+    if (c.type === 'auto') return 'auto'
+    if (c.type === 'any') return 'required'
+    if (c.type === 'none') return 'none'
+    if (c.type === 'tool' && typeof c.name === 'string') {
+      return { type: 'function', function: { name: c.name } }
+    }
+  }
+  return 'auto'
+}

package/src/server/services/providerService.ts

@@ -9,6 +9,7 @@
 import * as fs from 'fs/promises'
 import * as path from 'path'
 import * as os from 'os'
+import { parse as parseJsonc } from 'jsonc-parser/lib/esm/main.js'
 import { getDirectFetchOptions } from '../../utils/proxy.ts'
 import { ApiError } from '../middleware/errorHandler.js'
 import { anthropicToOpenaiChat } from '../proxy/transform/anthropicToOpenaiChat.js'
@@ -268,6 +269,18 @@ export class ProviderService {
   // --- Settings sync ---
 
   private async syncToSettings(provider: SavedProvider): Promise<void> {
+    // Prefer slot-based model IDs when slots are configured, so that the
+    // slot table (set via "Configure Model Slots" in the TUI) is the single
+    // source of truth.  Falling back to provider.models only when no slots
+    // exist keeps things working for users who haven't configured slots yet.
+    const slots = await this.readSlots()
+    const hasSlots = Object.keys(slots).length > 0
+    if (hasSlots) {
+      await this.syncSettingsForSlots(slots)
+      return
+    }
+
+    // Legacy fallback: no slots configured — use provider.models directly
     const settings = await this.readSettings()
     const existingEnv = (settings.env as Record<string, string>) || {}
 
@@ -620,7 +633,9 @@ export class ProviderService {
       let originalContent: string | null = null
       try {
         originalContent = await fs.readFile(settingsPath, "utf-8")
-        settings = JSON.parse(originalContent)
+        // VS Code settings.json uses JSONC (JSON with comments) —
+        // parseJsonc handles comments/trailing commas, unlike JSON.parse
+        settings = parseJsonc(originalContent) as Record<string, unknown>
       } catch {
         // File does not exist yet — start fresh
       }
@@ -650,7 +665,9 @@ export class ProviderService {
 
       try {
         await fs.mkdir(path.dirname(settingsPath), { recursive: true })
-        await fs.writeFile(settingsPath, JSON.stringify(settings, null, 4) + '\n')
+        const tmpPath = `${settingsPath}.tmp.${Date.now()}`
+        await fs.writeFile(tmpPath, JSON.stringify(settings, null, 4) + '\n')
+        await fs.rename(tmpPath, settingsPath)
         writtenPaths.push(settingsPath)
       } catch (err) {
         failedPaths.push(settingsPath)
@@ -661,7 +678,9 @@ export class ProviderService {
         // Fix #11: Attempt restore from backup on write failure
         if (originalContent !== null) {
           try {
-            await fs.writeFile(settingsPath, originalContent, "utf-8")
+            const tmpPath2 = `${settingsPath}.tmp.${Date.now()}`
+            await fs.writeFile(tmpPath2, originalContent, "utf-8")
+            await fs.rename(tmpPath2, settingsPath)
             console.error(`[ProviderService] Restored ${settingsPath} from in-memory copy after write failure`)
           } catch {
             // In-memory restore failed, try .bak file
@@ -694,7 +713,9 @@ export class ProviderService {
         const original = originalContents.get(p)
         try {
           if (original !== null) {
-            await fs.writeFile(p, original, "utf-8")
+            const tmpPath = `${p}.tmp.${Date.now()}`
+            await fs.writeFile(tmpPath, original, "utf-8")
+            await fs.rename(tmpPath, p)
           } else {
             await fs.unlink(p).catch(() => {})
           }
@@ -754,14 +775,16 @@ export class ProviderService {
     for (const settingsPath of linkedPaths) {
       try {
         const raw = await fs.readFile(settingsPath, "utf-8")
-        const settings = JSON.parse(raw)
+        const settings = parseJsonc(raw) as Record<string, unknown>
         settings.claudeCode = preLinkClaudeCode[settingsPath] ?? {
           preferredLocation: "panel",
           environmentVariables: [
             { name: "ANTHROPIC_BASE_URL", value: "https://api.anthropic.com" },
           ],
         }
-        await fs.writeFile(settingsPath, JSON.stringify(settings, null, 4) + '\n')
+        const tmpPath = `${settingsPath}.tmp.${Date.now()}`
+        await fs.writeFile(tmpPath, JSON.stringify(settings, null, 4) + '\n')
+        await fs.rename(tmpPath, settingsPath)
       } catch {
         // File may have been moved or deleted since linking — harmless
       }