sdaduanbilei/cc-haha
1
0
Fork 0
mirror of https://github.com/NanmiCoder/cc-haha synced 2026-07-20 13:53:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: model selection

Browse Source
This commit is contained in:
cynicalight 2026-04-30 10:14:55 +08:00
parent 2835426cf3
commit 9533c20d1d
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/services/api/client.ts
View File

@ -27,6 +27,7 @@ import {
OPENAI_OAUTH_DUMMY_KEY, OPENAI_OAUTH_DUMMY_KEY,
shouldUseOpenAICodexAuth, shouldUseOpenAICodexAuth,
} from '../openaiAuth/fetch.js' } from '../openaiAuth/fetch.js'
import { isOpenAIResponsesModel } from '../openaiAuth/models.js'
import { isDebugToStdErr, logForDebugging } from '../../utils/debug.js' import { isDebugToStdErr, logForDebugging } from '../../utils/debug.js'
import { import {
getAWSRegion, getAWSRegion,
@ -137,11 +138,13 @@ export async function getAnthropicClient({
await checkAndRefreshOAuthTokenIfNeeded() await checkAndRefreshOAuthTokenIfNeeded()
logForDebugging('[API:auth] OAuth token check complete') logForDebugging('[API:auth] OAuth token check complete')
const isOpenAIModel = model ? isOpenAIResponsesModel(model) : false
const usingOpenAICodex = const usingOpenAICodex =
shouldUseOpenAICodexAuth() && shouldUseOpenAICodexAuth() &&
!isClaudeAISubscriber() && !isClaudeAISubscriber() &&
!process.env.ANTHROPIC_AUTH_TOKEN && (isOpenAIModel ||
!(apiKey || getAnthropicApiKey()) (!process.env.ANTHROPIC_AUTH_TOKEN &&
!(apiKey || getAnthropicApiKey())))
if (!isClaudeAISubscriber() && !usingOpenAICodex) { if (!isClaudeAISubscriber() && !usingOpenAICodex) {
await configureApiKeyHeaders(defaultHeaders, getIsNonInteractiveSession()) await configureApiKeyHeaders(defaultHeaders, getIsNonInteractiveSession())

8
src/services/openaiAuth/models.ts
View File

@ -22,6 +22,12 @@ export const OPENAI_CODEX_MODEL_CATALOG: OpenAIModelCatalogEntry[] = [
description: 'Strong general-purpose model', description: 'Strong general-purpose model',
descriptionForModel: 'GPT-5.4 - strong general-purpose model', descriptionForModel: 'GPT-5.4 - strong general-purpose model',
}, },
{
value: 'gpt-5.5',
label: 'GPT-5.5',
description: 'Latest general-purpose model',
descriptionForModel: 'GPT-5.5 - latest general-purpose model',
},
{ {
value: OPENAI_DEFAULT_HAIKU_MODEL, value: OPENAI_DEFAULT_HAIKU_MODEL,
label: 'GPT-5.4 Mini', label: 'GPT-5.4 Mini',
@ -72,6 +78,8 @@ export function getOpenAIModelDisplayName(model: string): string | null {
switch (model.trim().toLowerCase()) { switch (model.trim().toLowerCase()) {
case 'gpt-5.3-codex': case 'gpt-5.3-codex':
return 'GPT-5.3 Codex' return 'GPT-5.3 Codex'
case 'gpt-5.5':
return 'GPT-5.5'
case 'gpt-5.4': case 'gpt-5.4':
return 'GPT-5.4' return 'GPT-5.4'
case 'gpt-5.4-mini': case 'gpt-5.4-mini':