Skip to content

Commit 86df024

Browse files
fix: 修复模型的问题
1 parent c3af450 commit 86df024

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/utils/model/model.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import { getModelStrings, resolveOverriddenModel } from './modelStrings.js'
2424
import { formatModelPricing, getOpus46CostTier } from '../modelCost.js'
2525
import { getSettings_DEPRECATED } from '../settings/settings.js'
2626
import type { PermissionMode } from '../permissions/PermissionMode.js'
27-
import { getAPIProvider } from './providers.js'
27+
import { getAPIProvider, isFirstPartyAnthropicBaseUrl } from './providers.js'
2828
import { LIGHTNING_BOLT } from '../../constants/figures.js'
2929
import { isModelAllowed } from './modelAllowlist.js'
3030
import { type ModelAlias, isModelAlias } from './aliases.js'
@@ -360,7 +360,8 @@ export function isOpus1mMergeEnabled(): boolean {
360360
if (
361361
is1mContextDisabled() ||
362362
isProSubscriber() ||
363-
getAPIProvider() !== 'firstParty'
363+
getAPIProvider() !== 'firstParty' ||
364+
!isFirstPartyAnthropicBaseUrl()
364365
) {
365366
return false
366367
}

0 commit comments

Comments
 (0)