bingocode 1.0.18 → 1.0.20

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> }

package/src/server/services/hahaOAuthService.ts

@@ -71,7 +71,7 @@ export class HahaOAuthService {
   private getOAuthFilePath(): string {
     const configDir =
       process.env.CLAUDE_CONFIG_DIR || path.join(os.homedir(), '.claude')
-    return path.join(configDir, 'cc-haha', 'oauth.json')
+    return path.join(configDir, 'bingo', 'oauth.json')
   }
 
   async loadTokens(): Promise<StoredOAuthTokens | null> {

package/src/server/services/providerManager.ts

@@ -6,7 +6,7 @@ import { loadPresets, applyPreset } from '../config/providerPresets.ts';
 import axios from 'axios';
 
 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> {

package/src/server/services/providerService.ts

@@ -1,8 +1,8 @@
 /**
  * Provider Service — preset-based provider configuration
  *
- * Storage: ~/.claude/cc-haha/providers.json (lightweight index)
- * Active provider env vars written to ~/.claude/cc-haha/settings.json
+ * Storage: ~/.claude/bingo/providers.json (lightweight index)
+ * Active provider env vars written to ~/.claude/bingo/settings.json
  * (isolated from the original Claude Code's ~/.claude/settings.json)
  */
 
@@ -58,7 +58,7 @@ export class ProviderService {
   }
 
   private getCcHahaDir(): string {
-    return path.join(this.getConfigDir(), 'cc-haha')
+    return path.join(this.getConfigDir(), 'bingo')
   }
 
   private getIndexPath(): string {
@@ -267,22 +267,22 @@ export class ProviderService {
 
   /**
    * Check whether any usable auth exists:
-   *  1. A cc-haha provider is active → has auth
+   *  1. A bingo provider is active → has auth
    *  2. Original ~/.claude/settings.json has ANTHROPIC_AUTH_TOKEN or ANTHROPIC_API_KEY → has auth
    *  3. process.env already has ANTHROPIC_API_KEY / ANTHROPIC_AUTH_TOKEN → has auth
    *  4. None of the above → needs setup
    */
   async checkAuthStatus(): Promise<{
     hasAuth: boolean
-    source: 'cc-haha-provider' | 'original-settings' | 'env' | 'none'
+    source: 'bingo-provider' | 'original-settings' | 'env' | 'none'
     activeProvider?: string
   }> {
-    // 1. Check cc-haha active provider
+    // 1. Check bingo active provider
     const index = await this.readIndex()
     if (index.activeId) {
       const provider = index.providers.find(p => p.id === index.activeId)
       if (provider?.apiKey) {
-        return { hasAuth: true, source: 'cc-haha-provider', activeProvider: provider.name }
+        return { hasAuth: true, source: 'bingo-provider', activeProvider: provider.name }
       }
     }
 
@@ -364,6 +364,7 @@ export class ProviderService {
     apiKey: string
     apiFormat: ApiFormat
     modelId: string
+    label?: string | null
   } | null> {
     const slots = await this.readSlots()
     const entry = slots[slotName]
@@ -376,6 +377,7 @@ export class ProviderService {
       apiKey: provider.apiKey,
       apiFormat: provider.apiFormat ?? 'anthropic',
       modelId: entry.modelId,
+      label: entry.label,
     }
   }
 
@@ -384,7 +386,12 @@ export class ProviderService {
     const preset = PROVIDER_PRESETS.find(p => p.id === provider.presetId)
 
     const base = provider.baseUrl.replace(/\/+$/, '')
-    if (!base) return []
+    if (!base && provider.presetId !== 'official') return []
+
+    // Special case for Official
+    if (provider.presetId === 'official') {
+      return ['claude-3-5-sonnet-20241022', 'claude-3-5-haiku-20241022', 'claude-3-opus-20240229', 'claude-3-sonnet-20240229', 'claude-3-haiku-20240307']
+    }
 
     const modelsUrl = preset?.modelsUrl || '/v1/models'
     const url = `${base}${modelsUrl}`
@@ -402,9 +409,10 @@ export class ProviderService {
     }
 
     try {
-      const directOpts = getDirectFetchOptions()
-      const res = await fetch(url, { headers, signal: AbortSignal.timeout(10000), ...directOpts })
+      const fetchOpts = getProxyFetchOptions()
+      const res = await fetch(url, { headers, signal: AbortSignal.timeout(10000), ...fetchOpts })
       if (!res.ok) {
+        console.error(`[ProviderService] Failed to fetch models from ${url}: ${res.status}`)
         return []
       }
       const data = await res.json() as any
@@ -412,7 +420,8 @@ export class ProviderService {
       const list = data[dataPath] ?? data.data ?? data.models ?? []
       if (!Array.isArray(list)) return []
       return list.map((m: any) => (typeof m === 'string' ? m : m.id)).filter(Boolean)
-    } catch {
+    } catch (err) {
+      console.error(`[ProviderService] Error fetching models from ${url}:`, err)
       return []
     }
   }
@@ -425,9 +434,17 @@ export class ProviderService {
   ): Promise<ProviderTestResult> {
     const provider = await this.getProvider(id)
     const baseUrl = overrides?.baseUrl || provider.baseUrl
-    const modelId = overrides?.modelId || provider.models.main
     const apiFormat = overrides?.apiFormat ?? provider.apiFormat ?? 'anthropic'
 
+    // If no modelId provided, try to fetch from provider or use preset default
+    let modelId = overrides?.modelId || provider.models.main
+    if (!modelId || modelId === 'auto' || modelId.startsWith('claude-')) {
+       const fetched = await this.fetchProviderModels(id).catch(() => [])
+       if (fetched.length > 0) {
+         modelId = fetched[0] // Use first available model for testing
+       }
+    }
+
     if (!baseUrl || !provider.apiKey) {
       return { connectivity: { success: false, latencyMs: 0, error: 'Missing baseUrl or apiKey' } }
     }
@@ -474,6 +491,7 @@ export class ProviderService {
     const start = Date.now()
     try {
       const { url, headers, body } = buildDirectTestRequest(base, apiKey, modelId, format)
+      // 使用 getDirectFetchOptions 以绕开系统代理，测试直接连接
       const directOpts = getDirectFetchOptions()
       const response = await fetch(url, {
         method: 'POST',
@@ -538,13 +556,13 @@ export class ProviderService {
       }
 
       // Call upstream with transformed request
-      const directOpts = getDirectFetchOptions()
+      const fetchOpts = getProxyFetchOptions()
       const response = await fetch(upstreamUrl, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${apiKey}` },
         body: JSON.stringify(transformedBody),
         signal: AbortSignal.timeout(30000),
-        ...directOpts,
+        ...fetchOpts,
       })
 
       if (!response.ok) {

package/src/server/types/provider.ts

@@ -82,6 +82,7 @@ export type SlotName = z.infer<typeof SlotNameSchema>
 export const SlotEntrySchema = z.object({
   providerId: z.string(),
   modelId: z.string(),
+  label: z.string().nullable().optional(), // Display name for UI
 }).nullable()
 export type SlotEntry = z.infer<typeof SlotEntrySchema>
 

package/src/utils/computerUse/wrapper.tsx

@@ -263,7 +263,7 @@ async function runDesktopPermissionDialog(
 }
 
 /**
- * Load pre-authorized apps from ~/.claude/cc-haha/computer-use-config.json.
+ * Load pre-authorized apps from ~/.claude/bingo/computer-use-config.json.
  * Called once when the binding is first created. Pre-authorized apps
  * are injected into appState so `getAllowedApps()` returns them
  * immediately — no runtime permission dialog needed.
@@ -272,7 +272,7 @@ async function loadPreAuthorizedApps(): Promise<void> {
   try {
     const configPath = join(
       process.env.CLAUDE_CONFIG_DIR ?? join(homedir(), '.claude'),
-      'cc-haha',
+      'bingo',
       'computer-use-config.json',
     )
     const raw = await readFile(configPath, 'utf8')

package/src/utils/config.ts

@@ -1344,11 +1344,17 @@ export function enableConfigs(): void {
   // to prevent us from adding config reading during module initialization
   configReadingAllowed = true
   // We only check the global config because currently all the configs share a file
-  getConfig(
-    getGlobalClaudeFile(),
-    createDefaultGlobalConfig,
-    true /* throw on invalid */,
-  )
+  try {
+    getConfig(
+      getGlobalClaudeFile(),
+      createDefaultGlobalConfig,
+      true /* throw on invalid */,
+    )
+  } catch (e) {
+    logForDebugging(`Failed to load config during enableConfigs: ${e}`, { level: 'error' })
+    // If it's a corrupted file, we allow the boostrap to continue with defaults
+    // instead of hard-crashing the process.
+  }
 
   logForDiagnosticsNoPII('info', 'enable_configs_completed', {
     duration_ms: Date.now() - startTime,

package/src/utils/managedEnv.ts

@@ -98,15 +98,23 @@ function filterSettingsEnv(
  * contains ANTHROPIC_BASE_URL, ANTHROPIC_AUTH_TOKEN, model defaults, etc.
  * Returns an empty object if the file doesn't exist or is invalid.
  */
-function getCcHahaSettingsEnv(): Record<string, string> {
-  try {
-    const bingoSettings = join(getClaudeConfigHomeDir(), 'bingo', 'settings.json')
-    const raw = readFileSync(bingoSettings, 'utf-8')
-    const parsed = JSON.parse(raw) as { env?: Record<string, string> }
-    return parsed.env ?? {}
-  } catch {
-    return {}
+function getBingoSettingsEnv(): Record<string, string> {
+  const configDir = getClaudeConfigHomeDir()
+  const paths = [
+    join(configDir, 'bingo', 'settings.json'),
+    join(configDir, 'cc-haha', 'settings.json'), // Fallback for migration
+  ]
+
+  for (const settingsPath of paths) {
+    try {
+      const raw = readFileSync(settingsPath, 'utf-8')
+      const parsed = JSON.parse(raw) as { env?: Record<string, string> }
+      if (parsed.env) return parsed.env
+    } catch {
+      continue
+    }
   }
+  return {}
 }
 
 /**
@@ -167,11 +175,11 @@ export function applySafeConfigEnvironmentVariables(): void {
     )
   }
 
-  // cc-haha provider isolation: apply env from ~/.claude/cc-haha/settings.json
-  // AFTER userSettings so Haha-specific provider config takes priority over
-  // the original Claude Code's settings. This prevents Haha from polluting
+  // bingo provider isolation: apply env from ~/.claude/bingo/settings.json
+  // AFTER userSettings so Bingo-specific provider config takes priority over
+  // the original Claude Code's settings. This prevents Bingo from polluting
   // ~/.claude/settings.json while still allowing it to override provider vars.
-  Object.assign(process.env, filterSettingsEnv(getCcHahaSettingsEnv()))
+  Object.assign(process.env, filterSettingsEnv(getBingoSettingsEnv()))
 
   // Compute remote-managed-settings eligibility now, with userSettings and
   // flagSettings env applied. Eligibility reads CLAUDE_CODE_USE_BEDROCK,
@@ -214,9 +222,9 @@ export function applyConfigEnvironmentVariables(): void {
 
   Object.assign(process.env, filterSettingsEnv(getSettings_DEPRECATED()?.env))
 
-  // cc-haha provider isolation: same as in applySafeConfigEnvironmentVariables,
-  // apply Haha-specific env last so it overrides the original settings.
-  Object.assign(process.env, filterSettingsEnv(getCcHahaSettingsEnv()))
+  // bingo provider isolation: same as in applySafeConfigEnvironmentVariables,
+  // apply Bingo-specific env last so it overrides the original settings.
+  Object.assign(process.env, filterSettingsEnv(getBingoSettingsEnv()))
 
   // Clear caches so agents are rebuilt with the new env vars
   clearCACertsCache()

package/src/utils/preflightChecks.tsx

@@ -202,7 +202,7 @@ export function PreflightStep(t0) {
 
 //@C:ID=F.PC._temp;K=F;V=1.0;P=Helper function for process exit;D=UI;M=Connectivity;S=Utility;In=void;Out=void
 function _temp() {
-  console.log("F.PC._temp");
-  
-  return process.exit(1);
+  console.log("F.PC._temp: Skipping force exit on connectivity failure.");
+
+  // return process.exit(1);
 }

package/src/utils/proxy.ts

@@ -334,14 +334,26 @@ export function getDirectFetchOptions(): {
     return { ...base, proxy: undefined, ...getTLSFetchOptions() }
   }
 
+  // Check if system proxy exists
+  const proxyUrl = getProxyUrl()
+  if (!proxyUrl) {
+    // No proxy configured, just return normal fetch options
+    return { ...base, ...getTLSFetchOptions() }
+  }
+
   // In Node.js/undici, a fresh Agent with no proxy settings bypasses system defaults
   // eslint-disable-next-line @typescript-eslint/no-require-imports
   const undiciMod = require('undici') as typeof undici
   const tlsOpts = getTLSFetchOptions()
 
+  // Use the global dispatcher's options if possible, or fresh default options
+  const agentOptions = tlsOpts.dispatcher && 'options' in (tlsOpts.dispatcher as any)
+    ? (tlsOpts.dispatcher as any).options
+    : {}
+
   return {
     ...base,
-    dispatcher: new undiciMod.Agent(tlsOpts.dispatcher ? (tlsOpts.dispatcher as any).options : {}),
+    dispatcher: new undiciMod.Agent(agentOptions),
   }
 }