File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ import { getModelStrings, resolveOverriddenModel } from './modelStrings.js'
2424import { formatModelPricing , getOpus46CostTier } from '../modelCost.js'
2525import { getSettings_DEPRECATED } from '../settings/settings.js'
2626import type { PermissionMode } from '../permissions/PermissionMode.js'
27- import { getAPIProvider } from './providers.js'
27+ import { getAPIProvider , isFirstPartyAnthropicBaseUrl } from './providers.js'
2828import { LIGHTNING_BOLT } from '../../constants/figures.js'
2929import { isModelAllowed } from './modelAllowlist.js'
3030import { 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 }
You can’t perform that action at this time.
0 commit comments