diff --git a/backend/crates/gateway-admin/src/model/observability.rs b/backend/crates/gateway-admin/src/model/observability.rs index 07cfc8ebf..b6706a290 100644 --- a/backend/crates/gateway-admin/src/model/observability.rs +++ b/backend/crates/gateway-admin/src/model/observability.rs @@ -471,6 +471,8 @@ pub struct DashboardAccountUsage { pub name: String, pub email: Option, pub plan_type: Option, + /// Admin 按 Provider 补齐的套餐展示名称。 + pub plan_type_display: Option, pub request_count: u64, pub success_count: u64, pub input_tokens: Option, diff --git a/backend/crates/gateway-admin/src/model/provider_credentials.rs b/backend/crates/gateway-admin/src/model/provider_credentials.rs index a4f0f218f..bae4ba1da 100644 --- a/backend/crates/gateway-admin/src/model/provider_credentials.rs +++ b/backend/crates/gateway-admin/src/model/provider_credentials.rs @@ -1019,6 +1019,8 @@ impl fmt::Debug for ProviderExport { #[derive(Debug, Clone, PartialEq)] pub struct AccountDirectoryItem { pub account: AccountRecord, + /// Provider 提供的套餐展示名称;未识别到套餐时为空。 + pub plan_type_display: Option, pub projection: gateway_core::account::AccountStatusProjection, pub usage: Option, pub quota: ProviderQuota, diff --git a/backend/crates/gateway-admin/src/ports/provider.rs b/backend/crates/gateway-admin/src/ports/provider.rs index fb6dde2ef..0ff37896f 100644 --- a/backend/crates/gateway-admin/src/ports/provider.rs +++ b/backend/crates/gateway-admin/src/ports/provider.rs @@ -91,6 +91,11 @@ impl ProviderAdminError { pub trait ProviderAdmin: Send + Sync { fn provider_kind(&self) -> &ProviderKind; + /// 将原始套餐值投影为展示名称;默认保留未知 Provider 的原始名称。 + fn plan_type_display(&self, plan_type: &str) -> String { + plan_type.to_owned() + } + /// 账号已经由控制面提交为不可调度状态,释放 Provider 持有的账号级运行时资源。 /// /// 无账号级运行时资源的 Provider 不需要执行额外操作。该通知发生在 Store 事务 @@ -230,6 +235,24 @@ impl ProviderAdminRegistry { .ok_or_else(|| ProviderAdminError::new(ProviderAdminErrorKind::Unsupported)) } + /// 账号页和 Dashboard 共用的套餐展示投影,不修改持久化的原始套餐值。 + pub(crate) fn plan_type_display( + &self, + provider_kind: &str, + plan_type: Option<&str>, + ) -> Option { + let plan_type = plan_type + .map(str::trim) + .filter(|value| !value.is_empty() && !value.eq_ignore_ascii_case("unknown"))?; + let provider = ProviderKind::new(provider_kind.to_owned()) + .ok() + .and_then(|kind| self.providers.get(&kind)); + Some(provider.map_or_else( + || plan_type.to_owned(), + |provider| provider.plan_type_display(plan_type), + )) + } + /// 返回所有已注册 Provider 的 Dashboard 上游身份画像。 pub fn dashboard_wire_profiles(&self) -> Vec { self.providers diff --git a/backend/crates/gateway-admin/src/use_case/accounts.rs b/backend/crates/gateway-admin/src/use_case/accounts.rs index f49adcd86..3a49e20fe 100644 --- a/backend/crates/gateway-admin/src/use_case/accounts.rs +++ b/backend/crates/gateway-admin/src/use_case/accounts.rs @@ -281,6 +281,10 @@ impl DefaultAccountsService { .await?; let usage = quota.representative_window_usage().cloned(); Ok(AccountDirectoryItem { + plan_type_display: self.providers.plan_type_display( + stored.account.provider_kind.as_str(), + stored.account.plan_type.as_deref(), + ), projection: stored.projection, usage, account: stored.account, @@ -369,6 +373,10 @@ impl AccountsService for DefaultAccountsService { .map(|(item, quota)| { let usage = quota.representative_window_usage().cloned(); AccountDirectoryItem { + plan_type_display: self.providers.plan_type_display( + item.account.provider_kind.as_str(), + item.account.plan_type.as_deref(), + ), usage, account: item.account, projection: item.projection, diff --git a/backend/crates/gateway-admin/src/use_case/observability.rs b/backend/crates/gateway-admin/src/use_case/observability.rs index 9f45a0efd..c651c827e 100644 --- a/backend/crates/gateway-admin/src/use_case/observability.rs +++ b/backend/crates/gateway-admin/src/use_case/observability.rs @@ -162,6 +162,11 @@ impl DefaultObservabilityService { ) .map_err(|error| map_store_error(error, "dashboard"))?; self.enrich_list_billing(&mut observation.recent_requests); + for account in &mut observation.account_usage { + account.plan_type_display = self + .providers + .plan_type_display(&account.provider_kind, account.plan_type.as_deref()); + } self.enrich_dashboard_quotas(&mut observation.account_usage) .await; let today_start = china_day_start(observation.range.end); diff --git a/backend/crates/gateway-admin/tests/use_case/accounts.rs b/backend/crates/gateway-admin/tests/use_case/accounts.rs index 6f5f35e9c..5f265678c 100644 --- a/backend/crates/gateway-admin/tests/use_case/accounts.rs +++ b/backend/crates/gateway-admin/tests/use_case/accounts.rs @@ -201,6 +201,10 @@ impl ProviderAdmin for FakeProviderAdmin { &self.kind } + fn plan_type_display(&self, plan_type: &str) -> String { + format!("{} display: {plan_type}", self.kind) + } + async fn account_unavailable(&self, _: &ProviderAccountId) { self.record("provider.account_unavailable"); } @@ -1320,9 +1324,11 @@ async fn accounts_batch_update_should_commit_once_and_notify_each_provider() { #[tokio::test] async fn accounts_list_should_return_complete_directory_semantics() { let provider = FakeProviderAdmin::new("openai", events()); - let store = FakeAccountStore::new("openai", events()); - let page = accounts_service(provider, store) - .await + let mut stored = account_record("openai"); + stored.plan_type = Some(" self_serve_business_prolite ".to_owned()); + let store = FakeAccountStore::with_account(stored, events()); + let services = accounts_service(provider, store).await; + let page = services .accounts() .list(AccountListQuery { page: 1, @@ -1344,6 +1350,27 @@ async fn accounts_list_should_return_complete_directory_semantics() { account.projection.status, gateway_admin::model::accounts::AccountStatus::Normal ); + assert_eq!( + ( + account.account.plan_type.as_deref(), + account.plan_type_display.as_deref(), + ), + ( + Some(" self_serve_business_prolite "), + Some("openai display: self_serve_business_prolite"), + ) + ); + + let detail = services + .accounts() + .quota( + &ProviderAccountId::new("acct_test").expect("account ID"), + false, + ) + .await + .expect("account detail"); + assert_eq!(detail.plan_type_display, account.plan_type_display); + assert_eq!(detail.account.plan_type, account.account.plan_type); } #[tokio::test] diff --git a/backend/crates/gateway-api/src/admin/accounts/presenter.rs b/backend/crates/gateway-api/src/admin/accounts/presenter.rs index d15c7fbfa..179e3c305 100644 --- a/backend/crates/gateway-api/src/admin/accounts/presenter.rs +++ b/backend/crates/gateway-api/src/admin/accounts/presenter.rs @@ -59,6 +59,7 @@ pub(super) fn account_models_data(result: ProviderModels) -> AccountModelsData { pub(super) fn account_view(item: AccountDirectoryItem, now: DateTime) -> AccountView { let AccountDirectoryItem { account, + plan_type_display, projection, usage, quota, @@ -89,6 +90,7 @@ pub(super) fn account_view(item: AccountDirectoryItem, now: DateTime) -> Ac user_id: account.upstream_user_id, label: None, plan_type: account.plan_type, + plan_type_display: plan_type_display.unwrap_or_else(|| "未知套餐".to_owned()), authentication_kind: account.authentication_kind, has_refresh_token: account.has_refresh_token, status, diff --git a/backend/crates/gateway-api/src/admin/accounts/wire.rs b/backend/crates/gateway-api/src/admin/accounts/wire.rs index bcc94cfd6..f4eb4c843 100644 --- a/backend/crates/gateway-api/src/admin/accounts/wire.rs +++ b/backend/crates/gateway-api/src/admin/accounts/wire.rs @@ -202,6 +202,8 @@ pub struct AccountView { pub user_id: Option, pub label: Option, pub plan_type: Option, + /// 后端生成的套餐展示名称;缺失套餐时为“未知套餐”。 + pub plan_type_display: String, pub authentication_kind: String, pub has_refresh_token: bool, pub status: String, diff --git a/backend/crates/gateway-api/src/admin/observability/presenter.rs b/backend/crates/gateway-api/src/admin/observability/presenter.rs index 8b7554a16..e2b480fb6 100644 --- a/backend/crates/gateway-api/src/admin/observability/presenter.rs +++ b/backend/crates/gateway-api/src/admin/observability/presenter.rs @@ -900,6 +900,10 @@ pub(crate) fn dashboard_view( .clone() .unwrap_or_else(|| credential.name.clone()), plan_type: credential.plan_type.clone(), + plan_type_display: credential + .plan_type_display + .clone() + .unwrap_or_else(|| "未知套餐".to_owned()), tokens: credential .total_tokens .map_or_else(|| "—".to_owned(), format_compact_number), diff --git a/backend/crates/gateway-api/src/admin/observability/wire.rs b/backend/crates/gateway-api/src/admin/observability/wire.rs index e8ec48d9c..f325d1aaa 100644 --- a/backend/crates/gateway-api/src/admin/observability/wire.rs +++ b/backend/crates/gateway-api/src/admin/observability/wire.rs @@ -373,6 +373,7 @@ pub struct DashboardAccountUsageView { pub authentication_kind: String, pub email: String, pub plan_type: Option, + pub plan_type_display: String, pub tokens: String, pub request_count: u64, pub request_buckets: Vec, diff --git a/backend/crates/gateway-api/tests/admin/observability/response.rs b/backend/crates/gateway-api/tests/admin/observability/response.rs index f7e9544c2..682cd02b9 100644 --- a/backend/crates/gateway-api/tests/admin/observability/response.rs +++ b/backend/crates/gateway-api/tests/admin/observability/response.rs @@ -64,6 +64,7 @@ fn dashboard_account_usage_should_keep_daily_request_timeline() { authentication_kind: "oauth".to_owned(), email: "account@example.com".to_owned(), plan_type: Some("free".to_owned()), + plan_type_display: "Free".to_owned(), tokens: "—".to_owned(), request_count: 3, request_buckets: vec![DashboardAccountRequestBucketView { diff --git a/backend/crates/gateway-store/src/postgres/observability/mapping.rs b/backend/crates/gateway-store/src/postgres/observability/mapping.rs index 07f49f9c1..24ce1f191 100644 --- a/backend/crates/gateway-store/src/postgres/observability/mapping.rs +++ b/backend/crates/gateway-store/src/postgres/observability/mapping.rs @@ -293,6 +293,7 @@ pub(crate) fn admin_dashboard_account_usage( name: usage.name, email: usage.email, plan_type: usage.plan_type, + plan_type_display: None, request_count: usage.request_count, success_count: usage.success_count, input_tokens: usage.input_tokens, diff --git a/backend/crates/providers/openai/src/admin.rs b/backend/crates/providers/openai/src/admin.rs index 92b209e73..cba208630 100644 --- a/backend/crates/providers/openai/src/admin.rs +++ b/backend/crates/providers/openai/src/admin.rs @@ -166,6 +166,30 @@ impl ProviderAdmin for OpenAiAdminProvider { &self.provider_kind } + fn plan_type_display(&self, plan_type: &str) -> String { + // 与官方 Desktop 的套餐名称映射一致;原始子类型继续由 plan_type 保留。 + match plan_type.to_ascii_lowercase().as_str() { + "free" | "free_workspace" | "guest" => "Free", + "go" => "Go", + "plus" => "Plus", + "pro" | "prolite" => "Pro", + "team" | "self_serve_business_prolite" | "self_serve_business_usage_based" => { + "Business" + } + "business" + | "ent26" + | "enterprise_cbp_automation" + | "enterprise_cbp_usage_based" + | "enterprise" + | "hc" => "Enterprise", + "edu" | "education" => "Edu", + "edu_plus" => "Edu Plus", + "edu_pro" => "Edu Pro", + _ => plan_type, + } + .to_owned() + } + async fn account_unavailable(&self, account_id: &ProviderAccountId) { self.websocket_pool.evict_account(account_id.as_str()).await; } diff --git a/docs/api.md b/docs/api.md index 4b29c3050..10f3b7f19 100644 --- a/docs/api.md +++ b/docs/api.md @@ -197,6 +197,10 @@ Responses wire 之间的协议转换层,转换只在 xAI Provider 内完成。 - `sortBy`: `email`、`status`、`planType`、`usage`、`lastUsedAt`、`expiresAt`; - `sortDirection`: `asc`、`desc`。 +账号视图和 Dashboard 账号概览中的 `planType` 保留原始套餐值;`planTypeDisplay` 是后端按 Provider 生成的展示名称, +前端直接展示该字段。OpenAI 的 `self_serve_business_prolite` 等 Team 套餐按官方客户端显示为 +`Business`;新套餐保留原始名称,空套餐或 `unknown` 显示为“未知套餐”。 + ### 账号连接测试 SSE `GET /api/admin/accounts/connection-test` 固定探测请求指定的账号,不参与普通账号轮换。成功流沿用 diff --git a/frontend/src/api/modules/accounts.ts b/frontend/src/api/modules/accounts.ts index e91d6fbcd..17e2a2f2b 100644 --- a/frontend/src/api/modules/accounts.ts +++ b/frontend/src/api/modules/accounts.ts @@ -119,6 +119,7 @@ export interface Account { userId: string | null label: string | null planType: string | null + planTypeDisplay: string authenticationKind: string hasRefreshToken: boolean status: AccountStatus diff --git a/frontend/src/api/modules/dashboard.ts b/frontend/src/api/modules/dashboard.ts index cc5eb13a0..adc8e441d 100644 --- a/frontend/src/api/modules/dashboard.ts +++ b/frontend/src/api/modules/dashboard.ts @@ -142,6 +142,7 @@ export interface DashboardAccountUsage { authenticationKind: string email: string planType: string | null + planTypeDisplay: string tokens: string requestCount: number requestBuckets: DashboardAccountRequestBucket[] diff --git a/frontend/src/views/accounts/components/AccountEditModal.vue b/frontend/src/views/accounts/components/AccountEditModal.vue index f05ced914..66b757768 100644 --- a/frontend/src/views/accounts/components/AccountEditModal.vue +++ b/frontend/src/views/accounts/components/AccountEditModal.vue @@ -48,7 +48,7 @@ const selectedGroupIds = defineModel('selectedGroupIds', { required: t size="lg" />
- + >['items'][number] -type AccountIdentity = Pick +type AccountIdentity = Pick & Partial> const props = withDefaults( @@ -83,7 +83,7 @@ const avatarToneClass = computed(() => { :class="metaGapClass" > - +
{ :class="metaGapClass" > - +
{{ secondaryText }} diff --git a/frontend/src/views/accounts/components/AccountPlanBadge.vue b/frontend/src/views/accounts/components/AccountPlanBadge.vue index 9d2683a39..c2721f07f 100644 --- a/frontend/src/views/accounts/components/AccountPlanBadge.vue +++ b/frontend/src/views/accounts/components/AccountPlanBadge.vue @@ -6,6 +6,7 @@ import { stableVisualIndex } from '../utils/visualTone' const props = withDefaults( defineProps<{ planType?: string | null + planTypeDisplay: string size?: 'xs' | 'sm' | 'md' }>(), { @@ -27,7 +28,7 @@ const fallbackPalettes = [ 'bg-cp-orange-container text-cp-orange-on-container', ] as const -const label = computed(() => props.planType?.trim() || 'Free') +const rawPlanType = computed(() => props.planType?.trim() || '') const sizeClass = computed(() => { if (props.size === 'xs') @@ -38,7 +39,7 @@ const sizeClass = computed(() => { }) const paletteClass = computed(() => { - const key = label.value.toLowerCase() + const key = rawPlanType.value.toLowerCase() const planPalette = planPalettes[key] if (planPalette) return planPalette @@ -49,9 +50,10 @@ const paletteClass = computed(() => { diff --git a/frontend/src/views/accounts/components/AccountProfileModal/ProfileHero.vue b/frontend/src/views/accounts/components/AccountProfileModal/ProfileHero.vue index 961e3fc4f..ae2a90fff 100644 --- a/frontend/src/views/accounts/components/AccountProfileModal/ProfileHero.vue +++ b/frontend/src/views/accounts/components/AccountProfileModal/ProfileHero.vue @@ -116,7 +116,7 @@ function formatDuration(value: number | null) {

{{ displayName }}

- +
{{ account.provider === 'xai' ? 'xAI 用量窗口' : 'Codex 额度' }} · 最近刷新: {{ account.quota.refreshedAtDisplay }} diff --git a/frontend/src/views/accounts/index.vue b/frontend/src/views/accounts/index.vue index 91fbfc338..bec440bf1 100644 --- a/frontend/src/views/accounts/index.vue +++ b/frontend/src/views/accounts/index.vue @@ -253,7 +253,7 @@ const {