From a257de52166e9cb02cd8b831fe0e7ab261e48993 Mon Sep 17 00:00:00 2001
From: ergs0204 <ergs0204@gmail.com>
Date: Fri, 17 Jul 2026 22:29:33 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix(web):=20preserve=20proxy=20r?=
 =?UTF-8?q?oute=20during=20model=20discovery?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AiProvidersOpenAIModelsPage.tsx           | 45 +++------
 .../aiProviders/openAIModelDiscovery.test.ts  | 96 +++++++++++++++++++
 .../aiProviders/openAIModelDiscovery.ts       | 44 +++++++++
 apps/web/src/i18n/locales/en.json             |  1 +
 apps/web/src/i18n/locales/ru.json             |  1 +
 apps/web/src/i18n/locales/zh-CN.json          |  1 +
 apps/web/src/i18n/locales/zh-TW.json          |  1 +
 7 files changed, 157 insertions(+), 32 deletions(-)
 create mode 100644 apps/web/src/features/aiProviders/openAIModelDiscovery.test.ts
 create mode 100644 apps/web/src/features/aiProviders/openAIModelDiscovery.ts

diff --git a/apps/web/src/features/aiProviders/AiProvidersOpenAIModelsPage.tsx b/apps/web/src/features/aiProviders/AiProvidersOpenAIModelsPage.tsx
index d7a8d3bf1..9bb7528eb 100644
--- a/apps/web/src/features/aiProviders/AiProvidersOpenAIModelsPage.tsx
+++ b/apps/web/src/features/aiProviders/AiProvidersOpenAIModelsPage.tsx
@@ -7,12 +7,10 @@ import { Input } from '@/components/ui/Input';
 import { SelectionCheckbox } from '@/components/ui/SelectionCheckbox';
 import { SecondaryScreenShell } from '@/components/common/SecondaryScreenShell';
 import { useEdgeSwipeBack } from '@/hooks/useEdgeSwipeBack';
-import { modelsApi } from '@/services/api';
 import type { ModelInfo } from '@/utils/models';
-import { normalizeAuthIndex } from '@/utils/authIndex';
-import { buildHeaderObject, hasHeader } from '@/utils/headers';
 import { buildOpenAIModelsEndpoint } from '@/components/providers/utils';
 import type { OpenAIEditOutletContext } from './AiProvidersOpenAIEditLayout';
+import { discoverOpenAIModels } from './openAIModelDiscovery';
 import styles from './AiProvidersPage.module.scss';
 import layoutStyles from './AiProvidersEditLayout.module.scss';
 
