Refactor OpenAI-compatible provider execution into shared core

Consolidate OpenAI-compatible API request handling into a single shared
module and route background dispatch through provider registry lookup.
This removes duplicated streaming/parsing logic from openai-api and
custom-api while keeping existing behavior.

Add config migration to preserve existing API keys and custom mode
entries by mapping them into providerSecrets and custom provider
records. Keep legacy fallbacks for apiMode customUrl/custom apiKey to
avoid user-visible regressions during rollout.

Normalize apiMode objects at runtime and compare selection using stable
identity fields so migrated and legacy session data continue to match
correctly.

Author: PeterDaveHello

src/background/index.mjs

@@ -5,18 +5,10 @@ import {
   sendMessageFeedback,
 } from '../services/apis/chatgpt-web'
 import { generateAnswersWithBingWebApi } from '../services/apis/bing-web.mjs'
-import {
-  generateAnswersWithOpenAiApi,
-  generateAnswersWithGptCompletionApi,
-} from '../services/apis/openai-api'
-import { generateAnswersWithCustomApi } from '../services/apis/custom-api.mjs'
-import { generateAnswersWithOllamaApi } from '../services/apis/ollama-api.mjs'
+import { generateAnswersWithOpenAICompatibleApi } from '../services/apis/openai-api'
 import { generateAnswersWithAzureOpenaiApi } from '../services/apis/azure-openai-api.mjs'
 import { generateAnswersWithClaudeApi } from '../services/apis/claude-api.mjs'
-import { generateAnswersWithChatGLMApi } from '../services/apis/chatglm-api.mjs'
 import { generateAnswersWithWaylaidwandererApi } from '../services/apis/waylaidwanderer-api.mjs'
