fix: restrict ANTHROPIC_MODEL to anthropic-compatible providers in model picker
- Only show ANTHROPIC_MODEL env var model for firstParty/bedrock/vertex/foundry - Do not leak it into OpenAI/Gemini/Grok/CoStrict pickers - Remove settings.model from custom model options Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
3f7fa33aa1
commit
c1b7bbc2d3
|
|
@ -1,5 +1,4 @@
|
||||||
// biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
|
// biome-ignore-all assist/source/organizeImports: ANT-ONLY import markers must not be reordered
|
||||||
import { getInitialMainLoopModel } from '../../bootstrap/state.js'
|
|
||||||
import {
|
import {
|
||||||
isClaudeAISubscriber,
|
isClaudeAISubscriber,
|
||||||
isMaxSubscriber,
|
isMaxSubscriber,
|
||||||
|
|
@ -25,7 +24,6 @@ import {
|
||||||
getDefaultHaikuModel,
|
getDefaultHaikuModel,
|
||||||
getDefaultMainLoopModelSetting,
|
getDefaultMainLoopModelSetting,
|
||||||
getMarketingNameForModel,
|
getMarketingNameForModel,
|
||||||
getUserSpecifiedModelSetting,
|
|
||||||
isOpus1mMergeEnabled,
|
isOpus1mMergeEnabled,
|
||||||
getOpus46PricingSuffix,
|
getOpus46PricingSuffix,
|
||||||
renderDefaultModelSetting,
|
renderDefaultModelSetting,
|
||||||
|
|
@ -542,45 +540,31 @@ export function getModelOptions(fastMode = false): ModelOption[] {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add custom model from either the current model value or the initial one
|
// Add ANTHROPIC_MODEL env var model as a custom option, but only for
|
||||||
// if it is not already in the options.
|
// anthropic-compatible providers. settings.model is NOT added here.
|
||||||
let customModel: ModelSetting = null
|
const provider = getAPIProvider()
|
||||||
const currentMainLoopModel = getUserSpecifiedModelSetting()
|
const envModel =
|
||||||
const initialMainLoopModel = getInitialMainLoopModel()
|
provider === 'firstParty' ||
|
||||||
if (currentMainLoopModel !== undefined && currentMainLoopModel !== null) {
|
provider === 'bedrock' ||
|
||||||
customModel = currentMainLoopModel
|
provider === 'vertex' ||
|
||||||
} else if (initialMainLoopModel !== null) {
|
provider === 'foundry'
|
||||||
customModel = initialMainLoopModel
|
? process.env.ANTHROPIC_MODEL
|
||||||
}
|
: undefined
|
||||||
if (customModel === null || options.some(opt => opt.value === customModel)) {
|
|
||||||
return filterModelOptionsByAllowlist(options)
|
if (envModel && !options.some(opt => opt.value === envModel)) {
|
||||||
} else if (customModel === 'opusplan') {
|
const knownOption = getKnownModelOption(envModel)
|
||||||
return filterModelOptionsByAllowlist([...options, getOpusPlanOption()])
|
|
||||||
} else if (customModel === 'opus' && getAPIProvider() === 'firstParty') {
|
|
||||||
return filterModelOptionsByAllowlist([
|
|
||||||
...options,
|
|
||||||
getMaxOpusOption(fastMode),
|
|
||||||
])
|
|
||||||
} else if (customModel === 'opus[1m]' && getAPIProvider() === 'firstParty') {
|
|
||||||
return filterModelOptionsByAllowlist([
|
|
||||||
...options,
|
|
||||||
getMergedOpus1MOption(fastMode),
|
|
||||||
])
|
|
||||||
} else {
|
|
||||||
// Try to show a human-readable label for known Anthropic models, with an
|
|
||||||
// upgrade hint if the alias now resolves to a newer version.
|
|
||||||
const knownOption = getKnownModelOption(customModel)
|
|
||||||
if (knownOption) {
|
if (knownOption) {
|
||||||
options.push(knownOption)
|
options.push(knownOption)
|
||||||
} else {
|
} else {
|
||||||
options.push({
|
options.push({
|
||||||
value: customModel,
|
value: envModel,
|
||||||
label: customModel,
|
label: envModel,
|
||||||
description: 'Custom model',
|
description: 'Custom model (ANTHROPIC_MODEL)',
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
return filterModelOptionsByAllowlist(options)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return filterModelOptionsByAllowlist(options)
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user