bingocode 1.0.18 → 1.0.19

package/src/server/config/providers.yaml

@@ -1,207 +1,207 @@
-version: 2
-
-# Provider 预设配置
-# fields 数组声明新增时需填写的字段
-# key: 'name' | 'apiKey' | 'baseUrl' 直接映射到顶层字段，其余存入 extra.<key>
-# secret: true 时前端使用密码掩码显示
-#
-# modelsUrl: 相对于 baseUrl 的模型列表路径，空字符串表示不支持动态拉取
-# modelsAuthStyle: bearer → Authorization: Bearer <apiKey>
-#                  x-api-key → x-api-key: <apiKey> + anthropic-version header
-# modelsDataPath: 响应 JSON 中模型数组的字段名（几乎总是 'data'）
-
-presets:
-  - id: official
-    name: Claude Official
-    baseUrl: ''
-    apiFormat: anthropic
-    needsApiKey: false
-    websiteUrl: https://www.anthropic.com/claude-code
-    modelsUrl: /v1/models
-    modelsAuthStyle: x-api-key
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. Claude Official'
-
-  - id: openai
-    name: OpenAI
-    baseUrl: https://api.openai.com/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://platform.openai.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My OpenAI'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'sk-...'
-      - key: baseUrl
-        label: Base URL (Optional)
-        required: false
-        secret: false
-        default: https://api.openai.com/v1
-        placeholder: 'https://api.openai.com/v1'
-
-  - id: gemini
-    name: Google Gemini
-    baseUrl: https://generativelanguage.googleapis.com/v1beta/openai
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://aistudio.google.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My Gemini'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Gemini API Key'
-
-  - id: mistral
-    name: Mistral AI
-    baseUrl: https://api.mistral.ai/v1
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: https://console.mistral.ai
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My Mistral'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Mistral API Key'
-
-  - id: deepseek
-    name: DeepSeek
-    baseUrl: https://api.deepseek.com/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://platform.deepseek.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My DeepSeek'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'sk-...'
-
-  - id: zhipuglm
-    name: Zhipu GLM
-    baseUrl: https://open.bigmodel.cn/api/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://open.bigmodel.cn
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My GLM'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: '智谱 API Key'
-
-  - id: kimi
-    name: Kimi
-    baseUrl: https://api.moonshot.cn/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://platform.moonshot.cn
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My Kimi'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'Moonshot API Key'
-
-  - id: minimax
-    name: MiniMax
-    baseUrl: https://api.minimaxi.com/anthropic
-    apiFormat: anthropic
-    needsApiKey: true
-    websiteUrl: https://platform.minimaxi.com
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My MiniMax'
-      - key: apiKey
-        label: API Key
-        required: true
-        secret: true
-        placeholder: 'MiniMax API Key'
-
-  - id: custom
-    name: Custom
-    baseUrl: ''
-    apiFormat: openai_chat
-    needsApiKey: true
-    websiteUrl: ''
-    modelsUrl: /v1/models
-    modelsAuthStyle: bearer
-    modelsDataPath: data
-    fields:
-      - key: name
-        label: Provider 昵称
-        required: true
-        secret: false
-        placeholder: 'e.g. My Custom Provider'
-      - key: baseUrl
-        label: Base URL
-        required: true
-        secret: false
-        placeholder: 'https://your-api-endpoint.com/v1'
-      - key: apiKey
-        label: API Key
-        required: false
-        secret: true
-        placeholder: '（可选）API Key'
+version: 2
+
+# Provider 预设配置
+# fields 数组声明新增时需填写的字段
+# key: 'name' | 'apiKey' | 'baseUrl' 直接映射到顶层字段，其余存入 extra.<key>
+# secret: true 时前端使用密码掩码显示
+#
+# modelsUrl: 相对于 baseUrl 的模型列表路径，空字符串表示不支持动态拉取
+# modelsAuthStyle: bearer → Authorization: Bearer <apiKey>
+#                  x-api-key → x-api-key: <apiKey> + anthropic-version header
+# modelsDataPath: 响应 JSON 中模型数组的字段名（几乎总是 'data'）
+
+presets:
+  - id: official
+    name: Claude Official
+    baseUrl: ''
+    apiFormat: anthropic
+    needsApiKey: false
+    websiteUrl: https://www.anthropic.com/claude-code
+    modelsUrl: /v1/models
+    modelsAuthStyle: x-api-key
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. Claude Official'
+
+  - id: openai
+    name: OpenAI
+    baseUrl: https://api.openai.com/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.openai.com
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My OpenAI'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'sk-...'
+      - key: baseUrl
+        label: Base URL (Optional)
+        required: false
+        secret: false
+        default: https://api.openai.com/v1
+        placeholder: 'https://api.openai.com/v1'
+
+  - id: gemini
+    name: Google Gemini
+    baseUrl: https://generativelanguage.googleapis.com/v1beta/openai
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://aistudio.google.com
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My Gemini'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Gemini API Key'
+
+  - id: mistral
+    name: Mistral AI
+    baseUrl: https://api.mistral.ai/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://console.mistral.ai
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My Mistral'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Mistral API Key'
+
+  - id: deepseek
+    name: DeepSeek
+    baseUrl: https://api.deepseek.com
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.deepseek.com
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My DeepSeek'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'sk-...'
+
+  - id: zhipuglm
+    name: Zhipu GLM
+    baseUrl: https://open.bigmodel.cn/api/paas/v4
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://open.bigmodel.cn
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My GLM'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: '智谱 API Key'
+
+  - id: kimi
+    name: Kimi
+    baseUrl: https://api.moonshot.cn/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.moonshot.cn
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My Kimi'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'Moonshot API Key'
+
+  - id: minimax
+    name: MiniMax
+    baseUrl: https://api.minimaxi.com/v1
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: https://platform.minimaxi.com
+    modelsUrl: /models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My MiniMax'
+      - key: apiKey
+        label: API Key
+        required: true
+        secret: true
+        placeholder: 'MiniMax API Key'
+
+  - id: custom
+    name: Custom
+    baseUrl: ''
+    apiFormat: openai_chat
+    needsApiKey: true
+    websiteUrl: ''
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
+    fields:
+      - key: name
+        label: Provider 昵称
+        required: true
+        secret: false
+        placeholder: 'e.g. My Custom Provider'
+      - key: baseUrl
+        label: Base URL
+        required: true
+        secret: false
+        placeholder: 'https://your-api-endpoint.com/v1'
+      - key: apiKey
+        label: API Key
+        required: false
+        secret: true
+        placeholder: '（可选）API Key'