@@ -74,42 +72,25 @@ export function AiProvidersOpenAIModelsPage() {
   );
 
   const fetchOpenaiModelDiscovery = useCallback(
-    async ({ allowFallback = true }: { allowFallback?: boolean } = {}) => {
+    async () => {
       const trimmedBaseUrl = form.baseUrl.trim();
       if (!trimmedBaseUrl) return;
 
       setFetching(true);
       setError('');
       try {
-        const headerObject = buildHeaderObject(form.headers);
-        const firstEntry = form.apiKeyEntries.find(
-          (entry) => entry.apiKey?.trim() || normalizeAuthIndex(entry.authIndex)
-        );
-        const firstKey = firstEntry?.apiKey?.trim();
-        const authIndex = normalizeAuthIndex(firstEntry?.authIndex) ?? undefined;
-        const hasAuthHeader = hasHeader(headerObject, 'authorization');
-        const list = await modelsApi.fetchModelsViaApiCall(
-          trimmedBaseUrl,
-          hasAuthHeader ? undefined : firstKey,
-          headerObject,
-          authIndex
-        );
+        const list = await discoverOpenAIModels({
+          baseUrl: trimmedBaseUrl,
+          headers: form.headers,
+          apiKeyEntries: form.apiKeyEntries,
+          proxyRequiresSavedEntryMessage: t(
+            'ai_providers.openai_models_proxy_requires_saved_entry'
+          ),
+        });
         setModels(list);
       } catch (err: unknown) {
-        if (allowFallback) {
-          try {
-            const list = await modelsApi.fetchModelsViaApiCall(trimmedBaseUrl);
-            setModels(list);
-            return;
-          } catch (fallbackErr: unknown) {
-            const message = getErrorMessage(fallbackErr) || getErrorMessage(err);
-            setModels([]);
-            setError(`${t('ai_providers.openai_models_fetch_error')}: ${message}`);
-          }
-        } else {
-          setModels([]);
-          setError(`${t('ai_providers.openai_models_fetch_error')}: ${getErrorMessage(err)}`);
-        }
+        setModels([]);
+        setError(`${t('ai_providers.openai_models_fetch_error')}: ${getErrorMessage(err)}`);
       } finally {
         setFetching(false);
       }
@@ -243,7 +224,7 @@ export function AiProvidersOpenAIModelsPage() {
               <Button
                 variant="secondary"
                 size="sm"
-                onClick={() => void fetchOpenaiModelDiscovery({ allowFallback: true })}
+                onClick={() => void fetchOpenaiModelDiscovery()}
                 loading={fetching}
                 disabled={disableControls || saving}
               >
diff --git a/apps/web/src/features/aiProviders/openAIModelDiscovery.test.ts b/apps/web/src/features/aiProviders/openAIModelDiscovery.test.ts
new file mode 100644
index 000000000..0c689cd48
--- /dev/null
+++ b/apps/web/src/features/aiProviders/openAIModelDiscovery.test.ts
@@ -0,0 +1,96 @@
+import { describe, expect, it, vi } from 'vitest';
+import { discoverOpenAIModels } from './openAIModelDiscovery';
+
+const options = {
+  baseUrl: 'https://api.example.com/v1',
+  headers: [],
+  proxyRequiresSavedEntryMessage: 'Save the provider first',
+};
+
+describe('discoverOpenAIModels', () => {
+  it('does not retry without the configured proxy route', async () => {
+    const fetchModels = vi.fn().mockRejectedValue(new Error('upstream blocked'));
+
+    await expect(
+      discoverOpenAIModels({
+        ...options,
+        apiKeyEntries: [
+          {
+            apiKey: 'sk-test',
+            authIndex: 'auth-1',
+            proxyUrl: 'socks5://proxy.example.com:1080',
+          },
+        ],
+        fetchModels,
+      })
+    ).rejects.toThrow('upstream blocked');
+
+    expect(fetchModels).toHaveBeenCalledTimes(1);
+    expect(fetchModels).toHaveBeenCalledWith(
+      options.baseUrl,
+      'sk-test',
+      {},
+      'auth-1'
+    );
+  });
+
+  it('requires proxy-backed drafts to be saved before discovery', async () => {
+    const fetchModels = vi.fn();
+
+    await expect(
+      discoverOpenAIModels({
+        ...options,
+        apiKeyEntries: [
+          {
+            apiKey: 'sk-test',
+            proxyUrl: 'socks5://proxy.example.com:1080',
+          },
+        ],
+        fetchModels,
+      })
+    ).rejects.toThrow(options.proxyRequiresSavedEntryMessage);
+
+    expect(fetchModels).not.toHaveBeenCalled();
+  });
+
+  it('preserves provider and entry headers on the routed request', async () => {
+    const fetchModels = vi.fn().mockResolvedValue([]);
+
+    await discoverOpenAIModels({
+      ...options,
+      headers: [{ key: 'X-Provider', value: 'provider-value' }],
+      apiKeyEntries: [
+        {
+          apiKey: 'sk-test',
+          authIndex: 'auth-1',
+          proxyUrl: 'socks5://proxy.example.com:1080',
+          headers: { 'X-Entry': 'entry-value' },
+        },
+      ],
+      fetchModels,
+    });
+
+    expect(fetchModels).toHaveBeenCalledWith(
+      options.baseUrl,
+      'sk-test',
+      {
+        'X-Provider': 'provider-value',
+        'X-Entry': 'entry-value',
+      },
+      'auth-1'
+    );
+  });
+
+  it('uses a single credentialless request for a public endpoint', async () => {
+    const fetchModels = vi.fn().mockResolvedValue([{ name: 'public-model' }]);
+
+    await discoverOpenAIModels({
+      ...options,
+      apiKeyEntries: [],
+      fetchModels,
+    });
+
+    expect(fetchModels).toHaveBeenCalledTimes(1);
+    expect(fetchModels).toHaveBeenCalledWith(options.baseUrl, undefined, {}, undefined);
+  });
+});
diff --git a/apps/web/src/features/aiProviders/openAIModelDiscovery.ts b/apps/web/src/features/aiProviders/openAIModelDiscovery.ts
new file mode 100644
index 000000000..72b325511
--- /dev/null
+++ b/apps/web/src/features/aiProviders/openAIModelDiscovery.ts
@@ -0,0 +1,44 @@
+import { modelsApi } from '@/services/api';
+import type { ApiKeyEntry } from '@/types';
+import { normalizeAuthIndex } from '@/utils/authIndex';
+import { buildHeaderObject, hasHeader, type HeaderEntry } from '@/utils/headers';
+
+type OpenAIModelDiscoveryOptions = {
+  baseUrl: string;
+  headers: HeaderEntry[];
+  apiKeyEntries: ApiKeyEntry[];
+  proxyRequiresSavedEntryMessage: string;
+  fetchModels?: typeof modelsApi.fetchModelsViaApiCall;
+};
+
+export const discoverOpenAIModels = async ({
+  baseUrl,
+  headers,
+  apiKeyEntries,
+  proxyRequiresSavedEntryMessage,
+  fetchModels = modelsApi.fetchModelsViaApiCall,
+}: OpenAIModelDiscoveryOptions) => {
+  const headerObject = buildHeaderObject(headers);
+  const firstEntry = apiKeyEntries.find(
+    (entry) =>
+      entry.apiKey?.trim() ||
+      normalizeAuthIndex(entry.authIndex) ||
+      entry.proxyUrl?.trim() ||
+      Object.keys(entry.headers ?? {}).length > 0
+  );
+  const firstKey = firstEntry?.apiKey?.trim();
+  const authIndex = normalizeAuthIndex(firstEntry?.authIndex) ?? undefined;
+  const resolvedHeaders = { ...headerObject, ...(firstEntry?.headers ?? {}) };
+
+  if (firstEntry?.proxyUrl?.trim() && !authIndex) {
+    throw new Error(proxyRequiresSavedEntryMessage);
+  }
+
+  const hasAuthHeader = hasHeader(resolvedHeaders, 'authorization');
+  return fetchModels(
+    baseUrl,
+    hasAuthHeader ? undefined : firstKey,
+    resolvedHeaders,
+    authIndex
+  );
+};
diff --git a/apps/web/src/i18n/locales/en.json b/apps/web/src/i18n/locales/en.json
index ca964f7dc..4dd561a38 100644
--- a/apps/web/src/i18n/locales/en.json
+++ b/apps/web/src/i18n/locales/en.json
@@ -655,6 +655,7 @@
     "openai_models_fetch_loading": "Fetching models from /models...",
     "openai_models_fetch_empty": "No models returned. Check the address, key, or headers.",
     "openai_models_fetch_error": "Failed to fetch models",
+    "openai_models_proxy_requires_saved_entry": "Save the provider before fetching models through its configured proxy.",
     "openai_models_fetch_back": "Back to edit",
     "openai_models_fetch_apply": "Add selected models",
     "openai_models_search_label": "Search models",
diff --git a/apps/web/src/i18n/locales/ru.json b/apps/web/src/i18n/locales/ru.json
index aaf74bd9c..e1df2bc75 100644
--- a/apps/web/src/i18n/locales/ru.json
+++ b/apps/web/src/i18n/locales/ru.json
@@ -655,6 +655,7 @@
     "openai_models_fetch_loading": "Получение моделей из /models...",
     "openai_models_fetch_empty": "Модели не вернулись. Проверьте адрес, ключ или заголовки.",
     "openai_models_fetch_error": "Не удалось получить модели",
+    "openai_models_proxy_requires_saved_entry": "Сохраните провайдера перед получением моделей через настроенный прокси.",
     "openai_models_fetch_back": "Вернуться к редактированию",
     "openai_models_fetch_apply": "Добавить выбранные модели",
     "openai_models_search_label": "Поиск моделей",
diff --git a/apps/web/src/i18n/locales/zh-CN.json b/apps/web/src/i18n/locales/zh-CN.json
index 98cdb6de3..45fcc4944 100644
--- a/apps/web/src/i18n/locales/zh-CN.json
+++ b/apps/web/src/i18n/locales/zh-CN.json
@@ -655,6 +655,7 @@
     "openai_models_fetch_loading": "正在从 /models 获取模型列表...",
     "openai_models_fetch_empty": "未获取到模型，请检查地址、密钥或请求头。",
     "openai_models_fetch_error": "获取模型失败",
+    "openai_models_proxy_requires_saved_entry": "请先保存渠道，再通过已配置的代理获取模型。",
     "openai_models_fetch_back": "返回编辑",
     "openai_models_fetch_apply": "添加所选模型",
     "openai_models_search_label": "搜索模型",
diff --git a/apps/web/src/i18n/locales/zh-TW.json b/apps/web/src/i18n/locales/zh-TW.json
index 3ea87b478..79e0c387e 100644
--- a/apps/web/src/i18n/locales/zh-TW.json
+++ b/apps/web/src/i18n/locales/zh-TW.json
@@ -655,6 +655,7 @@
     "openai_models_fetch_loading": "正在從 /models 取得模型清單...",
     "openai_models_fetch_empty": "未取得模型，請檢查位址、金鑰或請求標頭。",
     "openai_models_fetch_error": "取得模型失敗",
+    "openai_models_proxy_requires_saved_entry": "請先儲存渠道，再透過已設定的代理取得模型。",
     "openai_models_fetch_back": "返回編輯",
     "openai_models_fetch_apply": "新增已選模型",
     "openai_models_search_label": "搜尋模型",