@@ -3665,6 +3801,14 @@ const handleOpenAIExchange = async (authCode: string) => {
const shouldCreateOpenAI = form.platform === 'openai'
const shouldCreateSora = form.platform === 'sora'
+ // Add model mapping for OpenAI OAuth accounts（透传模式下不应用）
+ if (shouldCreateOpenAI && !isOpenAIModelRestrictionDisabled.value) {
+ const modelMapping = buildModelMappingObject(modelRestrictionMode.value, allowedModels.value, modelMappings.value)
+ if (modelMapping) {
+ credentials.model_mapping = modelMapping
+ }
+ }
+
// 应用临时不可调度配置
if (!applyTempUnschedConfig(credentials)) {
return
@@ -3775,6 +3919,14 @@ const handleOpenAIValidateRT = async (refreshTokenInput: string) => {
const oauthExtra = oauthClient.buildExtraInfo(tokenInfo) as Record | undefined
const extra = buildOpenAIExtra(oauthExtra)
+ // Add model mapping for OpenAI OAuth accounts（透传模式下不应用）
+ if (shouldCreateOpenAI && !isOpenAIModelRestrictionDisabled.value) {
+ const modelMapping = buildModelMappingObject(modelRestrictionMode.value, allowedModels.value, modelMappings.value)
+ if (modelMapping) {
+ credentials.model_mapping = modelMapping
+ }
+ }
+
// Generate account name with index for batch
const accountName = refreshTokens.length > 1 ? `${form.name} #${i + 1}` : form.name
diff --git a/frontend/src/components/account/EditAccountModal.vue b/frontend/src/components/account/EditAccountModal.vue
index 0efa0b5743..daa38dc553 100644
--- a/frontend/src/components/account/EditAccountModal.vue
+++ b/frontend/src/components/account/EditAccountModal.vue
@@ -351,6 +351,142 @@
+
+
+
+
+
+
+ {{ t('admin.accounts.openai.modelRestrictionDisabledByPassthrough') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ t('admin.accounts.selectedModels', { count: allowedModels.length }) }}
+ {{
+ t('admin.accounts.supportsAllModels')
+ }}
+
+
+
+
+ {{ t('admin.accounts.mapRequestModels') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1698,9 +1834,33 @@ watch(
? 'https://generativelanguage.googleapis.com'
: 'https://api.anthropic.com'
editBaseUrl.value = platformDefaultUrl
- modelRestrictionMode.value = 'whitelist'
- modelMappings.value = []
- allowedModels.value = []
+
+ // Load model mappings for OpenAI OAuth accounts
+ if (newAccount.platform === 'openai' && newAccount.credentials) {
+ const oauthCredentials = newAccount.credentials as Record
+ const existingMappings = oauthCredentials.model_mapping as Record | undefined
+ if (existingMappings && typeof existingMappings === 'object') {
+ const entries = Object.entries(existingMappings)
+ const isWhitelistMode = entries.length > 0 && entries.every(([from, to]) => from === to)
+ if (isWhitelistMode) {
+ modelRestrictionMode.value = 'whitelist'
+ allowedModels.value = entries.map(([from]) => from)
+ modelMappings.value = []
+ } else {
+ modelRestrictionMode.value = 'mapping'
+ modelMappings.value = entries.map(([from, to]) => ({ from, to }))
+ allowedModels.value = []
+ }
+ } else {
+ modelRestrictionMode.value = 'whitelist'
+ modelMappings.value = []
+ allowedModels.value = []
+ }
+ } else {
+ modelRestrictionMode.value = 'whitelist'
+ modelMappings.value = []
+ allowedModels.value = []
+ }
customErrorCodesEnabled.value = false
selectedErrorCodes.value = []
}
@@ -2144,6 +2304,7 @@ const handleSubmit = async () => {
// Always update credentials for apikey type to handle model mapping changes
const newCredentials: Record = {
+ ...currentCredentials,
base_url: newBaseUrl
}
@@ -2164,6 +2325,8 @@ const handleSubmit = async () => {
const modelMapping = buildModelMappingObject(modelRestrictionMode.value, allowedModels.value, modelMappings.value)
if (modelMapping) {
newCredentials.model_mapping = modelMapping
+ } else {
+ delete newCredentials.model_mapping
}
} else if (currentCredentials.model_mapping) {
newCredentials.model_mapping = currentCredentials.model_mapping
@@ -2173,6 +2336,9 @@ const handleSubmit = async () => {
if (customErrorCodesEnabled.value) {
newCredentials.custom_error_codes_enabled = true
newCredentials.custom_error_codes = [...selectedErrorCodes.value]
+ } else {
+ delete newCredentials.custom_error_codes_enabled
+ delete newCredentials.custom_error_codes
}
// Add intercept warmup requests setting
@@ -2213,6 +2379,28 @@ const handleSubmit = async () => {
updatePayload.credentials = newCredentials
}
+ // OpenAI OAuth: persist model mapping to credentials
+ if (props.account.platform === 'openai' && props.account.type === 'oauth') {
+ const currentCredentials = (updatePayload.credentials as Record) ||
+ ((props.account.credentials as Record) || {})
+ const newCredentials: Record = { ...currentCredentials }
+ const shouldApplyModelMapping = !openaiPassthroughEnabled.value
+
+ if (shouldApplyModelMapping) {
+ const modelMapping = buildModelMappingObject(modelRestrictionMode.value, allowedModels.value, modelMappings.value)
+ if (modelMapping) {
+ newCredentials.model_mapping = modelMapping
+ } else {
+ delete newCredentials.model_mapping
+ }
+ } else if (currentCredentials.model_mapping) {
+ // 透传模式保留现有映射
+ newCredentials.model_mapping = currentCredentials.model_mapping
+ }
+
+ updatePayload.credentials = newCredentials
+ }
+
// Antigravity: persist model mapping to credentials (applies to all antigravity types)
// Antigravity 只支持映射模式
if (props.account.platform === 'antigravity') {
diff --git a/frontend/src/components/account/__tests__/AccountUsageCell.spec.ts b/frontend/src/components/account/__tests__/AccountUsageCell.spec.ts
index 64f15fc922..75bed98dda 100644
--- a/frontend/src/components/account/__tests__/AccountUsageCell.spec.ts
+++ b/frontend/src/components/account/__tests__/AccountUsageCell.spec.ts
@@ -71,4 +71,59 @@ describe('AccountUsageCell', () => {
expect(wrapper.text()).toContain('admin.accounts.usageWindow.gemini3Image|70|2026-03-01T09:00:00Z')
})
+
+ it('OpenAI OAuth 在无 codex 快照时会回退显示 usage 接口窗口', async () => {
+ getUsage.mockResolvedValue({
+ five_hour: {
+ utilization: 0,
+ resets_at: null,
+ remaining_seconds: 0,
+ window_stats: {
+ requests: 2,
+ tokens: 27700,
+ cost: 0.06,
+ standard_cost: 0.06,
+ user_cost: 0.06
+ }
+ },
+ seven_day: {
+ utilization: 0,
+ resets_at: null,
+ remaining_seconds: 0,
+ window_stats: {
+ requests: 2,
+ tokens: 27700,
+ cost: 0.06,
+ standard_cost: 0.06,
+ user_cost: 0.06
+ }
+ }
+ })
+
+ const wrapper = mount(AccountUsageCell, {
+ props: {
+ account: {
+ id: 2002,
+ platform: 'openai',
+ type: 'oauth',
+ extra: {}
+ } as any
+ },
+ global: {
+ stubs: {
+ UsageProgressBar: {
+ props: ['label', 'utilization', 'resetsAt', 'windowStats', 'color'],
+ template: '{{ label }}|{{ utilization }}|{{ windowStats?.tokens }}
'
+ },
+ AccountQuotaInfo: true
+ }
+ }
+ })
+
+ await flushPromises()
+
+ expect(getUsage).toHaveBeenCalledWith(2002)
+ expect(wrapper.text()).toContain('5h|0|27700')
+ expect(wrapper.text()).toContain('7d|0|27700')
+ })
})
diff --git a/frontend/src/components/keys/UseKeyModal.vue b/frontend/src/components/keys/UseKeyModal.vue
index 99d78f6974..46d2d597ce 100644
--- a/frontend/src/components/keys/UseKeyModal.vue
+++ b/frontend/src/components/keys/UseKeyModal.vue
@@ -269,6 +269,7 @@ const clientTabs = computed((): TabConfig[] => {
return [
{ id: 'codex', label: t('keys.useKeyModal.cliTabs.codexCli'), icon: TerminalIcon },
{ id: 'codex-ws', label: t('keys.useKeyModal.cliTabs.codexCliWs'), icon: TerminalIcon },
+ { id: 'claude', label: t('keys.useKeyModal.cliTabs.claudeCode'), icon: TerminalIcon },
{ id: 'opencode', label: t('keys.useKeyModal.cliTabs.opencode'), icon: TerminalIcon }
]
case 'gemini':
@@ -316,6 +317,9 @@ const currentTabs = computed(() => {
const platformDescription = computed(() => {
switch (props.platform) {
case 'openai':
+ if (activeClientTab.value === 'claude') {
+ return t('keys.useKeyModal.description')
+ }
return t('keys.useKeyModal.openai.description')
case 'gemini':
return t('keys.useKeyModal.gemini.description')
@@ -329,6 +333,9 @@ const platformDescription = computed(() => {
const platformNote = computed(() => {
switch (props.platform) {
case 'openai':
+ if (activeClientTab.value === 'claude') {
+ return t('keys.useKeyModal.note')
+ }
return activeTab.value === 'windows'
? t('keys.useKeyModal.openai.noteWindows')
: t('keys.useKeyModal.openai.note')
@@ -402,6 +409,9 @@ const currentFiles = computed((): FileConfig[] => {
switch (props.platform) {
case 'openai':
+ if (activeClientTab.value === 'claude') {
+ return generateAnthropicFiles(baseUrl, apiKey)
+ }
if (activeClientTab.value === 'codex-ws') {
return generateOpenAIWsFiles(baseUrl, apiKey)
}
diff --git a/frontend/src/composables/useModelWhitelist.ts b/frontend/src/composables/useModelWhitelist.ts
index 986a99f4b4..df59f8deb4 100644
--- a/frontend/src/composables/useModelWhitelist.ts
+++ b/frontend/src/composables/useModelWhitelist.ts
@@ -280,7 +280,10 @@ const openaiPresetMappings = [
{ label: 'GPT-5.1', from: 'gpt-5.1', to: 'gpt-5.1', color: 'bg-orange-100 text-orange-700 hover:bg-orange-200 dark:bg-orange-900/30 dark:text-orange-400' },
{ label: 'GPT-5.2', from: 'gpt-5.2', to: 'gpt-5.2', color: 'bg-red-100 text-red-700 hover:bg-red-200 dark:bg-red-900/30 dark:text-red-400' },
{ label: 'GPT-5.4', from: 'gpt-5.4', to: 'gpt-5.4', color: 'bg-rose-100 text-rose-700 hover:bg-rose-200 dark:bg-rose-900/30 dark:text-rose-400' },
- { label: 'GPT-5.1 Codex', from: 'gpt-5.1-codex', to: 'gpt-5.1-codex', color: 'bg-cyan-100 text-cyan-700 hover:bg-cyan-200 dark:bg-cyan-900/30 dark:text-cyan-400' }
+ { label: 'GPT-5.1 Codex', from: 'gpt-5.1-codex', to: 'gpt-5.1-codex', color: 'bg-cyan-100 text-cyan-700 hover:bg-cyan-200 dark:bg-cyan-900/30 dark:text-cyan-400' },
+ { label: 'Haiku→5.4', from: 'claude-haiku-4-5-20251001', to: 'gpt-5.4', color: 'bg-emerald-100 text-emerald-700 hover:bg-emerald-200 dark:bg-emerald-900/30 dark:text-emerald-400' },
+ { label: 'Opus→5.4', from: 'claude-opus-4-6', to: 'gpt-5.4', color: 'bg-purple-100 text-purple-700 hover:bg-purple-200 dark:bg-purple-900/30 dark:text-purple-400' },
+ { label: 'Sonnet→5.4', from: 'claude-sonnet-4-6', to: 'gpt-5.4', color: 'bg-blue-100 text-blue-700 hover:bg-blue-200 dark:bg-blue-900/30 dark:text-blue-400' }
]
const soraPresetMappings: { label: string; from: string; to: string; color: string }[] = []
diff --git a/frontend/src/i18n/locales/zh.ts b/frontend/src/i18n/locales/zh.ts
index 10f0e1651e..4bb6ef3f8d 100644
--- a/frontend/src/i18n/locales/zh.ts
+++ b/frontend/src/i18n/locales/zh.ts
@@ -2652,6 +2652,12 @@ export default {
allProtocols: '全部协议',
allStatus: '全部状态',
searchProxies: '搜索代理...',
+ protocols: {
+ http: 'HTTP',
+ https: 'HTTPS',
+ socks5: 'SOCKS5',
+ socks5h: 'SOCKS5H (远程 DNS)',
+ },
name: '名称',
protocol: '协议',
host: '主机',
diff --git a/frontend/src/views/user/KeysView.vue b/frontend/src/views/user/KeysView.vue
index 197a6044de..26d44f11f0 100644
--- a/frontend/src/views/user/KeysView.vue
+++ b/frontend/src/views/user/KeysView.vue
@@ -1638,17 +1638,21 @@ const executeCcsImport = (row: ApiKey, clientType: 'claude' | 'gemini') => {
headers: { "Authorization": "Bearer {{apiKey}}" }
},
extractor: function(response) {
+ const remaining = response?.remaining ?? response?.quota?.remaining ?? response?.balance;
+ const unit = response?.unit ?? response?.quota?.unit ?? "USD";
return {
- isValid: response.is_active || true,
- remaining: response.balance,
- unit: "USD"
+ isValid: response?.is_active ?? response?.isValid ?? true,
+ remaining,
+ unit
};
}
})`
+ const providerName = (publicSettings.value?.site_name || 'sub2api').trim() || 'sub2api'
+
const params = new URLSearchParams({
resource: 'provider',
app: app,
- name: 'sub2api',
+ name: providerName,
homepage: baseUrl,
endpoint: endpoint,
apiKey: row.key,