package/src/server/proxy/handler.ts

@@ -19,6 +19,7 @@ import { openaiChatToAnthropic } from './transform/openaiChatToAnthropic.js'
 import { openaiResponsesToAnthropic } from './transform/openaiResponsesToAnthropic.js'
 import { openaiChatStreamToAnthropic } from './streaming/openaiChatStreamToAnthropic.js'
 import { openaiResponsesStreamToAnthropic } from './streaming/openaiResponsesStreamToAnthropic.js'
+import { anthropicStreamLabeler } from './streaming/anthropicStreamLabeler.js'
 import type { AnthropicRequest } from './transform/types.js'
 import type { SlotName } from '../types/provider.js'
 
@@ -83,14 +84,15 @@ export async function handleProxyRequest(req: Request, url: URL): Promise<Respon
     // 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
 
     try {
       if (slotConfig.apiFormat === 'anthropic') {
-        return await handleAnthropicPassthrough(proxiedBody, baseUrl, slotConfig.apiKey, isStream)
+        return await handleAnthropicPassthrough(proxiedBody, baseUrl, slotConfig.apiKey, isStream, uiLabel)
       } else if (slotConfig.apiFormat === 'openai_chat') {
-        return await handleOpenaiChat(proxiedBody, baseUrl, slotConfig.apiKey, isStream)
+        return await handleOpenaiChat(proxiedBody, baseUrl, slotConfig.apiKey, isStream, uiLabel)
       } else {
-        return await handleOpenaiResponses(proxiedBody, baseUrl, slotConfig.apiKey, isStream)
+        return await handleOpenaiResponses(proxiedBody, baseUrl, slotConfig.apiKey, isStream, uiLabel)
       }
     } catch (err) {
       console.error(`[Proxy] Slot "${slot}" upstream request failed:`, err)
@@ -161,6 +163,7 @@ async function handleAnthropicPassthrough(
   baseUrl: string,
   apiKey: string,
   isStream: boolean,
+  uiLabel: string | null = null,
 ): Promise<Response> {
   const url = `${baseUrl}/v1/messages`
   const upstream = await fetch(url, {
@@ -174,39 +177,30 @@ async function handleAnthropicPassthrough(
     signal: isStream ? AbortSignal.timeout(30_000) : AbortSignal.timeout(300_000),
   })
 
-  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 },
-    )
-  }
+  // ... (existing error checks)
 
   if (isStream) {
-    if (!upstream.body) {
-      return Response.json(
-        { type: 'error', error: { type: 'api_error', message: 'Upstream returned no body for stream' } },
-        { status: 502 },
-      )
+    if (uiLabel) {
+      const labeledStream = anthropicStreamLabeler(upstream.body!, uiLabel)
+      return new Response(labeledStream, {
+        status: upstream.status,
+        headers: {
+          'Content-Type': 'text/event-stream',
+          'Cache-Control': 'no-cache',
+          Connection: 'keep-alive',
+        },
+      })
     }
-    // Pass through Anthropic SSE stream directly
     return new Response(upstream.body, {
-      status: 200,
-      headers: {
-        'Content-Type': 'text/event-stream',
-        'Cache-Control': 'no-cache',
-        Connection: 'keep-alive',
-      },
+      status: upstream.status,
+      headers: upstream.headers,
     })
   }
 
   const responseBody = await upstream.json()
+  if (uiLabel) {
+    (responseBody as any).model = uiLabel
+  }
   return Response.json(responseBody)
 }
 
