Fix: Correct LLM provider naming in UI and internal code

- ChatGPT (API) -> OpenAI (API)
- ChatGPT (Azure API) -> Azure OpenAI (API)
- Claude.ai (API) -> Anthropic (API)
- Rename generateAnswersWithChatgptApi -> generateAnswersWithOpenAiApi

OpenAI and Anthropic are company names that provide APIs. ChatGPT and
Claude are product names (used for Web mode, which is unchanged).

Author: PeterDaveHello

src/background/index.mjs

@@ -6,7 +6,7 @@ import {
 } from '../services/apis/chatgpt-web'
 import { generateAnswersWithBingWebApi } from '../services/apis/bing-web.mjs'
 import {
-  generateAnswersWithChatgptApi,
+  generateAnswersWithOpenAiApi,
   generateAnswersWithGptCompletionApi,
 } from '../services/apis/openai-api'
 import { generateAnswersWithCustomApi } from '../services/apis/custom-api.mjs'
@@ -582,8 +582,8 @@ async function executeApi(session, port, config) {
       const cookies = await getBardCookies()
       await generateAnswersWithBardWebApi(port, session.question, session, cookies)
     } else if (isUsingChatgptApiModel(session)) {
-      console.debug('[background] Using ChatGPT API Model')
-      await generateAnswersWithChatgptApi(port, session.question, session, config.apiKey)
+      console.debug('[background] Using OpenAI API Model')
+      await generateAnswersWithOpenAiApi(port, session.question, session, config.apiKey)
     } else if (isUsingClaudeApiModel(session)) {
       console.debug('[background] Using Claude API Model')
       await generateAnswersWithClaudeApi(port, session.question, session)

src/config/index.mjs

@@ -156,11 +156,11 @@ export const ModelGroups = {
 
   chatgptApiModelKeys: {
     value: chatgptApiModelKeys,
-    desc: 'ChatGPT (API)',
+    desc: 'OpenAI (API)',
   },
   claudeApiModelKeys: {
     value: claudeApiModelKeys,
-    desc: 'Claude.ai (API)',
+    desc: 'Anthropic (API)',
   },
   moonshotApiModelKeys: {
     value: moonshotApiModelKeys,
@@ -176,7 +176,7 @@ export const ModelGroups = {
   },
   azureOpenAiApiModelKeys: {
     value: azureOpenAiApiModelKeys,
-    desc: 'ChatGPT (Azure API)',
+    desc: 'Azure OpenAI (API)',
   },
   gptApiModelKeys: {
     value: gptApiModelKeys,
@@ -220,75 +220,75 @@ export const Models = {
   chatgptPlus4: { value: 'gpt-4', desc: 'ChatGPT (Web, GPT-4)' },
   chatgptPlus4Browsing: { value: 'gpt-4', desc: 'ChatGPT (Web, GPT-4)' }, // for compatibility
 
-  chatgptApi35: { value: 'gpt-3.5-turbo', desc: 'ChatGPT (GPT-3.5-turbo)' },
-  chatgptApi35_16k: { value: 'gpt-3.5-turbo-16k', desc: 'ChatGPT (GPT-3.5-turbo-16k)' },
+  chatgptApi35: { value: 'gpt-3.5-turbo', desc: 'OpenAI (GPT-3.5-turbo)' },
+  chatgptApi35_16k: { value: 'gpt-3.5-turbo-16k', desc: 'OpenAI (GPT-3.5-turbo-16k)' },
 
-  chatgptApi4o_128k: { value: 'gpt-4o', desc: 'ChatGPT (GPT-4o, 128k)' },
-  chatgptApi4oMini: { value: 'gpt-4o-mini', desc: 'ChatGPT (GPT-4o mini)' },
-  chatgptApi4_8k: { value: 'gpt-4', desc: 'ChatGPT (GPT-4-8k)' },
+  chatgptApi4o_128k: { value: 'gpt-4o', desc: 'OpenAI (GPT-4o, 128k)' },
+  chatgptApi4oMini: { value: 'gpt-4o-mini', desc: 'OpenAI (GPT-4o mini)' },
+  chatgptApi4_8k: { value: 'gpt-4', desc: 'OpenAI (GPT-4-8k)' },
   chatgptApi4_128k: {
     value: 'gpt-4-turbo',
-    desc: 'ChatGPT (GPT-4-Turbo 128k)',
+    desc: 'OpenAI (GPT-4-Turbo 128k)',
   },
   chatgptApi4_128k_preview: {
     value: 'gpt-4-turbo-preview',
-    desc: 'ChatGPT (GPT-4-Turbo 128k Preview)',
+    desc: 'OpenAI (GPT-4-Turbo 128k Preview)',
   },
   chatgptApi4_128k_1106_preview: {
     value: 'gpt-4-1106-preview',
-    desc: 'ChatGPT (GPT-4-Turbo 128k 1106 Preview)',
+    desc: 'OpenAI (GPT-4-Turbo 128k 1106 Preview)',
   },
   chatgptApi4_128k_0125_preview: {
     value: 'gpt-4-0125-preview',
-    desc: 'ChatGPT (GPT-4-Turbo 128k 0125 Preview)',
+    desc: 'OpenAI (GPT-4-Turbo 128k 0125 Preview)',
   },
-  chatgptApi5Latest: { value: 'gpt-5-chat-latest', desc: 'ChatGPT (ChatGPT-5 latest)' },
-  chatgptApi5_1Latest: { value: 'gpt-5.1-chat-latest', desc: 'ChatGPT (ChatGPT-5.1 latest)' },
+  chatgptApi5Latest: { value: 'gpt-5-chat-latest', desc: 'OpenAI (GPT-5 latest)' },
+  chatgptApi5_1Latest: { value: 'gpt-5.1-chat-latest', desc: 'OpenAI (GPT-5.1 latest)' },
 
-  chatgptApi4_1: { value: 'gpt-4.1', desc: 'ChatGPT (GPT-4.1)' },
-  chatgptApi4_1_mini: { value: 'gpt-4.1-mini', desc: 'ChatGPT (GPT-4.1 mini)' },
-  chatgptApi4_1_nano: { value: 'gpt-4.1-nano', desc: 'ChatGPT (GPT-4.1 nano)' },
+  chatgptApi4_1: { value: 'gpt-4.1', desc: 'OpenAI (GPT-4.1)' },
+  chatgptApi4_1_mini: { value: 'gpt-4.1-mini', desc: 'OpenAI (GPT-4.1 mini)' },
+  chatgptApi4_1_nano: { value: 'gpt-4.1-nano', desc: 'OpenAI (GPT-4.1 nano)' },
 
   claude2WebFree: { value: '', desc: 'Claude.ai (Web)' },
   claude3HaikuApi: {
     value: 'claude-3-haiku-20240307',
-    desc: 'Claude.ai (API, Claude 3 Haiku)',
+    desc: 'Anthropic (API, Claude 3 Haiku)',
   },
   claude35HaikuApi: {
     value: 'claude-3-5-haiku-20241022',
-    desc: 'Claude.ai (API, Claude 3.5 Haiku)',
+    desc: 'Anthropic (API, Claude 3.5 Haiku)',
   },
   claude37SonnetApi: {
     value: 'claude-3-7-sonnet-20250219',
-    desc: 'Claude.ai (API, Claude 3.7 Sonnet)',
+    desc: 'Anthropic (API, Claude 3.7 Sonnet)',
   },
   claudeOpus4Api: {
     value: 'claude-opus-4-20250514',
-    desc: 'Claude.ai (API, Claude Opus 4)',
+    desc: 'Anthropic (API, Claude Opus 4)',
   },
   claudeOpus41Api: {
     value: 'claude-opus-4-1-20250805',
-    desc: 'Claude.ai (API, Claude Opus 4.1)',
+    desc: 'Anthropic (API, Claude Opus 4.1)',
   },
   claudeOpus45Api: {
     value: 'claude-opus-4-5',
-    desc: 'Claude.ai (API, Claude Opus 4.5)',
+    desc: 'Anthropic (API, Claude Opus 4.5)',
   },
   claudeOpus46Api: {
     value: 'claude-opus-4-6',
-    desc: 'Claude.ai (API, Claude Opus 4.6)',
+    desc: 'Anthropic (API, Claude Opus 4.6)',
   },
   claudeSonnet4Api: {
     value: 'claude-sonnet-4-20250514',
-    desc: 'Claude.ai (API, Claude Sonnet 4)',
+    desc: 'Anthropic (API, Claude Sonnet 4)',
   },
   claudeSonnet45Api: {
     value: 'claude-sonnet-4-5-20250929',
-    desc: 'Claude.ai (API, Claude Sonnet 4.5)',
+    desc: 'Anthropic (API, Claude Sonnet 4.5)',
   },
   claudeHaiku45Api: {
     value: 'claude-haiku-4-5-20251001',
-    desc: 'Claude.ai (API, Claude Haiku 4.5)',
+    desc: 'Anthropic (API, Claude Haiku 4.5)',
   },
 
   bingFree4: { value: '', desc: 'Bing (Web, GPT-4)' },
@@ -311,15 +311,15 @@ export const Models = {
   chatgptFree35Mobile: { value: 'text-davinci-002-render-sha-mobile', desc: 'ChatGPT (Mobile)' },
   chatgptPlus4Mobile: { value: 'gpt-4-mobile', desc: 'ChatGPT (Mobile, GPT-4)' },
 
-  chatgptApi35_1106: { value: 'gpt-3.5-turbo-1106', desc: 'ChatGPT (GPT-3.5-turbo 1106)' },
-  chatgptApi35_0125: { value: 'gpt-3.5-turbo-0125', desc: 'ChatGPT (GPT-3.5-turbo 0125)' },
-  chatgptApi4_8k_0613: { value: 'gpt-4', desc: 'ChatGPT (GPT-4-8k 0613)' },
+  chatgptApi35_1106: { value: 'gpt-3.5-turbo-1106', desc: 'OpenAI (GPT-3.5-turbo 1106)' },
+  chatgptApi35_0125: { value: 'gpt-3.5-turbo-0125', desc: 'OpenAI (GPT-3.5-turbo 0125)' },
+  chatgptApi4_8k_0613: { value: 'gpt-4', desc: 'OpenAI (GPT-4-8k 0613)' },
 
   gptApiInstruct: { value: 'gpt-3.5-turbo-instruct', desc: 'GPT-3.5-turbo Instruct' },
 
   customModel: { value: '', desc: 'Custom Model' },
   ollamaModel: { value: '', desc: 'Ollama API' },
-  azureOpenAi: { value: '', desc: 'ChatGPT (Azure)' },
+  azureOpenAi: { value: '', desc: 'Azure OpenAI' },
   waylaidwandererApi: { value: '', desc: 'Waylaidwanderer API (Github)' },
 
   poeAiWebSage: { value: 'Assistant', desc: 'Poe AI (Web, Assistant)' },

src/services/apis/aiml-api.mjs

@@ -1,4 +1,4 @@
-import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
+import { generateAnswersWithOpenAiApiCompat } from './openai-api.mjs'
 
 /**
  * @param {Browser.Runtime.Port} port
@@ -8,5 +8,5 @@ import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
  */
 export async function generateAnswersWithAimlApi(port, question, session, apiKey) {
   const baseUrl = 'https://api.aimlapi.com/v1'
-  return generateAnswersWithChatgptApiCompat(baseUrl, port, question, session, apiKey)
+  return generateAnswersWithOpenAiApiCompat(baseUrl, port, question, session, apiKey)
 }

src/services/apis/chatglm-api.mjs

@@ -1,6 +1,6 @@
 import { getUserConfig } from '../../config/index.mjs'
 // import { getToken } from '../../utils/jwt-token-generator.mjs'
-import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
+import { generateAnswersWithOpenAiApiCompat } from './openai-api.mjs'
 
 /**
  * @param {Runtime.Port} port
@@ -10,5 +10,5 @@ import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
 export async function generateAnswersWithChatGLMApi(port, question, session) {
   const baseUrl = 'https://open.bigmodel.cn/api/paas/v4'
   const config = await getUserConfig()
-  return generateAnswersWithChatgptApiCompat(baseUrl, port, question, session, config.chatglmApiKey)
+  return generateAnswersWithOpenAiApiCompat(baseUrl, port, question, session, config.chatglmApiKey)
 }

src/services/apis/deepseek-api.mjs

@@ -1,4 +1,4 @@
-import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
+import { generateAnswersWithOpenAiApiCompat } from './openai-api.mjs'
 
 /**
  * @param {Browser.Runtime.Port} port
@@ -8,5 +8,5 @@ import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
  */
 export async function generateAnswersWithDeepSeekApi(port, question, session, apiKey) {
   const baseUrl = 'https://api.deepseek.com'
-  return generateAnswersWithChatgptApiCompat(baseUrl, port, question, session, apiKey)
+  return generateAnswersWithOpenAiApiCompat(baseUrl, port, question, session, apiKey)
 }

src/services/apis/moonshot-api.mjs

@@ -1,4 +1,4 @@
-import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
+import { generateAnswersWithOpenAiApiCompat } from './openai-api.mjs'
 
 /**
  * @param {Browser.Runtime.Port} port
@@ -8,5 +8,5 @@ import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
  */
 export async function generateAnswersWithMoonshotCompletionApi(port, question, session, apiKey) {
   const baseUrl = 'https://api.moonshot.cn/v1'
-  return generateAnswersWithChatgptApiCompat(baseUrl, port, question, session, apiKey)
+  return generateAnswersWithOpenAiApiCompat(baseUrl, port, question, session, apiKey)
 }

src/services/apis/ollama-api.mjs

@@ -1,5 +1,5 @@
 import { getUserConfig } from '../../config/index.mjs'
-import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
+import { generateAnswersWithOpenAiApiCompat } from './openai-api.mjs'
 import { getModelValue } from '../../utils/model-name-convert.mjs'
 
 /**
@@ -10,7 +10,7 @@ import { getModelValue } from '../../utils/model-name-convert.mjs'
 export async function generateAnswersWithOllamaApi(port, question, session) {
   const config = await getUserConfig()
   const model = getModelValue(session)
-  return generateAnswersWithChatgptApiCompat(
+  return generateAnswersWithOpenAiApiCompat(
     config.ollamaEndpoint + '/v1',
     port,
     question,

src/services/apis/openai-api.mjs

@@ -96,9 +96,9 @@ export async function generateAnswersWithGptCompletionApi(port, question, sessio
  * @param {Session} session
  * @param {string} apiKey
  */
-export async function generateAnswersWithChatgptApi(port, question, session, apiKey) {
+export async function generateAnswersWithOpenAiApi(port, question, session, apiKey) {
   const config = await getUserConfig()
-  return generateAnswersWithChatgptApiCompat(
+  return generateAnswersWithOpenAiApiCompat(
     config.customOpenAiApiUrl + '/v1',
     port,
     question,
@@ -109,7 +109,7 @@ export async function generateAnswersWithChatgptApi(port, question, session, api
   )
 }
 
-export async function generateAnswersWithChatgptApiCompat(
+export async function generateAnswersWithOpenAiApiCompat(
   baseUrl,
   port,
   question,

src/services/apis/openrouter-api.mjs

@@ -1,4 +1,4 @@
-import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
+import { generateAnswersWithOpenAiApiCompat } from './openai-api.mjs'
 
 /**
  * @param {Browser.Runtime.Port} port
@@ -8,5 +8,5 @@ import { generateAnswersWithChatgptApiCompat } from './openai-api.mjs'
  */
 export async function generateAnswersWithOpenRouterApi(port, question, session, apiKey) {
   const baseUrl = 'https://openrouter.ai/api/v1'
-  return generateAnswersWithChatgptApiCompat(baseUrl, port, question, session, apiKey)
+  return generateAnswersWithOpenAiApiCompat(baseUrl, port, question, session, apiKey)
 }

tests/unit/services/apis/openai-api-compat.test.mjs

@@ -1,7 +1,7 @@
 import assert from 'node:assert/strict'
 import { beforeEach, test } from 'node:test'
 import {
-  generateAnswersWithChatgptApiCompat,
+  generateAnswersWithOpenAiApiCompat,
   generateAnswersWithGptCompletionApi,
 } from '../../../../src/services/apis/openai-api.mjs'
 import { createFakePort } from '../../helpers/port.mjs'
@@ -15,7 +15,7 @@ beforeEach(() => {
   globalThis.__TEST_BROWSER_SHIM__.clearStorage()
 })
 
-test('generateAnswersWithChatgptApiCompat sends expected request and aggregates SSE deltas', async (t) => {
+test('generateAnswersWithOpenAiApiCompat sends expected request and aggregates SSE deltas', async (t) => {
   t.mock.method(console, 'debug', () => {})
   setStorage({
     maxConversationContextLength: 3,
@@ -41,7 +41,7 @@ test('generateAnswersWithChatgptApiCompat sends expected request and aggregates
     ])
   })
 
-  await generateAnswersWithChatgptApiCompat(
+  await generateAnswersWithOpenAiApiCompat(
     'https://api.example.com/v1',
     port,
     'CurrentQ',
@@ -79,7 +79,7 @@ test('generateAnswersWithChatgptApiCompat sends expected request and aggregates
   assert.deepEqual(session.conversationRecords.at(-1), { question: 'CurrentQ', answer: 'Hello' })
 })
 
-test('generateAnswersWithChatgptApiCompat throws on non-ok response with JSON error body', async (t) => {
+test('generateAnswersWithOpenAiApiCompat throws on non-ok response with JSON error body', async (t) => {
   t.mock.method(console, 'debug', () => {})
   setStorage({
     maxConversationContextLength: 3,
@@ -104,7 +104,7 @@ test('generateAnswersWithChatgptApiCompat throws on non-ok response with JSON er
   )
 
   await assert.rejects(async () => {
-    await generateAnswersWithChatgptApiCompat(
+    await generateAnswersWithOpenAiApiCompat(
       'https://api.example.com/v1',
       port,
       'CurrentQ',
@@ -116,7 +116,7 @@ test('generateAnswersWithChatgptApiCompat throws on non-ok response with JSON er
   assert.deepEqual(port.listenerCounts(), { onMessage: 0, onDisconnect: 0 })
 })
 
-test('generateAnswersWithChatgptApiCompat throws on network error', async (t) => {
+test('generateAnswersWithOpenAiApiCompat throws on network error', async (t) => {
   t.mock.method(console, 'debug', () => {})
   setStorage({
     maxConversationContextLength: 3,
@@ -136,7 +136,7 @@ test('generateAnswersWithChatgptApiCompat throws on network error', async (t) =>
   })
 
   await assert.rejects(async () => {
-    await generateAnswersWithChatgptApiCompat(
+    await generateAnswersWithOpenAiApiCompat(
       'https://api.example.com/v1',
       port,
       'CurrentQ',
@@ -148,7 +148,7 @@ test('generateAnswersWithChatgptApiCompat throws on network error', async (t) =>
   assert.deepEqual(port.listenerCounts(), { onMessage: 0, onDisconnect: 0 })
 })
 
-test('generateAnswersWithChatgptApiCompat falls back to status text when JSON error parsing fails', async (t) => {
+test('generateAnswersWithOpenAiApiCompat falls back to status text when JSON error parsing fails', async (t) => {
   t.mock.method(console, 'debug', () => {})
   setStorage({
     maxConversationContextLength: 3,
@@ -175,7 +175,7 @@ test('generateAnswersWithChatgptApiCompat falls back to status text when JSON er
   )
 
   await assert.rejects(async () => {
-    await generateAnswersWithChatgptApiCompat(
+    await generateAnswersWithOpenAiApiCompat(
       'https://api.example.com/v1',
       port,
       'CurrentQ',
@@ -187,7 +187,7 @@ test('generateAnswersWithChatgptApiCompat falls back to status text when JSON er
   assert.deepEqual(port.listenerCounts(), { onMessage: 0, onDisconnect: 0 })
 })
 
-test('generateAnswersWithChatgptApiCompat supports message.content fallback', async (t) => {
+test('generateAnswersWithOpenAiApiCompat supports message.content fallback', async (t) => {
   t.mock.method(console, 'debug', () => {})
   setStorage({
     maxConversationContextLength: 2,
@@ -208,7 +208,7 @@ test('generateAnswersWithChatgptApiCompat supports message.content fallback', as
     ]),
   )
 
-  await generateAnswersWithChatgptApiCompat(
+  await generateAnswersWithOpenAiApiCompat(
     'https://api.example.com/v1',
     port,
     'CurrentQ',