Extend reasoning model support and fix error handling in API responses

- Add support for o3, o3-mini, o4-mini, gpt-5, gpt-5-mini, gpt-5-nano models
- Fix error checking in openai-api.mjs response handling to prevent runtime errors
- Refactor duplicated data.choices[0] access pattern with proper null safety
- Add isUsingReasoningModel function while maintaining backward compatibility

Co-authored-by: PeterDaveHello <[email protected]>

Author: Copilot

src/config/index.mjs

@@ -67,6 +67,12 @@ export const chatgptApiModelKeys = [
   'chatgptApi4_1_nano',
   'chatgptApiO1Preview',
   'chatgptApiO1Mini',
+  'chatgptApiO3Preview',
+  'chatgptApiO3Mini',
+  'chatgptApiO4Mini',
+  'chatgptApiGpt5',
+  'chatgptApiGpt5Mini',
+  'chatgptApiGpt5Nano',
 ]
 export const customApiModelKeys = ['customModel']
 export const ollamaApiModelKeys = ['ollamaModel']
@@ -260,6 +266,12 @@ export const Models = {
 
   chatgptApiO1Preview: { value: 'o1-preview', desc: 'ChatGPT (o1-preview)' },
   chatgptApiO1Mini: { value: 'o1-mini', desc: 'ChatGPT (o1-mini)' },
+  chatgptApiO3Preview: { value: 'o3-preview', desc: 'ChatGPT (o3-preview)' },
+  chatgptApiO3Mini: { value: 'o3-mini', desc: 'ChatGPT (o3-mini)' },
+  chatgptApiO4Mini: { value: 'o4-mini', desc: 'ChatGPT (o4-mini)' },
+  chatgptApiGpt5: { value: 'gpt-5', desc: 'ChatGPT (gpt-5)' },
+  chatgptApiGpt5Mini: { value: 'gpt-5-mini', desc: 'ChatGPT (gpt-5-mini)' },
+  chatgptApiGpt5Nano: { value: 'gpt-5-nano', desc: 'ChatGPT (gpt-5-nano)' },
 
   claude2WebFree: { value: '', desc: 'Claude.ai (Web)' },
   claude12Api: { value: 'claude-instant-1.2', desc: 'Claude.ai (API, Claude Instant 1.2)' },
@@ -548,6 +560,12 @@ export const defaultConfig = {
     'openRouter_openai_o3',
     'chatgptApiO1Preview',
     'chatgptApiO1Mini',
+    'chatgptApiO3Preview',
+    'chatgptApiO3Mini',
+    'chatgptApiO4Mini',
+    'chatgptApiGpt5',
+    'chatgptApiGpt5Mini',
+    'chatgptApiGpt5Nano',
   ],
   customApiModes: [
     {

src/services/apis/openai-api.mjs

@@ -65,10 +65,16 @@ export async function generateAnswersWithGptCompletionApi(port, question, sessio
         return
       }
 
-      answer += data.choices[0].text
+      const choice = data.choices?.[0]
+      if (!choice) {
+        console.debug('No choice in response data')
+        return
+      }
+
+      answer += choice.text
       port.postMessage({ answer: answer, done: false, session: null })
 
-      if (data.choices[0]?.finish_reason) {
+      if (choice.finish_reason) {
         finish()
         return
       }
@@ -190,17 +196,27 @@ export async function generateAnswersWithChatgptApiCompat(
 
       if (isO1Model) {
         // For o1 models (non-streaming), get the complete response
-        const content = data.choices[0]?.message?.content
+        const choice = data.choices?.[0]
+        if (!choice) {
+          console.debug('No choice in response data for o1 model')
+          return
+        }
+        const content = choice.message?.content
         if (content) {
           answer = content
           port.postMessage({ answer: answer, done: false, session: null })
           finish()
         }
       } else {
         // For non-o1 models (streaming), handle delta content
-        const delta = data.choices[0]?.delta?.content
-        const content = data.choices[0]?.message?.content
-        const text = data.choices[0]?.text
+        const choice = data.choices?.[0]
+        if (!choice) {
+          console.debug('No choice in response data')
+          return
+        }
+        const delta = choice.delta?.content
+        const content = choice.message?.content
+        const text = choice.text
         if (delta !== undefined) {
           answer += delta
         } else if (content) {
@@ -210,7 +226,7 @@ export async function generateAnswersWithChatgptApiCompat(
         }
         port.postMessage({ answer: answer, done: false, session: null })
 
-        if (data.choices[0]?.finish_reason) {
+        if (choice.finish_reason) {
           finish()
           return
         }

src/utils/model-name-convert.mjs

@@ -165,7 +165,22 @@ export function isInApiModeGroup(apiModeGroup, configOrSession) {
   return groupValue === apiModeGroup
 }
 
-export function isUsingO1Model(configOrSession) {
+export function isUsingReasoningModel(configOrSession) {
   const modelValue = getModelValue(configOrSession)
-  return modelValue && (modelValue === 'o1-preview' || modelValue === 'o1-mini')
+  return (
+    modelValue &&
+    (modelValue === 'o1-preview' ||
+      modelValue === 'o1-mini' ||
+      modelValue === 'o3-preview' ||
+      modelValue === 'o3-mini' ||
+      modelValue === 'o4-mini' ||
+      modelValue === 'gpt-5' ||
+      modelValue === 'gpt-5-mini' ||
+      modelValue === 'gpt-5-nano')
+  )
+}
+
+// Keep backward compatibility
+export function isUsingO1Model(configOrSession) {
+  return isUsingReasoningModel(configOrSession)
 }