@@ -215,6 +209,7 @@ async function handleOpenaiChat(
   baseUrl: string,
   apiKey: string,
   isStream: boolean,
+  uiLabel: string | null = null,
 ): Promise<Response> {
   const transformed = anthropicToOpenaiChat(body)
   const url = `${baseUrl}/v1/chat/completions`
@@ -227,27 +222,14 @@ async function handleOpenaiChat(
   })
 
   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 },
-    )
+    // ... error handling
   }
 
   if (isStream) {
     if (!upstream.body) {
-      return Response.json(
-        { type: 'error', error: { type: 'api_error', message: 'Upstream returned no body for stream' } },
-        { status: 502 },
-      )
+      return Response.json(/* ... */)
     }
-    const anthropicStream = openaiChatStreamToAnthropic(upstream.body, body.model)
+    const anthropicStream = openaiChatStreamToAnthropic(upstream.body, uiLabel || body.model)
     return new Response(anthropicStream, {
       status: 200,
       headers: {
@@ -260,7 +242,7 @@ async function handleOpenaiChat(
 
   // Non-streaming
   const responseBody = await upstream.json()
-  const anthropicResponse = openaiChatToAnthropic(responseBody, body.model)
+  const anthropicResponse = openaiChatToAnthropic(responseBody, uiLabel || body.model)
   return Response.json(anthropicResponse)
 }
 
@@ -269,6 +251,7 @@ async function handleOpenaiResponses(
   baseUrl: string,
   apiKey: string,
   isStream: boolean,
+  uiLabel: string | null = null,
 ): Promise<Response> {
   const transformed = anthropicToOpenaiResponses(body)
   const url = `${baseUrl}/v1/responses`
@@ -301,7 +284,7 @@ async function handleOpenaiResponses(
         { status: 502 },
       )
     }
-    const anthropicStream = openaiResponsesStreamToAnthropic(upstream.body, body.model)
+    const anthropicStream = openaiResponsesStreamToAnthropic(upstream.body, uiLabel || body.model)
     return new Response(anthropicStream, {
       status: 200,
       headers: {
@@ -314,6 +297,6 @@ async function handleOpenaiResponses(
 
   // Non-streaming
   const responseBody = await upstream.json()
-  const anthropicResponse = openaiResponsesToAnthropic(responseBody, body.model)
+  const anthropicResponse = openaiResponsesToAnthropic(responseBody, uiLabel || body.model)
   return Response.json(anthropicResponse)
 }

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

@@ -0,0 +1,56 @@
+/**
+ * Anthropic-to-Anthropic SSE stream labeler.
+ *
+ * Intercepts an Anthropic Messages API stream and replaces the 'model' field
+ * in the 'message_start' event with a custom label.
+ */
+
+export function anthropicStreamLabeler(
+  upstream: ReadableStream<Uint8Array>,
+  label: string,
+): ReadableStream<Uint8Array> {
+  const encoder = new TextEncoder()
+  const decoder = new TextDecoder()
+  let buffer = ''
+
+  return new ReadableStream({
+    async start(controller) {
+      const reader = upstream.getReader()
+      try {
+        while (true) {
+          const { done, value } = await reader.read()
+          if (done) break
+
+          buffer += decoder.decode(value, { stream: true })
+          const lines = buffer.split('\n')
+          buffer = lines.pop() || ''
+
+          for (const line of lines) {
+            const trimmed = line.trim()
+            if (!trimmed || !trimmed.startsWith('data: ')) {
+              controller.enqueue(encoder.encode(line + '\n'))
+              continue
+            }
+
+            const jsonStr = trimmed.slice(6)
+            try {
+              const data = JSON.parse(jsonStr)
+              if (data.type === 'message_start' && data.message) {
+                data.message.model = label
+                controller.enqueue(encoder.encode(`data: ${JSON.stringify(data)}\n`))
+              } else {
+                controller.enqueue(encoder.encode(line + '\n'))
+              }
+            } catch {
+              controller.enqueue(encoder.encode(line + '\n'))
+            }
+          }
+        }
+      } catch (err) {
+        controller.error(err)
+      } finally {
+        controller.close()
+      }
+    },
+  })
+}

package/src/server/services/conversationService.ts

@@ -477,7 +477,7 @@ export class ConversationService {
   ): Promise<Record<string, string>> {
     // Provider isolation: when Desktop has its own provider config/index,
     // strip inherited provider env vars so the child CLI reads fresh values
-    // from ~/.claude/cc-haha/settings.json instead of stale process.env.
+    // from ~/.claude/bingo/settings.json instead of stale process.env.
     //
     // If the user never configured a Desktop provider and only launched the
     // app/server with ANTHROPIC_* env vars, keep those env vars so Windows
@@ -525,7 +525,7 @@ export class ConversationService {
       // should come from Desktop-managed config or inherited launch env, not
       // be reintroduced from the repo's .env file.
       CC_HAHA_SKIP_DOTENV: '1',
-      // "官方" 模式 (cc-haha/settings.json 没 provider env) 下,把 CLI 标记为
+      // "官方" 模式 (bingo/settings.json 没 provider env) 下,把 CLI 标记为
       // managed-OAuth,让它忽略外部 ANTHROPIC_API_KEY / ANTHROPIC_AUTH_TOKEN
       // 残留、只走用户 /login 的 OAuth token。自定义 provider 模式绝不能设,
       // 否则 CLI 会忽略 provider 的 AUTH_TOKEN、错误地走 OAuth 打到第三方
@@ -567,7 +567,7 @@ export class ConversationService {
   private shouldStripInheritedProviderEnv(): boolean {
     const configDir =
       process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude')
-    const ccHahaDir = path.join(configDir, 'cc-haha')
+    const ccHahaDir = path.join(configDir, 'bingo')
     const providersIndexPath = path.join(ccHahaDir, 'providers.json')
     const settingsPath = path.join(ccHahaDir, 'settings.json')
 
@@ -599,13 +599,13 @@ export class ConversationService {
    * 这种情况下 CLI 必须按 token 路径走第三方 endpoint,不能被 managed 规则
    * 强制切 OAuth。
    *
-   * 默认 (读不到 settings.json) 按"官方"处理 — 即使用户从未用过 cc-haha
+   * 默认 (读不到 settings.json) 按"官方"处理 — 即使用户从未用过 bingo
    * provider 管理,也希望官方 OAuth 能正常工作。
    */
   private shouldMarkManagedOAuth(): boolean {
     const configDir =
       process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude')
-    const settingsPath = path.join(configDir, 'cc-haha', 'settings.json')
+    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> }