@@ -1,6 +1,7 @@
 import { translations as common } from './common'
 import { translations as create } from './create'
 import { translations as pick_reasoning_effort } from './pick-reasoning-effort'
+import { translations as pick_extended_provider } from './pick-extended-provider'
 import { translations as update } from './update'
 import { translations as upsert_provider } from './upsert-provider'
 import { translations as delete_translations } from './delete'
@@ -9,6 +10,7 @@ export const translations = {
   ...common,
   ...create,
   ...pick_reasoning_effort,
+  ...pick_extended_provider,
   ...update,
   ...upsert_provider,
   ...delete_translations
 
@@ -0,0 +1,21 @@
+export const translations = {
+  'views.shared.actions.api.pick-extended-provider.error': {
+    en: 'Failed to load providers from Models.dev',
+    pl: 'Nie udało się załadować dostawców z Models.dev',
+    'zh-cn': '无法从 Models.dev 加载提供商',
+    ja: 'Models.dev からプロバイダーを読み込めませんでした',
+    'zh-tw': '無法從 Models.dev 載入提供商',
+    de: 'Fehler beim Laden der Anbieter von Models.dev',
+    es: 'Error al cargar los proveedores de Models.dev',
+    fr: 'Échec du chargement des fournisseurs depuis Models.dev',
+    'pt-br': 'Falha ao carregar provedores do Models.dev',
+    ru: 'Не удалось загрузить провайдеров из Models.dev',
+    ko: 'Models.dev에서 제공자를 로드하지 못했습니다',
+    it: 'Impossibile caricare i fornitori da Models.dev',
+    tr: "Sağlayıcılar Models.dev'den yüklenemedi",
+    cs: 'Nepodařilo se načíst poskytovatele z Models.dev',
+    hu: 'Nem sikerült betölteni a szolgáltatókat a Models.dev oldalról',
+    bg: 'Неуспешно зареждане на доставчици от Models.dev'
+  }
+} as const
+
@@ -378,22 +378,94 @@ export const translations = {
     bg: '$(edit) Персонализирана крайна точка...'
   },
   'views.shared.actions.api.upsert-provider.options.custom-desc': {
-    en: 'You can use any OpenAI-API compatible provider',
-    pl: 'Możesz użyć dowolnego dostawcy kompatybilnego z API OpenAI',
-    'zh-cn': '您可以使用任何与 OpenAI API 兼容的提供商',
-    ja: 'OpenAI APIと互換性のあるプロバイダーならどれでも使用できます',
-    'zh-tw': '您可以使用任何與 OpenAI API 相容的提供商',
-    de: 'Sie können jeden OpenAI-API-kompatiblen Anbieter verwenden',
-    es: 'Puedes utilizar cualquier proveedor compatible con la API de OpenAI',
-    fr: "Vous pouvez utiliser n'importe quel fournisseur compatible avec l'API OpenAI",
-    'pt-br': 'Você pode usar qualquer provedor compatível com a API da OpenAI',
-    ru: 'Вы можете использовать любого провайдера, совместимого с OpenAI API',
-    ko: 'OpenAI API 호환 제공자를 사용할 수 있습니다',
-    it: "Puoi usare qualsiasi provider compatibile con l'API di OpenAI",
-    tr: 'OpenAI API uyumlu herhangi bir sağlayıcıyı kullanabilirsiniz',
-    cs: 'Můžete použít jakéhokoli poskytovatele kompatibilního s OpenAI API',
-    hu: 'Bármilyen OpenAI API-kompatibilis szolgáltatót használhat',
-    bg: 'Можете да използвате всеки доставчик, съвместим с OpenAI API'
+    en: 'Use any OpenAI-API compatible enpoint',
+    pl: 'Użyj dowolnego endpointa zgodnego z OpenAI API',
+    'zh-cn': '使用任何与 OpenAI API 兼容的端点',
+    ja: 'OpenAI API 互換の任意のエンドポイントを使用',
+    'zh-tw': '使用任何與 OpenAI API 相容的端點',
+    de: 'Beliebigen OpenAI-API-kompatiblen Endpunkt verwenden',
+    es: 'Usa cualquier punto de enlace compatible con la API de OpenAI',
+    fr: "Utilisez n'importe quel point de terminaison compatible avec l'API OpenAI",
+    'pt-br': 'Use qualquer endpoint compatível com a API OpenAI',
+    ru: 'Используйте любой эндпоинт, совместимый с OpenAI API',
+    ko: 'OpenAI API와 호환되는 모든 엔드포인트 사용',
+    it: "Usa qualsiasi endpoint compatibile con l'API OpenAI",
+    tr: 'OpenAI API uyumlu herhangi bir uç nokta kullanın',
+    cs: 'Použijte jakýkoli koncový bod kompatibilní s OpenAI API',
+    hu: 'Használjon bármilyen OpenAI API-kompatibilis végpontot',
+    bg: 'Използвайте всяка крайна точка, съвместима с OpenAI API'
+  },
+  'views.shared.actions.api.upsert-provider.options.extended-label': {
+    en: '$(cloud-download) Show all...',
+    pl: '$(cloud-download) Pokaż wszystkie...',
+    'zh-cn': '$(cloud-download) 显示全部...',
+    ja: '$(cloud-download) すべて表示...',
+    'zh-tw': '$(cloud-download) 顯示全部...',
+    de: '$(cloud-download) Alle anzeigen...',
+    es: '$(cloud-download) Mostrar todo...',
+    fr: '$(cloud-download) Tout afficher...',
+    'pt-br': '$(cloud-download) Mostrar todos...',
+    ru: '$(cloud-download) Показать все...',
+    ko: '$(cloud-download) 모두 표시...',
+    it: '$(cloud-download) Mostra tutto...',
+    tr: '$(cloud-download) Tümünü göster...',
+    cs: '$(cloud-download) Zobrazit vše...',
+    hu: '$(cloud-download) Összes megjelenítése...',
+    bg: '$(cloud-download) Покажи всички...'
+  },
+  'views.shared.actions.api.upsert-provider.options.extended-desc': {
+    en: 'Load Models.dev database',
+    pl: 'Pobierz z bazy danych Models.dev',
+    'zh-cn': '加载 Models.dev 数据库',
+    ja: 'Models.dev データベースを読み込む',
+    'zh-tw': '載入 Models.dev 資料庫',
+    de: 'Models.dev-Datenbank laden',
+    es: 'Cargar base de datos de Models.dev',
+    fr: 'Charger la base de données Models.dev',
+    'pt-br': 'Carregar banco de dados do Models.dev',
+    ru: 'Загрузить базу данных Models.dev',
+    ko: 'Models.dev 데이터베이스 로드',
+    it: 'Carica database di Models.dev',
+    tr: 'Models.dev veritabanını yükle',
+    cs: 'Načíst databázi Models.dev',
+    hu: 'Models.dev adatbázis betöltése',
+    bg: 'Зареждане на базата данни на Models.dev'
+  },
+  'views.shared.actions.api.upsert-provider.options.extended-title': {
+    en: 'Extended Providers',
+    pl: 'Rozszerzeni dostawcy',
+    'zh-cn': '扩展提供商',
+    ja: '拡張プロバイダー',
+    'zh-tw': '擴展提供商',
+    de: 'Erweiterte Anbieter',
+    es: 'Proveedores extendidos',
+    fr: 'Fournisseurs étendus',
+    'pt-br': 'Provedores Estendidos',
+    ru: 'Расширенные провайдеры',
+    ko: '확장된 제공자',
+    it: 'Fornitori estesi',
+    tr: 'Genişletilmiş Sağlayıcılar',
+    cs: 'Rozšíření poskytovatelé',
+    hu: 'Bővített szolgáltatók',
+    bg: 'Разширени доставчици'
+  },
+  'views.shared.actions.api.upsert-provider.options.extended-placeholder': {
+    en: 'Choose a provider from Models.dev',
+    pl: 'Wybierz dostawcę z Models.dev',
+    'zh-cn': '从 Models.dev 中选择提供商',
+    ja: 'Models.devからプロバイダーを選択',
+    'zh-tw': '從 Models.dev 中選擇提供商',
+    de: 'Wählen Sie einen Anbieter von Models.dev',
+    es: 'Elige un proveedor de Models.dev',
+    fr: 'Choisissez un fournisseur depuis Models.dev',
+    'pt-br': 'Escolha um provedor do Models.dev',
+    ru: 'Выберите провайдера из Models.dev',
+    ko: 'Models.dev에서 제공자를 선택하세요',
+    it: 'Scegli un fornitore da Models.dev',
+    tr: "Models.dev'den bir sağlayıcı seçin",
+    cs: 'Vyberte poskytovatele z Models.dev',
+    hu: 'Válasszon szolgáltatót a Models.dev webhelyről',
+    bg: 'Изберете доставчик от Models.dev'
   },
   'views.shared.actions.api.upsert-provider.options.predefined': {
     en: 'predefined endpoints',
@@ -459,8 +531,7 @@ export const translations = {
     de: 'Für benutzerdefinierte Anbieter ist eine Basis-URL erforderlich.',
     es: 'Se requiere una URL base para los proveedores personalizados.',
     fr: 'Une URL de base est requise pour les fournisseurs personnalisés.',
-    'pt-br':
-      'Uma URL base é obrigatória para provedores personalizados.',
+    'pt-br': 'Uma URL base é obrigatória para provedores personalizados.',
     ru: 'Базовый URL обязателен для пользовательских провайдеров.',
     ko: '사용자 지정 제공자에는 기본 URL이 필요합니다.',
     it: 'Un URL di base è obbligatorio per i fornitori personalizzati.',
 
@@ -3,6 +3,8 @@ import { SettingsViewProvider } from '../settings-view-provider'
 import { PROVIDERS } from '@/constants/providers'
 import { AddProviderMessage } from '@/views/settings/types/messages'
 import { t } from '@/i18n'
+import { pick_extended_provider } from '@/views/shared/actions/api/pick-extended-provider'
+import { pick_provider_source } from '@/views/shared/actions/api/pick-provider-source'
 
 export const handle_add_provider = async (
   provider: SettingsViewProvider,
@@ -66,80 +68,42 @@ export const handle_add_provider = async (
         : message.insertion_index + 1
   }
 
-  const custom_label = '$(edit) Custom endpoint...'
-  const available_built_in = Object.entries(PROVIDERS)
+  while (true) {
+    const choice = await pick_provider_source()
 
-  const items: vscode.QuickPickItem[] = [
-    {
-      label: custom_label,
-      description: 'You can use any OpenAI-API compatible provider'
-    },
-    {
-      label: 'predefined endpoints',
-      kind: vscode.QuickPickItemKind.Separator
-    },
-    ...available_built_in.map(([id, info]) => ({
-      label: id,
-      detail: info.base_url
-    }))
-  ]
+    if (choice === 'BACK' || !choice) return
 
-  const quick_pick = vscode.window.createQuickPick()
-  quick_pick.items = items
-  quick_pick.title = 'Providers'
-  quick_pick.placeholder =
-    'Choose a predefined provider or add a custom endpoint'
+    let new_name = ''
+    let new_base_url = ''
 
-  const close_button: vscode.QuickInputButton = {
-    iconPath: new vscode.ThemeIcon('close'),
-    tooltip: 'Close'
-  }
-  quick_pick.buttons = [close_button]
+    if (choice.is_extended) {
+      const ext_choice = await pick_extended_provider()
 
-  const choice = await new Promise<{ id?: string } | null>((resolve) => {
-    quick_pick.onDidTriggerButton((button) => {
-      if (button === close_button) {
-        quick_pick.hide()
+      if (ext_choice === 'BACK') {
+        continue
       }
-    })
-    quick_pick.onDidAccept(() => {
-      const selected = quick_pick.selectedItems[0]
-      quick_pick.hide()
-      if (!selected) return resolve(null)
 
-      if (selected.label === custom_label) {
-        resolve({})
-      } else {
-        resolve({ id: selected.label })
-      }
-    })
-    quick_pick.onDidHide(() => {
-      quick_pick.dispose()
-      resolve(null)
+      if (!ext_choice) return
+
+      new_name = ext_choice.name
+      new_base_url = ext_choice.url
+    } else if (choice.id) {
+      const name = choice.id as keyof typeof PROVIDERS
+      const info = PROVIDERS[name]
+      new_name = name
+      new_base_url = info.base_url
+    }
+
+    provider.postMessage({
+      command: 'START_PROVIDER_CREATION',
+      provider: {
+        name: new_name,
+        base_url: new_base_url,
+        api_key_mask: '',
+        extended_cache: undefined
+      },
+      insertion_index
     })
-    quick_pick.show()
-  })
-
-  if (!choice) return
-
-  let new_name = ''
-  let new_base_url = ''
-
-  if (choice.id) {
-    const name = choice.id as keyof typeof PROVIDERS
-    const info = PROVIDERS[name]
-    new_name = name
-    new_base_url = info.base_url
+    break
   }
-
-  provider.postMessage({
-    command: 'START_PROVIDER_CREATION',
-    provider: {
-      name: new_name,
-      base_url: new_base_url,
-      api_key_mask: '',
-      extended_cache: undefined
-    },
-    insertion_index
-  })
 }
@@ -0,0 +1,90 @@
+import * as vscode from 'vscode'
+import axios from 'axios'
+import { t } from '@/i18n'
+
+type ModelsDevProvider = {
+  name: string
+  doc?: string
+  api?: string
+}
+
+type ModelsDevResponse = Record<string, ModelsDevProvider>
+
+export const pick_extended_provider = async (): Promise<
+  { name: string; url: string } | null | 'BACK'
+> => {
+  try {
+    const response = await axios.get<ModelsDevResponse>(
+      'https://models.dev/api.json'
+    )
+    const providers_data = response.data
+
+    const extended_items: vscode.QuickPickItem[] = Object.values(providers_data)
+      .filter((p) => p && p.api)
+      .map((p) => ({
+        label: p.name,
+        detail: p.api,
+        buttons: p.doc
+          ? [
+              {
+                iconPath: new vscode.ThemeIcon('globe'),
+                tooltip: p.doc
+              }
+            ]
+          : undefined
+      }))
+
+    const extended_quick_pick = vscode.window.createQuickPick()
+    extended_quick_pick.ignoreFocusOut = true
+    extended_quick_pick.items = extended_items
+    extended_quick_pick.title = t(
+      'views.shared.actions.api.upsert-provider.options.extended-title'
+    )
+    extended_quick_pick.placeholder = t(
+      'views.shared.actions.api.upsert-provider.options.extended-placeholder'
+    )
+
+    const close_button: vscode.QuickInputButton = {
+      iconPath: new vscode.ThemeIcon('close'),
+      tooltip: t('common.close')
+    }
+    extended_quick_pick.buttons = [vscode.QuickInputButtons.Back, close_button]
+
+    const ext_choice = await new Promise<
+      { name: string; url: string } | null | 'BACK'
+    >((resolve) => {
+      extended_quick_pick.onDidTriggerButton((button) => {
+        if (button === close_button) {
+          extended_quick_pick.hide()
+        } else if (button === vscode.QuickInputButtons.Back) {
+          resolve('BACK')
+          extended_quick_pick.hide()
+        }
+      })
+      extended_quick_pick.onDidTriggerItemButton((e) => {
+        const button = e.button
+        if (button.tooltip) {
+          vscode.env.openExternal(vscode.Uri.parse(button.tooltip))
+        }
+      })
+      extended_quick_pick.onDidAccept(() => {
+        const selected = extended_quick_pick.selectedItems[0]
+        extended_quick_pick.hide()
+        if (!selected) return resolve(null)
+        resolve({ name: selected.label, url: selected.detail || '' })
+      })
+      extended_quick_pick.onDidHide(() => {
+        extended_quick_pick.dispose()
+        resolve(null)
+      })
+      extended_quick_pick.show()
+    })
+
+    return ext_choice
+  } catch (e) {
+    vscode.window.showErrorMessage(
+      t('views.shared.actions.api.pick-extended-provider.error')
+    )
+    return 'BACK'
+  }
+}