-import { generateAnswersWithOpenRouterApi } from '../services/apis/openrouter-api.mjs'
-import { generateAnswersWithAimlApi } from '../services/apis/aiml-api.mjs'
 import {
   defaultConfig,
   getUserConfig,
@@ -52,10 +44,8 @@ import { refreshMenu } from './menus.mjs'
 import { registerCommands } from './commands.mjs'
 import { generateAnswersWithBardWebApi } from '../services/apis/bard-web.mjs'
 import { generateAnswersWithClaudeWebApi } from '../services/apis/claude-web.mjs'
-import { generateAnswersWithMoonshotCompletionApi } from '../services/apis/moonshot-api.mjs'
 import { generateAnswersWithMoonshotWebApi } from '../services/apis/moonshot-web.mjs'
 import { isUsingModelName } from '../utils/model-name-convert.mjs'
-import { generateAnswersWithDeepSeekApi } from '../services/apis/deepseek-api.mjs'
 import { redactSensitiveFields } from './redact.mjs'
 
 const RECONNECT_CONFIG = {
@@ -345,6 +335,20 @@ function setPortProxy(port, proxyTabId) {
   }
 }
 
+function isUsingOpenAICompatibleApiSession(session) {
+  return (
+    isUsingCustomModel(session) ||
+    isUsingChatgptApiModel(session) ||
+    isUsingMoonshotApiModel(session) ||
+    isUsingChatGLMApiModel(session) ||
+    isUsingDeepSeekApiModel(session) ||
+    isUsingOllamaApiModel(session) ||
+    isUsingOpenRouterApiModel(session) ||
+    isUsingAimlApiModel(session) ||
+    isUsingGptCompletionApiModel(session)
+  )
+}
+
 async function executeApi(session, port, config) {
   console.log(
     `[background] executeApi called for model: ${session.modelName}, apiMode: ${session.apiMode}`,
@@ -360,29 +364,7 @@ async function executeApi(session, port, config) {
     )
   }
   try {
-    if (isUsingCustomModel(session)) {
-      console.debug('[background] Using Custom Model API')
-      if (!session.apiMode)
-        await generateAnswersWithCustomApi(
-          port,
-          session.question,
-          session,
-          config.customModelApiUrl.trim() || 'http://localhost:8000/v1/chat/completions',
-          config.customApiKey,
-          config.customModelName,
-        )
-      else
-        await generateAnswersWithCustomApi(
-          port,
-          session.question,
-          session,
-          session.apiMode.customUrl?.trim() ||
-            config.customModelApiUrl.trim() ||
-            'http://localhost:8000/v1/chat/completions',
-          session.apiMode.apiKey?.trim() || config.customApiKey,
-          session.apiMode.customName,
-        )
-    } else if (isUsingChatgptWebModel(session)) {
+    if (isUsingChatgptWebModel(session)) {
       console.debug('[background] Using ChatGPT Web Model')
       let tabId
       if (
@@ -507,46 +489,15 @@ async function executeApi(session, port, config) {
       console.debug('[background] Using Gemini Web Model')
       const cookies = await getBardCookies()
       await generateAnswersWithBardWebApi(port, session.question, session, cookies)
-    } else if (isUsingChatgptApiModel(session)) {
-      console.debug('[background] Using OpenAI API Model')
-      await generateAnswersWithOpenAiApi(port, session.question, session, config.apiKey)
+    } else if (isUsingOpenAICompatibleApiSession(session)) {
+      console.debug('[background] Using OpenAI-compatible API provider')
+      await generateAnswersWithOpenAICompatibleApi(port, session.question, session, config)
     } else if (isUsingClaudeApiModel(session)) {
       console.debug('[background] Using Anthropic API Model')
       await generateAnswersWithClaudeApi(port, session.question, session)
-    } else if (isUsingMoonshotApiModel(session)) {
-      console.debug('[background] Using Moonshot API Model')
-      await generateAnswersWithMoonshotCompletionApi(
-        port,
-        session.question,
-        session,
-        config.moonshotApiKey,
-      )
-    } else if (isUsingChatGLMApiModel(session)) {
-      console.debug('[background] Using ChatGLM API Model')
-      await generateAnswersWithChatGLMApi(port, session.question, session)
-    } else if (isUsingDeepSeekApiModel(session)) {
-      console.debug('[background] Using DeepSeek API Model')
-      await generateAnswersWithDeepSeekApi(port, session.question, session, config.deepSeekApiKey)
-    } else if (isUsingOllamaApiModel(session)) {
-      console.debug('[background] Using Ollama API Model')
-      await generateAnswersWithOllamaApi(port, session.question, session)
-    } else if (isUsingOpenRouterApiModel(session)) {
-      console.debug('[background] Using OpenRouter API Model')
-      await generateAnswersWithOpenRouterApi(
-        port,
-        session.question,
-        session,
-        config.openRouterApiKey,
-      )
-    } else if (isUsingAimlApiModel(session)) {
-      console.debug('[background] Using AIML API Model')
-      await generateAnswersWithAimlApi(port, session.question, session, config.aimlApiKey)
     } else if (isUsingAzureOpenAiApiModel(session)) {
       console.debug('[background] Using Azure OpenAI API Model')
       await generateAnswersWithAzureOpenaiApi(port, session.question, session)
-    } else if (isUsingGptCompletionApiModel(session)) {
-      console.debug('[background] Using GPT Completion API Model')
-      await generateAnswersWithGptCompletionApi(port, session.question, session, config.apiKey)
     } else if (isUsingGithubThirdPartyApiModel(session)) {
       console.debug('[background] Using Github Third Party API Model')
       await generateAnswersWithWaylaidwandererApi(port, session.question, session)

src/components/ConversationCard/index.jsx

@@ -7,7 +7,7 @@ import {
   apiModeToModelName,
   createElementAtPosition,
   getApiModesFromConfig,
-  isApiModeSelected,
+  getUniquelySelectedApiModeIndex,
   isFirefox,
   isMobile,
   isSafari,
@@ -38,6 +38,7 @@ import { generateAnswersWithBingWebApi } from '../../services/apis/bing-web.mjs'
 import { handlePortError } from '../../services/wrappers.mjs'
 
 const logo = Browser.runtime.getURL('logo.png')
+const UNMATCHED_API_MODE_VALUE = '__current-session-api-mode__'
 
 class ConversationItemData extends Object {
   /**
@@ -67,9 +68,36 @@ function ConversationCard(props) {
 
   /**
    * @type {[ConversationItemData[], (conversationItemData: ConversationItemData[]) => void]}
-   */
+  */
   const [conversationItemData, setConversationItemData] = useState([])
   const config = useConfig()
+  const currentAiName =
+    session.aiName ||
+    modelNameToDesc(
+      session.apiMode && typeof session.apiMode === 'object'
+        ? apiModeToModelName(session.apiMode)
+        : session.modelName,
+      t,
+      config.customModelName,
+    ) ||
+    t(Models.customModel.desc)
+  const selectedApiModeIndex = useMemo(
+    () => getUniquelySelectedApiModeIndex(apiModes, session, { sessionCompat: true }),
+    [apiModes, session],
+  )
+  const selectedApiModeDesc =
+    selectedApiModeIndex !== -1
+      ? modelNameToDesc(
+          apiModeToModelName(apiModes[selectedApiModeIndex]),
+          t,
+          config.customModelName,
+        )
+      : ''
+  const selectedApiModeValue = selectedApiModeDesc
+    ? String(selectedApiModeIndex)
+    : !session.apiMode && session.modelName === 'customModel'
+    ? '-1'
+    : UNMATCHED_API_MODE_VALUE
 
   useLayoutEffect(() => {
     if (session.conversationRecords.length === 0) {
@@ -379,11 +407,16 @@ function ConversationCard(props) {
             style={props.notClampSize ? {} : { width: 0, flexGrow: 1 }}
             className="normal-button"
             required
+            value={selectedApiModeValue}
             onChange={(e) => {
+              if (e.target.value === UNMATCHED_API_MODE_VALUE) return
+
               let apiMode = null
               let modelName = 'customModel'
               if (e.target.value !== '-1') {
-                apiMode = apiModes[e.target.value]
+                const selectedApiMode = apiModes[Number(e.target.value)]
+                if (!selectedApiMode) return
+                apiMode = selectedApiMode
                 modelName = apiModeToModelName(apiMode)
               }
               const newSession = {
@@ -401,20 +434,23 @@ function ConversationCard(props) {
               else setSession(newSession)
             }}
           >
+            {selectedApiModeValue === UNMATCHED_API_MODE_VALUE && (
+              <option value={UNMATCHED_API_MODE_VALUE} disabled>
+                {currentAiName}
+              </option>
+            )}
             {apiModes.map((apiMode, index) => {
               const modelName = apiModeToModelName(apiMode)
               const desc = modelNameToDesc(modelName, t, config.customModelName)
               if (desc) {
                 return (
-                  <option value={index} key={index} selected={isApiModeSelected(apiMode, session)}>
+                  <option value={index} key={index}>
                     {desc}
                   </option>
                 )
               }
             })}
-            <option value={-1} selected={!session.apiMode && session.modelName === 'customModel'}>
-              {t(Models.customModel.desc)}
-            </option>
+            <option value={-1}>{t(Models.customModel.desc)}</option>
           </select>
         </span>
         {props.draggable && !completeDraggable && (