From f7f69b759c7067f789ca84634f9bcd83812d4932 Mon Sep 17 00:00:00 2001 From: claude-code-best Date: Thu, 7 May 2026 11:10:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E5=88=AB=E5=90=8D=E6=9C=AA=E8=A7=A3=E6=9E=90=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=BD=B2=E5=90=8D=E6=98=BE=E7=A4=BA=20"haiku"=20=E8=80=8C?= =?UTF-8?q?=E9=9D=9E=E7=9C=9F=E5=AE=9E=E6=A8=A1=E5=9E=8B=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 去掉 getUserSpecifiedModelSetting() 分支,统一走 getMainLoopModel()(解析别名) + resolveProviderModel()(解析 provider 映射)的完整链路。 Co-Authored-By: opus[1m] --- src/utils/attributionModel.ts | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/src/utils/attributionModel.ts b/src/utils/attributionModel.ts index 91185feea..472dbc479 100644 --- a/src/utils/attributionModel.ts +++ b/src/utils/attributionModel.ts @@ -1,31 +1,24 @@ import { - getMainLoopModel, - getUserSpecifiedModelSetting, -} from './model/model.js' + resolveGeminiModel, + resolveGrokModel, + resolveOpenAIModel, +} from '@ant/model-provider' +import { getMainLoopModel } from './model/model.js' import { getAPIProvider } from './model/providers.js' -function getProviderModelEnv(): string | undefined { - const provider = getAPIProvider() - switch (provider) { +function resolveProviderModel(anthropicModel: string): string { + switch (getAPIProvider()) { case 'openai': - return process.env.OPENAI_MODEL + return resolveOpenAIModel(anthropicModel) case 'gemini': - return process.env.GEMINI_MODEL + return resolveGeminiModel(anthropicModel) case 'grok': - return process.env.GROK_MODEL + return resolveGrokModel(anthropicModel) default: - return undefined + return anthropicModel } } export function getRealModelName(): string { - const userSetting = getUserSpecifiedModelSetting() - if (userSetting !== undefined && userSetting !== null) { - return userSetting - } - const providerModel = getProviderModelEnv() - if (providerModel) { - return providerModel - } - return getMainLoopModel() + return resolveProviderModel(getMainLoopModel()) }