bingocode 1.0.20 → 1.0.22

package/src/server/services/providerService.ts

@@ -409,8 +409,8 @@ export class ProviderService {
     }
 
     try {
-      const fetchOpts = getProxyFetchOptions()
-      const res = await fetch(url, { headers, signal: AbortSignal.timeout(10000), ...fetchOpts })
+      const directOpts = getDirectFetchOptions()
+      const res = await fetch(url, { headers, signal: AbortSignal.timeout(10000), ...directOpts })
       if (!res.ok) {
         console.error(`[ProviderService] Failed to fetch models from ${url}: ${res.status}`)
         return []
@@ -438,11 +438,26 @@ export class ProviderService {
 
     // 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
-       }
+    const needsAutoDetect =
+      !modelId ||
+      modelId === 'auto' ||
+      (apiFormat !== 'anthropic' && modelId.startsWith('claude-'))
+    if (needsAutoDetect) {
+      const fetched = await this.fetchProviderModels(id).catch(() => [])
+      if (fetched.length > 0) {
+        modelId = fetched[0] // Use first available model for testing
+      }
+    }
+
+    // 兜底：如果仍然没有有效的 modelId，直接返回有意义的错误
+    if (!modelId) {
+      return {
+        connectivity: {
+          success: false,
+          latencyMs: 0,
+          error: '无法确定测试用模型：models.main 为空且自动拉取模型列表失败。请先在槽位配置中选择模型，或检查 API Key 和网络连接。',
+        },
+      }
     }
 
     if (!baseUrl || !provider.apiKey) {
@@ -491,7 +506,6 @@ 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',
@@ -556,13 +570,13 @@ export class ProviderService {
       }
 
       // Call upstream with transformed request
-      const fetchOpts = getProxyFetchOptions()
+      const directOpts = getDirectFetchOptions()
       const response = await fetch(upstreamUrl, {
         method: 'POST',
         headers: { 'Content-Type': 'application/json', Authorization: `Bearer ${apiKey}` },
         body: JSON.stringify(transformedBody),
         signal: AbortSignal.timeout(30000),
-        ...fetchOpts,
+        ...directOpts,
       })
 
       if (!response.ok) {

package/src/utils/auth.ts

@@ -88,7 +88,7 @@ const DEFAULT_API_KEY_HELPER_TTL = 5 * 60 * 1000
  * who runs `claude` in their terminal with an API key sees every CCD session
  * also use that key — and fail if it's stale/wrong-org.
  */
-function isManagedOAuthContext(): boolean {
+export function isManagedOAuthContext(): boolean {
   return (
     isEnvTruthy(process.env.CLAUDE_CODE_REMOTE) ||
     process.env.CLAUDE_CODE_ENTRYPOINT === 'claude-desktop'

package/src/utils/config.ts

@@ -1344,17 +1344,11 @@ 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
-  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.
-  }
+  getConfig(
+    getGlobalClaudeFile(),
+    createDefaultGlobalConfig,
+    true /* throw on invalid */,
+  )
 
   logForDiagnosticsNoPII('info', 'enable_configs_completed', {
     duration_ms: Date.now() - startTime,

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: Skipping force exit on connectivity failure.");
-
-  // return process.exit(1);
+  console.log("F.PC._temp");
+  
+  return process.exit(1);
 }

package/src/utils/proxy.ts

@@ -334,26 +334,14 @@ 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(agentOptions),
+    dispatcher: new undiciMod.Agent(tlsOpts.dispatcher ? (tlsOpts.dispatcher as any).options : {}),
   }
 }
 

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

@@ -1,56 +0,0 @@
-/**
- * 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()
-      }
-    },
-  })
-}