bingocode 1.0.15 → 1.0.16

package/package.json

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

package/src/cli/ProviderPanel.tsx

@@ -19,6 +19,7 @@ type Provider = {
   baseUrl?: string;
   notes?: string;
   isCurrent?: boolean;
+  models?: { main: string; haiku: string; sonnet: string; opus: string };
 };
 
 type Preset = {
@@ -30,7 +31,6 @@ type Preset = {
   apiFormat?: string;
   needsApiKey?: boolean;
   websiteUrl?: string;
-  defaultModels?: { main: string; haiku: string; sonnet: string; opus: string };
   fields?: ProviderField[];
 };
 
@@ -38,7 +38,6 @@ type Stage =
   | 'list'
   | 'add_select_preset'
   | 'add_input_fields'
-  | 'switch'
   | 'test_select'
   | 'delete_select'
   | 'delete_confirm'
@@ -87,7 +86,7 @@ export const ProviderPanel: React.FC<{
   const [slotTable, setSlotTable] = useState<Record<string, SlotEntry>>({});
   const [slotProviderModels, setSlotProviderModels] = useState<Record<string, string[]>>({});
   const [currentSlotName, setCurrentSlotName] = useState<string>('main');
-  const [slotLoadingMsg, setSlotLoadingMsg] = useState('');
+  const [slotLoadingMsg, setSlotLoadingMsg] = useState<string>('');
 
   const base = apiUrl.replace(/\/+$/, '');
 
@@ -104,8 +103,9 @@ export const ProviderPanel: React.FC<{
     return { list, currentId: cur };
   };
 
-  const loadProviders = useCallback(async () => {
-    setLoading(true); setErr(null);
+  const loadProviders = useCallback(async (opts?: { keepError?: boolean }) => {
+    setLoading(true);
+    if (!opts?.keepError) setErr(null);
     try {
       const res = await axios.get(`${base}/api/providers`);
       const { list, currentId } = parseListResp(res.data);
@@ -171,18 +171,6 @@ export const ProviderPanel: React.FC<{
   );
 
   // Actions
-  const doSetCurrent = async (id: string) => {
-    setErr(null); setOpMsg(null);
-    try {
-      await axios.post(`${base}/api/providers/current`, { id });
-      setOpMsg(`已切换当前 Provider -> ${id}`);
-      await loadProviders();
-      setStage('list');
-    } catch (e: any) {
-      setErr(e?.response?.data?.message || e?.message || '切换失败');
-    }
-  };
-
   const doCreate = async (
     presetId: string,
     name: string,
@@ -193,17 +181,16 @@ export const ProviderPanel: React.FC<{
     setStage('creating');
     setErr(null); setOpMsg(null);
     try {
-      // 从预设补全 baseUrl 和 models（前端填的 baseUrl 优先）
+      // 从预设补全 baseUrl（前端填的 baseUrl 优先）；models 全部留空，后续通过槽位配置动态选择
       const preset = presets.find(p => p.id === presetId);
       const resolvedBaseUrl = baseUrl || preset?.baseUrl || '';
-      const resolvedModels = preset?.defaultModels || { main: '', haiku: '', sonnet: '', opus: '' };
 
       const body: Record<string, unknown> = {
         presetId,
         name,
         apiKey,
         baseUrl: resolvedBaseUrl,
-        models: resolvedModels,
+        models: { main: '', haiku: '', sonnet: '', opus: '' },
         ...(preset?.apiFormat && { apiFormat: preset.apiFormat }),
       };
       if (extra && Object.keys(extra).length > 0) body.extra = extra;
@@ -224,13 +211,21 @@ export const ProviderPanel: React.FC<{
     setErr(null); setOpMsg('测试中...');
     try {
       const res = await axios.post(`${base}/api/providers/${encodeURIComponent(id)}/test`);
-      const ok = res?.data?.ok ?? true;
-      setOpMsg(ok ? `连通性正常 -> ${id}` : `连通性异常 -> ${id}`);
+      const result = res?.data?.result;
+      const conn = result?.connectivity;
+      if (conn?.success) {
+        setOpMsg(`连通性正常 -> ${id} (${conn.latencyMs}ms)`);
+        setErr(null);
+      } else {
+        setErr(`连通性异常: ${conn?.error || '未知错误'}`);
+        setOpMsg(null);
+      }
     } catch (e: any) {
       setErr(e?.response?.data?.message || e?.message || `测试失败 -> ${id}`);
+      setOpMsg(null);
     } finally {
-      setStage('list');
-      await loadProviders();
+      if (stage !== 'list') setStage('list');
+      await loadProviders({ keepError: true });
     }
   };
 
@@ -290,8 +285,6 @@ export const ProviderPanel: React.FC<{
         </Text>
       )}
       {loading && <Text color="yellow">加载中...</Text>}
-      {err && <Text color="red">{err}</Text>}
-      {opMsg && <Text color="green">{opMsg}</Text>}
 
       <Box marginTop={1} flexDirection="column">
         <SelectInput
@@ -299,7 +292,6 @@ export const ProviderPanel: React.FC<{
             { label: '新增 Provider', value: 'add' },
             { label: '编辑 Provider（名称/API Key）', value: 'edit' },
             { label: '配置槽位（main/haiku/sonnet/opus）', value: 'slots' },
-            { label: '切换当前 Provider', value: 'switch' },
             { label: '连通性测试', value: 'test' },
             { label: '删除 Provider', value: 'delete' },
             { label: '刷新', value: 'refresh' },
@@ -326,9 +318,6 @@ export const ProviderPanel: React.FC<{
                   .catch(() => {});
                 setStage('slot_config');
                 break;
-              case 'switch':
-                setStage('switch');
-                break;
               case 'test':
                 setStage('test_select');
                 break;
@@ -344,6 +333,16 @@ export const ProviderPanel: React.FC<{
             }
           }}
         />
+        {err && (
+          <Box marginTop={1}>
+            <Text color="red">{err}</Text>
+          </Box>
+        )}
+        {opMsg && (
+          <Box marginTop={1}>
+            <Text color="green">{opMsg}</Text>
+          </Box>
+        )}
         <Text dimColor>提示：ESC 返回。↑↓/回车 选择操作</Text>
       </Box>
     </Box>
@@ -458,24 +457,6 @@ export const ProviderPanel: React.FC<{
     return <Text color="yellow">创建中...</Text>;
   }
 
-  if (stage === 'switch') {
-    const items = providers.map(p => ({
-      label: `${p.name || p.id}${(currentId === p.id || p.isCurrent) ? '  ← 当前' : ''}`,
-      value: p.id
-    }));
-    return (
-      <Box flexDirection="column">
-        <Text>选择要设为当前的 Provider：</Text>
-        <SelectInput
-          items={items}
-          onSelect={it => doSetCurrent(it.value as string)}
-        />
-        {err && <Text color="red">{err}</Text>}
-        <Text dimColor>ESC 返回</Text>
-      </Box>
-    );
-  }
-
   if (stage === 'test_select') {
     const items = providers.map(p => ({
       label: `${p.name || p.id}`,
@@ -641,21 +622,34 @@ export const ProviderPanel: React.FC<{
           items={[...items, { label: '← 返回主菜单', value: 'back' }]}
           onSelect={it => {
             if (it.value === 'back') { setStage('list'); setErr(null); return; }
-            setCurrentSlotName(it.value as string);
+            const slotName = it.value as string;
+            setCurrentSlotName(slotName);
             setErr(null);
-            setSlotLoadingMsg('正在获取模型列表...');
+            setSlotLoadingMsg(`正在拉取模型列表...`);
             setStage('slot_loading');
+            // Fetch model lists from each provider's API endpoint
             Promise.all(
               providers.map(p =>
                 axios.get(`${base}/api/providers/${encodeURIComponent(p.id)}/models`)
-                  .then(r => ({ id: p.id, models: (r.data as { models: string[] }).models }))
+                  .then(r => {
+                    const data = r.data;
+                    const models = Array.isArray(data) ? data : (data?.models || []);
+                    return { id: p.id, models: (models as string[]) || [] };
+                  })
                   .catch(() => ({ id: p.id, models: [] as string[] }))
               )
             ).then(results => {
               const map: Record<string, string[]> = {};
               results.forEach(r => { map[r.id] = r.models; });
               setSlotProviderModels(map);
-              setStage('slot_select_model');
+              // Check if any models available
+              const hasAny = results.some(r => r.models.length > 0);
+              if (!hasAny) {
+                setErr('所有 Provider 均未返回可用模型，请检查 API Key 和网络连接');
+                setStage('slot_config');
+              } else {
+                setStage('slot_select_model');
+              }
             });
           }}
         />
@@ -665,7 +659,12 @@ export const ProviderPanel: React.FC<{
   }
 
   if (stage === 'slot_loading') {
-    return <Text color="yellow">{slotLoadingMsg}</Text>;
+    return (
+      <Box flexDirection="column">
+        <Text color="yellow">{slotLoadingMsg || '正在拉取模型列表...'}</Text>
+        <Text dimColor>ESC 取消</Text>
+      </Box>
+    );
   }
 
   if (stage === 'slot_select_model') {
@@ -680,7 +679,7 @@ export const ProviderPanel: React.FC<{
     if (items.length === 0) {
       return (
         <Box flexDirection="column">
-          <Text color="red">没有可用的模型（所有 Provider 连接失败或未返回模型列表）</Text>
+          <Text color="red">没有可用的模型（所有 Provider 均未返回模型，请检查 API Key 和网络）</Text>
           <SelectInput
             items={[{ label: '← 返回', value: 'back' }]}
             onSelect={() => setStage('slot_config')}

package/src/commands/resume/resume.tsx

@@ -229,6 +229,22 @@ export const call: LocalJSXCommandCall = async (onDone, context, args) => {
       return null;
     }
 
+    // Same-repo logs didn't find it — search across ALL projects.
+    // This handles the case where the user runs `bingo` from a different
+    // directory than where the session was originally created (the session
+    // file lives under ~/.claude/projects/{originalCwd}/). A direct UUID
+    // resume should always be location-independent.
+    const allLogs = await loadAllProjectsMessageLogs();
+    const allMatchingLogs = allLogs
+      .filter(l => getSessionIdFromLog(l) === maybeSessionId)
+      .sort((a, b) => b.modified.getTime() - a.modified.getTime());
+    if (allMatchingLogs.length > 0) {
+      const log = allMatchingLogs[0]!;
+      const fullLog = isLiteLog(log) ? await loadFullLog(log) : log;
+      void onResume(maybeSessionId, fullLog, 'slash_command_session_id');
+      return null;
+    }
+
     // Enriched logs didn't find it — try direct file lookup. This handles
     // sessions filtered out by enrichLogs (e.g., first message >16KB makes
     // firstPrompt extraction fail, causing the session to be dropped).

package/src/server/config/providerPresets.ts

@@ -1,22 +1,11 @@
 // Provider presets — loaded from providers.yaml at startup
-// Original work inspired by cc-switch (https://github.com/farion1231/cc-switch) by Jason Young, MIT License
 
-//@C:ID=M.PP.providerPresets;K=M;V=2.0;P=Import dependencies;D=API;M=Providers;S=ModelConfiguration
 import { readFileSync } from 'fs'
 import { fileURLToPath } from 'url'
 import { parse } from 'yaml'
 import path from 'path'
 import type { ApiFormat } from '../types/provider.js'
 
-//@C:ID=T.PP.ModelMapping;K=T;V=1.0;P=Define model type mappings;D=API;M=Providers;S=ModelConfiguration
-export type ModelMapping = {
-  main: string
-  haiku: string
-  sonnet: string
-  opus: string
-}
-
-//@C:ID=T.PP.ProviderField;K=T;V=1.0;P=Define per-provider field descriptor;D=API;M=Providers;S=ModelConfiguration
 export type ProviderField = {
   /** Field key: 'name' | 'apiKey' | 'baseUrl' map to top-level fields; others go into extra.<key> */
   key: string
@@ -30,20 +19,34 @@ export type ProviderField = {
   default?: string
 }
 
-//@C:ID=T.PP.ProviderPreset;K=T;V=2.0;P=Define provider preset structure;D=API;M=Providers;S=ModelConfiguration
 export type ProviderPreset = {
   id: string
   name: string
+  /** Default base URL for this provider (can be overridden by user) */
   baseUrl: string
   apiFormat: ApiFormat
-  defaultModels: ModelMapping
   needsApiKey: boolean
   websiteUrl: string
+  /**
+   * Relative path to the models list endpoint, e.g. '/v1/models'.
+   * Empty string means dynamic model fetching is not supported.
+   */
+  modelsUrl: string
+  /**
+   * Auth header style for the models list request:
+   *   'bearer'   → Authorization: Bearer <apiKey>
+   *   'x-api-key' → x-api-key: <apiKey>  (+ anthropic-version header)
+   */
+  modelsAuthStyle: 'bearer' | 'x-api-key'
+  /**
+   * Field name in the response JSON that contains the model array.
+   * Almost always 'data' (OpenAI-compatible standard).
+   */
+  modelsDataPath: string
   /** Ordered list of fields to render when adding a new provider from this preset */
   fields: ProviderField[]
 }
 
-//@C:ID=D.PP.PROVIDER_PRESETS;K=D;V=2.0;P=Load provider presets from yaml;D=API;M=Providers;S=ModelConfiguration
 function loadPresetsFromYaml(): ProviderPreset[] {
   try {
     const yamlPath = path.join(path.dirname(fileURLToPath(import.meta.url)), 'providers.yaml')
@@ -52,20 +55,27 @@ function loadPresetsFromYaml(): ProviderPreset[] {
     if (!Array.isArray(presets) || presets.length === 0) {
       throw new Error('providers.yaml missing presets array')
     }
-    // Ensure fields is always an array
-    return presets.map(p => ({ ...p, fields: Array.isArray(p.fields) ? p.fields : [] }))
+    // Ensure fields is always an array and apply defaults for optional fields
+    return presets.map(p => ({
+      modelsUrl: '',
+      modelsAuthStyle: 'bearer' as const,
+      modelsDataPath: 'data',
+      ...p,
+      fields: Array.isArray(p.fields) ? p.fields : [],
+    }))
   } catch (err) {
     console.error('[providerPresets] Failed to load providers.yaml, falling back to defaults:', err)
-    // Minimal fallback so the server can still start
     return [
       {
         id: 'official',
         name: 'Claude Official',
         baseUrl: '',
         apiFormat: 'anthropic',
-        defaultModels: { main: '', haiku: '', sonnet: '', opus: '' },
         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 }],
       },
       {
@@ -73,9 +83,11 @@ function loadPresetsFromYaml(): ProviderPreset[] {
         name: 'Custom',
         baseUrl: '',
         apiFormat: 'anthropic',
-        defaultModels: { main: '', haiku: '', sonnet: '', opus: '' },
         needsApiKey: true,
         websiteUrl: '',
+        modelsUrl: '/v1/models',
+        modelsAuthStyle: 'bearer',
+        modelsDataPath: 'data',
         fields: [
           { key: 'name', label: 'Provider 昵称', required: true },
           { key: 'baseUrl', label: 'Base URL', required: true },

package/src/server/config/providers.yaml

@@ -4,6 +4,11 @@ version: 2
 # 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
@@ -12,11 +17,9 @@ presets:
     apiFormat: anthropic
     needsApiKey: false
     websiteUrl: https://www.anthropic.com/claude-code
-    defaultModels:
-      main: ''
-      haiku: ''
-      sonnet: ''
-      opus: ''
+    modelsUrl: /v1/models
+    modelsAuthStyle: x-api-key
+    modelsDataPath: data
     fields:
       - key: name
         label: Provider 昵称
@@ -30,11 +33,9 @@ presets:
     apiFormat: anthropic
     needsApiKey: true
     websiteUrl: https://platform.deepseek.com
-    defaultModels:
-      main: DeepSeek-V3.2
-      haiku: DeepSeek-V3.2
-      sonnet: DeepSeek-V3.2
-      opus: DeepSeek-V3.2
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
     fields:
       - key: name
         label: Provider 昵称
@@ -53,11 +54,9 @@ presets:
     apiFormat: anthropic
     needsApiKey: true
     websiteUrl: https://open.bigmodel.cn
-    defaultModels:
-      main: glm-5
-      haiku: glm-5
-      sonnet: glm-5
-      opus: glm-5
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
     fields:
       - key: name
         label: Provider 昵称
@@ -76,11 +75,9 @@ presets:
     apiFormat: anthropic
     needsApiKey: true
     websiteUrl: https://platform.moonshot.cn
-    defaultModels:
-      main: kimi-k2.5
-      haiku: kimi-k2.5
-      sonnet: kimi-k2.5
-      opus: kimi-k2.5
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
     fields:
       - key: name
         label: Provider 昵称
@@ -99,11 +96,9 @@ presets:
     apiFormat: anthropic
     needsApiKey: true
     websiteUrl: https://platform.minimaxi.com
-    defaultModels:
-      main: MiniMax-M2.7
-      haiku: MiniMax-M2.7
-      sonnet: MiniMax-M2.7
-      opus: MiniMax-M2.7
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
     fields:
       - key: name
         label: Provider 昵称
@@ -122,11 +117,9 @@ presets:
     apiFormat: openai_chat
     needsApiKey: true
     websiteUrl: ''
-    defaultModels:
-      main: ''
-      haiku: ''
-      sonnet: ''
-      opus: ''
+    modelsUrl: /v1/models
+    modelsAuthStyle: bearer
+    modelsDataPath: data
     fields:
       - key: name
         label: Provider 昵称

package/src/server/services/providerService.ts

@@ -9,12 +9,14 @@
 import * as fs from 'fs/promises'
 import * as path from 'path'
 import * as os from 'os'
+import { getDirectFetchOptions } from '../../utils/proxy.ts'
 import { ApiError } from '../middleware/errorHandler.js'
 import { anthropicToOpenaiChat } from '../proxy/transform/anthropicToOpenaiChat.js'
 import { anthropicToOpenaiResponses } from '../proxy/transform/anthropicToOpenaiResponses.js'
 import { openaiChatToAnthropic } from '../proxy/transform/openaiChatToAnthropic.js'
 import { openaiResponsesToAnthropic } from '../proxy/transform/openaiResponsesToAnthropic.js'
 import type { AnthropicRequest, AnthropicResponse } from '../proxy/transform/types.js'
+import { PROVIDER_PRESETS } from '../config/providerPresets.js'
 import type {
   SavedProvider,
   ProvidersIndex,
@@ -379,29 +381,37 @@ export class ProviderService {
 
   async fetchProviderModels(id: string): Promise<string[]> {
     const provider = await this.getProvider(id)
+    const preset = PROVIDER_PRESETS.find(p => p.id === provider.presetId)
+
     const base = provider.baseUrl.replace(/\/+$/, '')
     if (!base) return []
 
-    const url = `${base}/v1/models`
+    const modelsUrl = preset?.modelsUrl || '/v1/models'
+    const url = `${base}${modelsUrl}`
+
     const headers: Record<string, string> = {
       'Content-Type': 'application/json',
-      Authorization: `Bearer ${provider.apiKey}`,
     }
-    // anthropic format uses x-api-key header style
-    if (provider.apiFormat === 'anthropic') {
+
+    const authStyle = preset?.modelsAuthStyle || (provider.apiFormat === 'anthropic' ? 'x-api-key' : 'bearer')
+    if (authStyle === 'x-api-key') {
       headers['x-api-key'] = provider.apiKey
-      delete headers['Authorization']
       headers['anthropic-version'] = '2023-06-01'
+    } else {
+      headers['Authorization'] = `Bearer ${provider.apiKey}`
     }
 
     try {
-      const res = await fetch(url, { headers, signal: AbortSignal.timeout(10000) })
+      const directOpts = getDirectFetchOptions()
+      const res = await fetch(url, { headers, signal: AbortSignal.timeout(10000), ...directOpts })
       if (!res.ok) {
         return []
       }
-      const data = await res.json() as { data?: { id: string }[]; models?: { id: string }[] }
-      const list = data.data ?? data.models ?? []
-      return list.map((m: { id: string }) => m.id).filter(Boolean)
+      const data = await res.json() as any
+      const dataPath = preset?.modelsDataPath || 'data'
+      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 {
       return []
     }
@@ -464,11 +474,13 @@ export class ProviderService {
     const start = Date.now()
     try {
       const { url, headers, body } = buildDirectTestRequest(base, apiKey, modelId, format)
+      const directOpts = getDirectFetchOptions()
       const response = await fetch(url, {
         method: 'POST',
         headers,
         body: JSON.stringify(body),
         signal: AbortSignal.timeout(30000),
+        ...directOpts,
       })
 
       const latencyMs = Date.now() - start
@@ -526,11 +538,13 @@ export class ProviderService {
       }
 
       // Call upstream with transformed request
+      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),
+        ...directOpts,
       })
 
       if (!response.ok) {

package/src/server/types/provider.ts

@@ -1,8 +1,8 @@
 /**
  * Provider types — preset-based provider configuration.
  *
- * Providers are stored in ~/.claude/cc-haha/providers.json as a lightweight index.
- * The active provider's env vars are written to ~/.claude/settings.json.
+ * Providers are stored in ~/.claude/bingo/providers.json as a lightweight index.
+ * The active provider's env vars are written to ~/.claude/bingo/settings.json.
  */
 
 import { z } from 'zod'
@@ -44,7 +44,7 @@ export const CreateProviderSchema = z.object({
   apiKey: z.string(),
   baseUrl: z.string(),
   apiFormat: ApiFormatSchema.default('anthropic'),
-  models: ModelMappingSchema,
+  models: ModelMappingSchema.default({ main: '', haiku: '', sonnet: '', opus: '' }).optional(),
   notes: z.string().optional(),
   extra: z.record(z.any()).optional(),
 }).catchall(z.any())

package/src/utils/managedEnv.ts

@@ -93,15 +93,15 @@ function filterSettingsEnv(
 }
 
 /**
- * Read env vars from ~/.claude/cc-haha/settings.json (Haha-specific provider
+ * Read env vars from ~/.claude/bingo/settings.json (Bingo-specific provider
  * config). This file is written by ProviderService.syncToSettings() and
  * 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 ccHahaSettings = join(getClaudeConfigHomeDir(), 'cc-haha', 'settings.json')
-    const raw = readFileSync(ccHahaSettings, 'utf-8')
+    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 {

package/src/utils/proxy.ts

@@ -318,6 +318,33 @@ export function getProxyFetchOptions(opts?: { forAnthropicAPI?: boolean }): {
   return { ...base, ...getTLSFetchOptions() }
 }
 
+/**
+ * Get fetch options that bypass any system proxies to test direct connectivity.
+ */
+export function getDirectFetchOptions(): {
+  tls?: TLSConfig
+  dispatcher?: undici.Dispatcher
+  proxy?: undefined
+  keepalive?: false
+} {
+  const base = keepAliveDisabled ? ({ keepalive: false } as const) : {}
+
+  if (typeof Bun !== 'undefined') {
+    // In Bun, explicit undefined for proxy bypasses the system proxy
+    return { ...base, proxy: undefined, ...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()
+
+  return {
+    ...base,
+    dispatcher: new undiciMod.Agent(tlsOpts.dispatcher ? (tlsOpts.dispatcher as any).options : {}),
+  }
+}
+
 /**
  * Configure global HTTP agents for both axios and undici
  * This ensures all HTTP requests use the proxy and/or mTLS if configured