From 198121d106ad2e3333f20c6f227664e6e7ce9291 Mon Sep 17 00:00:00 2001
From: panzeyu2013 <1971614652@qq.com>
Date: Wed, 27 May 2026 00:51:57 +0800
Subject: [PATCH 1/5] feat: allow per-model price configuration and
 auto-provision for aggregate API models

- Auto-create model_price_rules (price=0) when syncing aggregate API models
- Only insert on first sync, never overwrite existing user-set prices
- Add RPC endpoints: quota/modelPriceRules/list, read, upsert
- Add price input fields (input/cached/output per 1M tokens) to model edit modal
- Register Tauri commands for desktop support
- User-created rules use priority=20000,ID=user-{slug} to override official seeds
---
 apps/src-tauri/src/commands/apikey.rs         | 24 +++++
 apps/src-tauri/src/commands/registry.rs       |  3 +
 apps/src/app/models/page.tsx                  |  2 +
 .../components/modals/model-catalog-modal.tsx | 78 +++++++++++++++-
 apps/src/hooks/useManagedModels.ts            |  5 ++
 apps/src/lib/api/account-client.ts            | 48 ++++++++++
 apps/src/lib/api/transport-web-commands.ts    | 10 +++
 crates/core/src/rpc/types.rs                  | 54 +++++++++++
 crates/service/src/apikey/apikey_models.rs    | 62 ++++++++++++-
 crates/service/src/quota/read.rs              | 90 ++++++++++++++++++-
 crates/service/src/rpc_dispatch/quota.rs      | 33 ++++++-
 11 files changed, 403 insertions(+), 6 deletions(-)

diff --git a/apps/src-tauri/src/commands/apikey.rs b/apps/src-tauri/src/commands/apikey.rs
index 94ce312d6..aadd3bb75 100644
--- a/apps/src-tauri/src/commands/apikey.rs
+++ b/apps/src-tauri/src/commands/apikey.rs
@@ -347,3 +347,27 @@ pub async fn service_apikey_enable(
     let params = serde_json::json!({ "id": key_id });
     rpc_call_in_background("apikey/enable", addr, Some(params)).await
 }
+
+#[tauri::command]
+pub async fn service_model_price_rules_list(
+    addr: Option<String>,
+) -> Result<serde_json::Value, String> {
+    rpc_call_in_background("quota/modelPriceRules/list", addr, None).await
+}
+
+#[tauri::command]
+pub async fn service_model_price_rule_read(
+    addr: Option<String>,
+    model_pattern: String,
+) -> Result<serde_json::Value, String> {
+    let params = serde_json::json!({ "modelPattern": model_pattern });
+    rpc_call_in_background("quota/modelPriceRule/read", addr, Some(params)).await
+}
+
+#[tauri::command]
+pub async fn service_model_price_rule_upsert(
+    addr: Option<String>,
+    payload: serde_json::Value,
+) -> Result<serde_json::Value, String> {
+    rpc_call_in_background("quota/modelPriceRule/upsert", addr, Some(payload)).await
+}
diff --git a/apps/src-tauri/src/commands/registry.rs b/apps/src-tauri/src/commands/registry.rs
index 9507dfdbf..589ee193d 100644
--- a/apps/src-tauri/src/commands/registry.rs
+++ b/apps/src-tauri/src/commands/registry.rs
@@ -132,6 +132,9 @@ macro_rules! invoke_handler {
             crate::commands::apikey::service_model_source_model_save,
             crate::commands::apikey::service_model_source_mapping_save,
             crate::commands::apikey::service_model_source_mapping_delete,
+            crate::commands::apikey::service_model_price_rules_list,
+            crate::commands::apikey::service_model_price_rule_read,
+            crate::commands::apikey::service_model_price_rule_upsert,
             crate::commands::apikey::service_apikey_usage_stats,
             crate::commands::apikey::service_apikey_update_model,
             crate::commands::apikey::service_apikey_delete,
diff --git a/apps/src/app/models/page.tsx b/apps/src/app/models/page.tsx
index 7e173a983..4323a2646 100644
--- a/apps/src/app/models/page.tsx
+++ b/apps/src/app/models/page.tsx
@@ -133,6 +133,7 @@ export default function ModelsPage() {
     isServiceReady,
     refreshRemote,
     saveModel,
+    saveModelPriceRule,
     deleteModel,
     deleteModels,
     exportCodexCache,
@@ -1410,6 +1411,7 @@ export default function ModelsPage() {
         nextSortIndex={nextSortIndex}
         isSaving={isSaving}
         onSave={saveModel}
+        onSavePriceRule={saveModelPriceRule}
       />
       ) : null}
 
diff --git a/apps/src/components/modals/model-catalog-modal.tsx b/apps/src/components/modals/model-catalog-modal.tsx
index 7172ca169..e6660b749 100644
--- a/apps/src/components/modals/model-catalog-modal.tsx
+++ b/apps/src/components/modals/model-catalog-modal.tsx
@@ -24,7 +24,7 @@ import {
   SelectTrigger,
   SelectValue,
 } from "@/components/ui/select";
-import { ManagedModelPayload } from "@/lib/api/account-client";
+import { ManagedModelPayload, ModelPriceRuleUpsertPayload } from "@/lib/api/account-client";
 import { useI18n } from "@/lib/i18n/provider";
 import { ManagedModelInfo } from "@/types";
 
@@ -35,6 +35,7 @@ interface ModelCatalogModalProps {
   nextSortIndex: number;
   isSaving?: boolean;
   onSave: (payload: ManagedModelPayload) => Promise<ManagedModelInfo | null>;
+  onSavePriceRule?: (payload: ModelPriceRuleUpsertPayload) => Promise<void>;
 }
 
 interface ModelCatalogDraft {
@@ -49,6 +50,9 @@ interface ModelCatalogDraft {
   visibility: string;
   defaultReasoningLevel: string;
   advancedJson: string;
+  inputPricePer1m: string;
+  cachedInputPricePer1m: string;
+  outputPricePer1m: string;
 }
 
 const EDITABLE_ADVANCED_KEYS = [
@@ -208,6 +212,9 @@ function buildDraft(
     visibility: normalizeVisibilityValue(model?.visibility),
     defaultReasoningLevel: model?.defaultReasoningLevel || "",
     advancedJson: buildAdvancedJson(model),
+    inputPricePer1m: "",
+    cachedInputPricePer1m: "",
+    outputPricePer1m: "",
   };
 }
 
@@ -261,6 +268,7 @@ export function ModelCatalogModal({
   nextSortIndex,
   isSaving = false,
   onSave,
+  onSavePriceRule,
 }: ModelCatalogModalProps) {
   const { t } = useI18n();
   const [draft, setDraft] = useState<ModelCatalogDraft>(() =>
@@ -320,6 +328,23 @@ export function ModelCatalogModal({
       model: nextModel,
     });
     if (saved) {
+      if (onSavePriceRule && slug) {
+        const ip = draft.inputPricePer1m.trim();
+        const cp = draft.cachedInputPricePer1m.trim();
+        const op = draft.outputPricePer1m.trim();
+        if (ip !== "" || cp !== "" || op !== "") {
+          try {
+            await onSavePriceRule({
+              modelPattern: slug,
+              inputPricePer1m: ip !== "" ? Number(ip) : null,
+              cachedInputPricePer1m: cp !== "" ? Number(cp) : null,
+              outputPricePer1m: op !== "" ? Number(op) : null,
+            });
+          } catch {
+            // price save is non-fatal
+          }
+        }
+      }
       onOpenChange(false);
     }
   };
@@ -500,6 +525,57 @@ export function ModelCatalogModal({
               </Card>
             </div>
 
+            <div className="space-y-2">
+              <Label className="text-sm font-medium">{t("Token 价格 (USD / 1M tokens)")}</Label>
+              <p className="text-xs text-muted-foreground">
+                {t("零表示不计费，价格将用于请求成本估算。")}
+              </p>
+            </div>
+            <div className="grid gap-4 md:grid-cols-3">
+              <div className="space-y-2">
+                <Label htmlFor="price-input">{t("输入价格")}</Label>
+                <Input
+                  id="price-input"
+                  type="number"
+                  step="0.0001"
+                  min="0"
+                  value={draft.inputPricePer1m}
+                  onChange={(event) =>
+                    updateDraft("inputPricePer1m", event.target.value)
+                  }
+                  placeholder="0"
+                />
+              </div>
+              <div className="space-y-2">
+                <Label htmlFor="price-cached">{t("缓存输入价格")}</Label>
+                <Input
+                  id="price-cached"
+                  type="number"
+                  step="0.0001"
+                  min="0"
+                  value={draft.cachedInputPricePer1m}
+                  onChange={(event) =>
+                    updateDraft("cachedInputPricePer1m", event.target.value)
+                  }
+                  placeholder="0"
+                />
+              </div>
+              <div className="space-y-2">
+                <Label htmlFor="price-output">{t("输出价格")}</Label>
+                <Input
+                  id="price-output"
+                  type="number"
+                  step="0.0001"
+                  min="0"
+                  value={draft.outputPricePer1m}
+                  onChange={(event) =>
+                    updateDraft("outputPricePer1m", event.target.value)
+                  }
+                  placeholder="0"
+                />
+              </div>
+            </div>
+
             <div className="space-y-2">
               <Label htmlFor="model-advanced-json">{t("高级 JSON")}</Label>
               <Textarea
diff --git a/apps/src/hooks/useManagedModels.ts b/apps/src/hooks/useManagedModels.ts
index 1ae158f20..214e868fb 100644
--- a/apps/src/hooks/useManagedModels.ts
+++ b/apps/src/hooks/useManagedModels.ts
@@ -9,6 +9,7 @@ import {
   ManagedModelSourceMappingPayload,
   ManagedModelSourceModelPayload,
   ManagedModelSourceSyncPayload,
+  ModelPriceRuleUpsertPayload,
 } from "@/lib/api/account-client";
 import { serviceClient } from "@/lib/api/service-client";
 import {
@@ -405,6 +406,10 @@ export function useManagedModels() {
       if (!ensureServiceReady("保存模型")) return null;
       return saveMutation.mutateAsync(params);
     },
+    saveModelPriceRule: async (params: ModelPriceRuleUpsertPayload) => {
+      if (!ensureServiceReady("保存模型价格")) return;
+      await accountClient.upsertModelPriceRule(params);
+    },
     deleteModel: async (slug: string) => {
       if (!ensureServiceReady("删除模型")) return false;
       await deleteMutation.mutateAsync(slug);
diff --git a/apps/src/lib/api/account-client.ts b/apps/src/lib/api/account-client.ts
index 5b887d7cf..16cd084d9 100644
--- a/apps/src/lib/api/account-client.ts
+++ b/apps/src/lib/api/account-client.ts
@@ -160,6 +160,33 @@ export interface ManagedModelSourceMappingPayload {
   billingModelSlug?: string | null;
 }
 
+export interface ModelPriceRuleEntry {
+  id: string;
+  provider: string;
+  modelPattern: string;
+  matchType: string;
+  inputPricePer1m: number | null;
+  cachedInputPricePer1m: number | null;
+  outputPricePer1m: number | null;
+  enabled: boolean;
+  priority: number;
+  source: string;
+  createdAt: number;
+  updatedAt: number;
+}
+
+export interface ModelPriceRuleUpsertPayload {
+  id?: string | null;
+  provider?: string | null;
+  modelPattern: string;
+  matchType?: string | null;
+  inputPricePer1m?: number | null;
+  cachedInputPricePer1m?: number | null;
+  outputPricePer1m?: number | null;
+  enabled?: boolean | null;
+  priority?: number | null;
+}
+
 export interface AggregateApiSupplierModelPayload {
   supplierKey: string;
   providerType: string;
@@ -861,6 +888,27 @@ export const accountClient = {
   },
   deleteManagedModel: (slug: string) =>
     invoke("service_model_catalog_delete", withAddr({ slug })),
+  listModelPriceRules: async () => {
+    const result = await invoke<{ items: ModelPriceRuleEntry[] }>(
+      "service_model_price_rules_list",
+      withAddr(),
+    );
+    return result.items;
+  },
+  readModelPriceRule: async (modelPattern: string) => {
+    const result = await invoke<ModelPriceRuleEntry | null>(
+      "service_model_price_rule_read",
+      withAddr({ modelPattern }),
+    );
+    return result;
+  },
+  upsertModelPriceRule: async (payload: ModelPriceRuleUpsertPayload) => {
+    const result = await invoke<ModelPriceRuleEntry>(
+      "service_model_price_rule_upsert",
+      withAddr({ payload }),
+    );
+    return result;
+  },
   async readApiKeySecret(keyId: string): Promise<string> {
     const result = await invoke<unknown>(
       "service_apikey_read_secret",
diff --git a/apps/src/lib/api/transport-web-commands.ts b/apps/src/lib/api/transport-web-commands.ts
index 2e796bbe5..074b677c5 100644
--- a/apps/src/lib/api/transport-web-commands.ts
+++ b/apps/src/lib/api/transport-web-commands.ts
@@ -544,6 +544,16 @@ export function createWebCommandMap(
     service_model_source_mapping_delete: {
       rpcMethod: "apikey/modelSourceMappingDelete",
     },
+    service_model_price_rules_list: {
+      rpcMethod: "quota/modelPriceRules/list",
+    },
+    service_model_price_rule_read: {
+      rpcMethod: "quota/modelPriceRule/read",
+    },
+    service_model_price_rule_upsert: {
+      rpcMethod: "quota/modelPriceRule/upsert",
+      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
+    },
     service_apikey_read_secret: {
       rpcMethod: "apikey/readSecret",
       mapParams: mapKeyIdToId,
diff --git a/crates/core/src/rpc/types.rs b/crates/core/src/rpc/types.rs
index 5c84826da..6b7bea885 100644
--- a/crates/core/src/rpc/types.rs
+++ b/crates/core/src/rpc/types.rs
@@ -1656,6 +1656,60 @@ pub struct MemberDashboardSummaryResult {
     pub alerts: Vec<MemberDashboardAlert>,
 }
 
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelPriceRuleEntry {
+    pub id: String,
+    pub provider: String,
+    pub model_pattern: String,
+    pub match_type: String,
+    #[serde(default)]
+    pub input_price_per_1m: Option<f64>,
+    #[serde(default)]
+    pub cached_input_price_per_1m: Option<f64>,
+    #[serde(default)]
+    pub output_price_per_1m: Option<f64>,
+    #[serde(default)]
+    pub enabled: bool,
+    #[serde(default)]
+    pub priority: i64,
+    #[serde(default)]
+    pub source: String,
+    #[serde(default)]
+    pub created_at: i64,
+    #[serde(default)]
+    pub updated_at: i64,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelPriceRuleListResult {
+    #[serde(default)]
+    pub items: Vec<ModelPriceRuleEntry>,
+}
+
+#[derive(Debug, Clone, Default, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct ModelPriceRuleUpsertInput {
+    #[serde(default)]
+    pub id: Option<String>,
+    #[serde(default)]
+    pub provider: Option<String>,
+    pub model_pattern: String,
+    #[serde(default)]
+    pub match_type: Option<String>,
+    #[serde(default)]
+    pub input_price_per_1m: Option<f64>,
+    #[serde(default)]
+    pub cached_input_price_per_1m: Option<f64>,
+    #[serde(default)]
+    pub output_price_per_1m: Option<f64>,
+    #[serde(default)]
+    pub enabled: Option<bool>,
+    #[serde(default)]
+    pub priority: Option<i64>,
+}
+
 #[cfg(test)]
 #[path = "tests/types_tests.rs"]
 mod tests;
diff --git a/crates/service/src/apikey/apikey_models.rs b/crates/service/src/apikey/apikey_models.rs
index c7bffb181..f1a7dc161 100644
--- a/crates/service/src/apikey/apikey_models.rs
+++ b/crates/service/src/apikey/apikey_models.rs
@@ -9,7 +9,7 @@ use codexmanager_core::rpc::types::{
 };
 use codexmanager_core::storage::{
     now_ts, ModelCatalogModelRecord, ModelCatalogReasoningLevelRecord, ModelCatalogScopeRecord,
-    ModelCatalogStringItemRecord, ModelSourceMapping, ModelSourceModel, Storage,
+    ModelCatalogStringItemRecord, ModelPriceRule, ModelSourceMapping, ModelSourceModel, Storage,
 };
 use rand::RngCore;
 use serde_json::Value;
@@ -894,7 +894,7 @@ fn auto_associate_source_models(
     }
 
     let now = now_ts();
-    for source_model in source_models {
+    for source_model in &source_models {
         if !platform_slugs.contains(source_model.upstream_model.as_str()) {
             continue;
         }
@@ -906,7 +906,7 @@ fn auto_associate_source_models(
             platform_model_slug: source_model.upstream_model.clone(),
             source_kind: source_kind.to_string(),
             source_id: source_id.to_string(),
-            upstream_model: source_model.upstream_model,
+            upstream_model: source_model.upstream_model.clone(),
             enabled: true,
             priority: 0,
             weight: 1,
@@ -918,6 +918,62 @@ fn auto_associate_source_models(
             .upsert_model_source_mapping(&mapping)
             .map_err(|err| format!("save model mapping failed: {err}"))?;
     }
+
+    if source_kind == ROUTING_SOURCE_KIND_AGGREGATE_API && auto_create_platform_models {
+        ensure_model_price_rules_for_aggregate_api(storage, source_id, &source_models)?;
+    }
+
+    Ok(())
+}
+
+fn ensure_model_price_rules_for_aggregate_api(
+    storage: &Storage,
+    source_id: &str,
+    source_models: &[ModelSourceModel],
+) -> Result<(), String> {
+    let existing_patterns: HashSet<String> = storage
+        .list_enabled_model_price_rules()
+        .map_err(|err| format!("list model price rules failed: {err}"))?
+        .into_iter()
+        .map(|rule| rule.model_pattern.to_ascii_lowercase())
+        .collect();
+
+    let now = now_ts();
+    for model in source_models {
+        let slug = model.upstream_model.trim();
+        if slug.is_empty() || existing_patterns.contains(&slug.to_ascii_lowercase()) {
+            continue;
+        }
+        storage
+            .upsert_model_price_rule(&ModelPriceRule {
+                id: format!("agg-sync-{source_id}-{slug}"),
+                provider: "openai".to_string(),
+                model_pattern: slug.to_string(),
+                match_type: "exact".to_string(),
+                billing_mode: "standard".to_string(),
+                currency: "USD".to_string(),
+                unit: "per_1m_tokens".to_string(),
+                input_price_per_1m: Some(0.0),
+                cached_input_price_per_1m: Some(0.0),
+                output_price_per_1m: Some(0.0),
+                reasoning_output_price_per_1m: None,
+                cache_write_5m_price_per_1m: None,
+                cache_write_1h_price_per_1m: None,
+                cache_hit_price_per_1m: None,
+                long_context_threshold_tokens: None,
+                long_context_input_price_per_1m: None,
+                long_context_cached_input_price_per_1m: None,
+                long_context_output_price_per_1m: None,
+                source: "aggregate_api_sync".to_string(),
+                source_url: None,
+                seed_version: None,
+                enabled: true,
+                priority: -10,
+                created_at: now,
+                updated_at: now,
+            })
+            .map_err(|err| format!("upsert model price rule for {slug} failed: {err}"))?;
+    }
     Ok(())
 }
 
diff --git a/crates/service/src/quota/read.rs b/crates/service/src/quota/read.rs
index 9e8e69faf..541032888 100644
--- a/crates/service/src/quota/read.rs
+++ b/crates/service/src/quota/read.rs
@@ -3,6 +3,7 @@ use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet};
 use chrono::{Duration, Local, LocalResult, TimeZone};
 use codexmanager_core::rpc::types::{
     AccountQuotaCapacityOverrideResult, AccountQuotaCapacityTemplateResult, BillingRuleResult,
+    ModelPriceRuleEntry, ModelPriceRuleListResult, ModelPriceRuleUpsertInput,
     QuotaAggregateApiOverviewResult, QuotaApiKeyModelUsageItem, QuotaApiKeyOverviewResult,
     QuotaApiKeyUsageItem, QuotaApiKeyUsageResult, QuotaBillingRulesResult,
     QuotaCapacityConfigResult, QuotaModelPoolItem, QuotaModelPoolsResult, QuotaModelUsageItem,
@@ -12,7 +13,7 @@ use codexmanager_core::rpc::types::{
     QuotaSystemPoolResult, QuotaTodayUsageResult,
 };
 use codexmanager_core::storage::{
-    Account, AccountQuotaCapacityOverride, AccountQuotaCapacityTemplate, AccountSubscription,
+    now_ts, Account, AccountQuotaCapacityOverride, AccountQuotaCapacityTemplate, AccountSubscription,
     AggregateApi, ApiKey, BillingRule, ModelPriceRule, QuotaSourceModelAssignment, Token,
     UsageSnapshotRecord,
 };
@@ -1482,6 +1483,93 @@ pub(crate) fn refresh_quota_sources(
     Ok(QuotaRefreshSourcesResult { items })
 }
 
+pub(crate) fn list_model_price_rules() -> Result<ModelPriceRuleListResult, String> {
+    let storage = open_storage().ok_or_else(|| "open storage failed".to_string())?;
+    let rules = storage
+        .list_enabled_model_price_rules()
+        .map_err(|err| format!("list model price rules failed: {err}"))?;
+    Ok(ModelPriceRuleListResult {
+        items: rules.into_iter().map(price_rule_entry).collect(),
+    })
+}
+
+pub(crate) fn read_model_price_rule(
+    model_pattern: &str,
+) -> Result<Option<ModelPriceRuleEntry>, String> {
+    let storage = open_storage().ok_or_else(|| "open storage failed".to_string())?;
+    let rules = storage
+        .list_enabled_model_price_rules()
+        .map_err(|err| format!("list model price rules failed: {err}"))?;
+    let normalized = model_pattern.trim().to_ascii_lowercase();
+    Ok(rules
+        .into_iter()
+        .find(|rule| rule.model_pattern.to_ascii_lowercase() == normalized)
+        .map(price_rule_entry))
+}
+
+pub(crate) fn upsert_model_price_rule(
+    input: ModelPriceRuleUpsertInput,
+) -> Result<ModelPriceRuleEntry, String> {
+    let storage = open_storage().ok_or_else(|| "open storage failed".to_string())?;
+    let now = now_ts();
+    let id = input
+        .id
+        .filter(|v| !v.is_empty())
+        .unwrap_or_else(|| format!("user-{}", input.model_pattern));
+    let rule = ModelPriceRule {
+        id,
+        provider: input
+            .provider
+            .unwrap_or_else(|| "openai".to_string()),
+        model_pattern: input.model_pattern,
+        match_type: input
+            .match_type
+            .unwrap_or_else(|| "exact".to_string()),
+        billing_mode: "standard".to_string(),
+        currency: "USD".to_string(),
+        unit: "per_1m_tokens".to_string(),
+        input_price_per_1m: input.input_price_per_1m,
+        cached_input_price_per_1m: input.cached_input_price_per_1m,
+        output_price_per_1m: input.output_price_per_1m,
+        reasoning_output_price_per_1m: None,
+        cache_write_5m_price_per_1m: None,
+        cache_write_1h_price_per_1m: None,
+        cache_hit_price_per_1m: None,
+        long_context_threshold_tokens: None,
+        long_context_input_price_per_1m: None,
+        long_context_cached_input_price_per_1m: None,
+        long_context_output_price_per_1m: None,
+        source: "custom".to_string(),
+        source_url: None,
+        seed_version: None,
+        enabled: input.enabled.unwrap_or(true),
+        priority: input.priority.unwrap_or(20000),
+        created_at: now,
+        updated_at: now,
+    };
+    storage
+        .upsert_model_price_rule(&rule)
+        .map_err(|err| format!("upsert model price rule failed: {err}"))?;
+    Ok(price_rule_entry(rule))
+}
+
+fn price_rule_entry(rule: ModelPriceRule) -> ModelPriceRuleEntry {
+    ModelPriceRuleEntry {
+        id: rule.id,
+        provider: rule.provider,
+        model_pattern: rule.model_pattern,
+        match_type: rule.match_type,
+        input_price_per_1m: rule.input_price_per_1m,
+        cached_input_price_per_1m: rule.cached_input_price_per_1m,
+        output_price_per_1m: rule.output_price_per_1m,
+        enabled: rule.enabled,
+        priority: rule.priority,
+        source: rule.source,
+        created_at: rule.created_at,
+        updated_at: rule.updated_at,
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;
diff --git a/crates/service/src/rpc_dispatch/quota.rs b/crates/service/src/rpc_dispatch/quota.rs
index 0ffd66ffd..80c62f613 100644
--- a/crates/service/src/rpc_dispatch/quota.rs
+++ b/crates/service/src/rpc_dispatch/quota.rs
@@ -1,4 +1,4 @@
-use codexmanager_core::rpc::types::{JsonRpcRequest, JsonRpcResponse};
+use codexmanager_core::rpc::types::{JsonRpcRequest, JsonRpcResponse, ModelPriceRuleUpsertInput};
 
 use crate::quota::read::{self, BillingRuleUpsertInput, QuotaRefreshSourcesInput};
 
@@ -81,6 +81,37 @@ pub(super) fn try_handle(req: &JsonRpcRequest) -> Option<JsonRpcResponse> {
                 super::i64_param(req, "secondaryWindowTokens"),
             ))
         }
+        "quota/modelPriceRules/list" => super::value_or_error(read::list_model_price_rules()),
+        "quota/modelPriceRule/read" => {
+            let model_pattern = super::str_param(req, "modelPattern").unwrap_or("");
+            super::value_or_error(read::read_model_price_rule(model_pattern))
+        }
+        "quota/modelPriceRule/upsert" => {
+            let input = ModelPriceRuleUpsertInput {
+                id: super::string_param(req, "id"),
+                provider: super::string_param(req, "provider"),
+                model_pattern: super::str_param(req, "modelPattern").unwrap_or("").to_string(),
+                match_type: super::string_param(req, "matchType"),
+                input_price_per_1m: req
+                    .params
+                    .as_ref()
+                    .and_then(|p| p.get("inputPricePer1m"))
+                    .and_then(|v| v.as_f64()),
+                cached_input_price_per_1m: req
+                    .params
+                    .as_ref()
+                    .and_then(|p| p.get("cachedInputPricePer1m"))
+                    .and_then(|v| v.as_f64()),
+                output_price_per_1m: req
+                    .params
+                    .as_ref()
+                    .and_then(|p| p.get("outputPricePer1m"))
+                    .and_then(|v| v.as_f64()),
+                enabled: super::bool_param(req, "enabled"),
+                priority: super::i64_param(req, "priority"),
+            };
+            super::value_or_error(read::upsert_model_price_rule(input))
+        }
         "quota/refreshSources" => {
             super::value_or_error(read::refresh_quota_sources(QuotaRefreshSourcesInput {
                 kinds: string_array_param(req, "kinds"),

From 04ccf0613d8681c7f16ab88577bd9b23cbfbbafd Mon Sep 17 00:00:00 2001
From: panzeyu2013 <1971614652@qq.com>
Date: Wed, 27 May 2026 17:26:47 +0800
Subject: [PATCH 2/5] fix: review improvements for model price rules

- Fix useEffect race: clear editingPriceRule before async fetch,
  prevent stale prices leaking across model switches
- Split modal useEffect: main effect handles model/nextSortIndex/open,
  separate price effect only updates price fields via functional setter,
  preventing user input loss in non-price fields
- Add validation: empty model_pattern rejected in upsert endpoint
- Add validation: negative prices blocked in handleSave
- Auto-sync errors no longer block model sync (let _ =)
- Convert registry.rs and transport-web-commands.ts CRLF to LF
- Add console.warn on readModelPriceRule failure
- Add savingPrice state to prevent double-submit during price save

Known limitations (not fixed, out of scope):
- No delete/clear endpoint for price rules
- Renaming model orphans old price rule
- aggregate-api-modal and api-key-modal share pre-existing
  useEffect pattern (full rebuild on async prop change)
---
 apps/src-tauri/src/commands/registry.rs       |  306 ++---
 apps/src/app/models/page.tsx                  |   27 +-
 .../components/modals/model-catalog-modal.tsx |   77 +-
 apps/src/hooks/useManagedModels.ts            |    4 +
 apps/src/lib/api/transport-web-commands.ts    | 1194 ++++++++---------
 crates/service/src/apikey/apikey_models.rs    |    2 +-
 crates/service/src/quota/read.rs              |    8 +-
 7 files changed, 852 insertions(+), 766 deletions(-)

diff --git a/apps/src-tauri/src/commands/registry.rs b/apps/src-tauri/src/commands/registry.rs
index 589ee193d..d9e2e5a6e 100644
--- a/apps/src-tauri/src/commands/registry.rs
+++ b/apps/src-tauri/src/commands/registry.rs
@@ -1,144 +1,144 @@
-macro_rules! invoke_handler {
-    () => {
-        tauri::generate_handler![
-            // service
-            crate::commands::service::service_start,
-            crate::commands::service::service_stop,
-            crate::commands::service::service_initialize,
-            crate::commands::service::service_rpc_token,
-            crate::commands::service::service_sync_codex_models_cache,
-            crate::commands::startup::service_startup_snapshot,
-            crate::commands::dashboard::service_dashboard_admin_usage_summary,
-            crate::commands::dashboard::service_dashboard_member_summary,
-            // account
-            crate::commands::account::remote::service_account_list,
-            crate::commands::account::remote::service_account_delete,
-            crate::commands::account::remote::service_account_delete_many,
-            crate::commands::account::remote::service_account_delete_by_statuses,
-            crate::commands::account::remote::service_account_delete_unavailable_free,
-            crate::commands::account::remote::service_account_update,
-            crate::commands::account::remote::service_account_warmup,
-            crate::commands::account::transfer::service_account_import,
-            crate::commands::account::transfer::service_account_import_by_file,
-            crate::commands::account::transfer::service_account_import_by_directory,
-            crate::commands::account::transfer::service_account_export_by_account_files,
-            crate::commands::account::local::local_account_delete,
-            // account manager
-            crate::commands::account_manager::service_account_manager_status,
-            crate::commands::account_manager::service_account_manager_session_current,
-            crate::commands::account_manager::service_account_manager_profile_update,
-            crate::commands::account_manager::service_account_manager_password_change,
-            crate::commands::account_manager::service_account_manager_users_list,
-            crate::commands::account_manager::service_account_manager_user_create,
-            crate::commands::account_manager::service_account_manager_user_update,
-            crate::commands::account_manager::service_account_manager_wallet_top_up,
-            crate::commands::account_manager::service_account_manager_api_key_owners_list,
-            crate::commands::account_manager::service_account_manager_api_key_owner_set,
-            crate::commands::account_manager::service_model_groups_list,
-            crate::commands::account_manager::service_model_group_save,
-            crate::commands::account_manager::service_model_group_delete,
-            crate::commands::account_manager::service_model_group_models_set,
-            crate::commands::account_manager::service_model_group_users_set,
-            // usage
-            crate::commands::usage::service_usage_read,
-            crate::commands::usage::service_usage_list,
-            crate::commands::usage::service_usage_aggregate,
-            crate::commands::usage::service_usage_refresh,
-            // quota
-            crate::commands::quota::service_quota_overview,
-            crate::commands::quota::service_quota_model_usage,
-            crate::commands::quota::service_quota_api_key_usage,
-            crate::commands::quota::service_quota_source_list,
-            crate::commands::quota::service_quota_model_pools,
-            crate::commands::quota::service_quota_system_pool,
-            crate::commands::quota::service_quota_capacity_config,
-            crate::commands::quota::service_quota_billing_rules,
-            crate::commands::quota::service_quota_billing_rule_upsert,
-            crate::commands::quota::service_quota_billing_rule_delete,
-            crate::commands::quota::service_quota_source_models_set,
-            crate::commands::quota::service_quota_capacity_template_update,
-            crate::commands::quota::service_quota_account_capacity_override_update,
-            crate::commands::quota::service_quota_refresh_sources,
-            // request log
-            crate::commands::requestlog::service_requestlog_list,
-            crate::commands::requestlog::service_requestlog_error_list,
-            crate::commands::requestlog::service_requestlog_error_clear,
-            crate::commands::requestlog::service_requestlog_summary,
-            crate::commands::requestlog::service_requestlog_clear,
-            crate::commands::requestlog::service_requestlog_today_summary,
-            // plugin
-            crate::commands::plugin::service_plugin_catalog_list,
-            crate::commands::plugin::service_plugin_catalog_refresh,
-            crate::commands::plugin::service_plugin_install,
-            crate::commands::plugin::service_plugin_update,
-            crate::commands::plugin::service_plugin_uninstall,
-            crate::commands::plugin::service_plugin_list,
-            crate::commands::plugin::service_plugin_enable,
-            crate::commands::plugin::service_plugin_disable,
-            crate::commands::plugin::service_plugin_tasks_update,
-            crate::commands::plugin::service_plugin_tasks_list,
-            crate::commands::plugin::service_plugin_tasks_run,
-            crate::commands::plugin::service_plugin_logs_list,
-            // settings
-            crate::commands::settings::service_listen::service_listen_config_get,
-            crate::commands::settings::service_listen::service_listen_config_set,
-            crate::commands::settings::gateway::service_gateway_route_strategy_get,
-            crate::commands::settings::gateway::service_gateway_route_strategy_set,
-            crate::commands::settings::gateway::service_gateway_manual_account_get,
-            crate::commands::settings::gateway::service_gateway_manual_account_set,
-            crate::commands::settings::gateway::service_gateway_manual_account_clear,
-            crate::commands::settings::gateway::service_gateway_background_tasks_get,
-            crate::commands::settings::gateway::service_gateway_background_tasks_set,
-            crate::commands::settings::gateway::service_gateway_concurrency_recommend_get,
-            crate::commands::settings::gateway::service_gateway_codex_latest_version_get,
-            crate::commands::settings::gateway::service_gateway_upstream_proxy_get,
-            crate::commands::settings::gateway::service_gateway_upstream_proxy_set,
-            crate::commands::settings::gateway::service_gateway_transport_get,
-            crate::commands::settings::gateway::service_gateway_transport_set,
-            crate::commands::settings::ui::app_settings_get,
-            crate::commands::settings::ui::app_settings_set,
-            crate::commands::settings::ui::app_close_to_tray_on_close_get,
-            crate::commands::settings::ui::app_close_to_tray_on_close_set,
-            // login
-            crate::commands::login::service_login_start,
-            crate::commands::login::service_login_status,
-            crate::commands::login::service_login_complete,
-            crate::commands::login::service_login_chatgpt_auth_tokens,
-            crate::commands::login::service_account_read,
-            crate::commands::login::service_account_logout,
-            crate::commands::login::service_chatgpt_auth_tokens_refresh,
-            crate::commands::login::service_chatgpt_auth_tokens_refresh_all,
-            // api key
-            crate::commands::aggregate_api::service_aggregate_api_list,
-            crate::commands::aggregate_api::service_aggregate_api_read_secret,
-            crate::commands::aggregate_api::service_aggregate_api_create,
-            crate::commands::aggregate_api::service_aggregate_api_update,
-            crate::commands::aggregate_api::service_aggregate_api_delete,
-            crate::commands::aggregate_api::service_aggregate_api_test_connection,
-            crate::commands::aggregate_api::service_aggregate_api_refresh_balance,
-            crate::commands::aggregate_api::service_aggregate_api_supplier_models_list,
-            crate::commands::aggregate_api::service_aggregate_api_supplier_model_save,
-            crate::commands::aggregate_api::service_aggregate_api_supplier_model_delete,
-            crate::commands::aggregate_api::service_aggregate_api_supplier_models_import,
-            crate::commands::apikey::service_apikey_list,
-            crate::commands::apikey::service_apikey_read_secret,
-            crate::commands::apikey::service_apikey_create,
-            crate::commands::apikey::service_apikey_models,
-            crate::commands::apikey::service_model_catalog_list,
-            crate::commands::apikey::service_model_catalog_save,
-            crate::commands::apikey::service_model_catalog_delete,
-            crate::commands::apikey::service_model_routing,
-            crate::commands::apikey::service_model_source_sync,
-            crate::commands::apikey::service_model_source_model_save,
-            crate::commands::apikey::service_model_source_mapping_save,
-            crate::commands::apikey::service_model_source_mapping_delete,
-            crate::commands::apikey::service_model_price_rules_list,
-            crate::commands::apikey::service_model_price_rule_read,
-            crate::commands::apikey::service_model_price_rule_upsert,
-            crate::commands::apikey::service_apikey_usage_stats,
-            crate::commands::apikey::service_apikey_update_model,
-            crate::commands::apikey::service_apikey_delete,
-            crate::commands::apikey::service_apikey_disable,
+macro_rules! invoke_handler {
+    () => {
+        tauri::generate_handler![
+            // service
+            crate::commands::service::service_start,
+            crate::commands::service::service_stop,
+            crate::commands::service::service_initialize,
+            crate::commands::service::service_rpc_token,
+            crate::commands::service::service_sync_codex_models_cache,
+            crate::commands::startup::service_startup_snapshot,
+            crate::commands::dashboard::service_dashboard_admin_usage_summary,
+            crate::commands::dashboard::service_dashboard_member_summary,
+            // account
+            crate::commands::account::remote::service_account_list,
+            crate::commands::account::remote::service_account_delete,
+            crate::commands::account::remote::service_account_delete_many,
+            crate::commands::account::remote::service_account_delete_by_statuses,
+            crate::commands::account::remote::service_account_delete_unavailable_free,
+            crate::commands::account::remote::service_account_update,
+            crate::commands::account::remote::service_account_warmup,
+            crate::commands::account::transfer::service_account_import,
+            crate::commands::account::transfer::service_account_import_by_file,
+            crate::commands::account::transfer::service_account_import_by_directory,
+            crate::commands::account::transfer::service_account_export_by_account_files,
+            crate::commands::account::local::local_account_delete,
+            // account manager
+            crate::commands::account_manager::service_account_manager_status,
+            crate::commands::account_manager::service_account_manager_session_current,
+            crate::commands::account_manager::service_account_manager_profile_update,
+            crate::commands::account_manager::service_account_manager_password_change,
+            crate::commands::account_manager::service_account_manager_users_list,
+            crate::commands::account_manager::service_account_manager_user_create,
+            crate::commands::account_manager::service_account_manager_user_update,
+            crate::commands::account_manager::service_account_manager_wallet_top_up,
+            crate::commands::account_manager::service_account_manager_api_key_owners_list,
+            crate::commands::account_manager::service_account_manager_api_key_owner_set,
+            crate::commands::account_manager::service_model_groups_list,
+            crate::commands::account_manager::service_model_group_save,
+            crate::commands::account_manager::service_model_group_delete,
+            crate::commands::account_manager::service_model_group_models_set,
+            crate::commands::account_manager::service_model_group_users_set,
+            // usage
+            crate::commands::usage::service_usage_read,
+            crate::commands::usage::service_usage_list,
+            crate::commands::usage::service_usage_aggregate,
+            crate::commands::usage::service_usage_refresh,
+            // quota
+            crate::commands::quota::service_quota_overview,
+            crate::commands::quota::service_quota_model_usage,
+            crate::commands::quota::service_quota_api_key_usage,
+            crate::commands::quota::service_quota_source_list,
+            crate::commands::quota::service_quota_model_pools,
+            crate::commands::quota::service_quota_system_pool,
+            crate::commands::quota::service_quota_capacity_config,
+            crate::commands::quota::service_quota_billing_rules,
+            crate::commands::quota::service_quota_billing_rule_upsert,
+            crate::commands::quota::service_quota_billing_rule_delete,
+            crate::commands::quota::service_quota_source_models_set,
+            crate::commands::quota::service_quota_capacity_template_update,
+            crate::commands::quota::service_quota_account_capacity_override_update,
+            crate::commands::quota::service_quota_refresh_sources,
+            // request log
+            crate::commands::requestlog::service_requestlog_list,
+            crate::commands::requestlog::service_requestlog_error_list,
+            crate::commands::requestlog::service_requestlog_error_clear,
+            crate::commands::requestlog::service_requestlog_summary,
+            crate::commands::requestlog::service_requestlog_clear,
+            crate::commands::requestlog::service_requestlog_today_summary,
+            // plugin
+            crate::commands::plugin::service_plugin_catalog_list,
+            crate::commands::plugin::service_plugin_catalog_refresh,
+            crate::commands::plugin::service_plugin_install,
+            crate::commands::plugin::service_plugin_update,
+            crate::commands::plugin::service_plugin_uninstall,
+            crate::commands::plugin::service_plugin_list,
+            crate::commands::plugin::service_plugin_enable,
+            crate::commands::plugin::service_plugin_disable,
+            crate::commands::plugin::service_plugin_tasks_update,
+            crate::commands::plugin::service_plugin_tasks_list,
+            crate::commands::plugin::service_plugin_tasks_run,
+            crate::commands::plugin::service_plugin_logs_list,
+            // settings
+            crate::commands::settings::service_listen::service_listen_config_get,
+            crate::commands::settings::service_listen::service_listen_config_set,
+            crate::commands::settings::gateway::service_gateway_route_strategy_get,
+            crate::commands::settings::gateway::service_gateway_route_strategy_set,
+            crate::commands::settings::gateway::service_gateway_manual_account_get,
+            crate::commands::settings::gateway::service_gateway_manual_account_set,
+            crate::commands::settings::gateway::service_gateway_manual_account_clear,
+            crate::commands::settings::gateway::service_gateway_background_tasks_get,
+            crate::commands::settings::gateway::service_gateway_background_tasks_set,
+            crate::commands::settings::gateway::service_gateway_concurrency_recommend_get,
+            crate::commands::settings::gateway::service_gateway_codex_latest_version_get,
+            crate::commands::settings::gateway::service_gateway_upstream_proxy_get,
+            crate::commands::settings::gateway::service_gateway_upstream_proxy_set,
+            crate::commands::settings::gateway::service_gateway_transport_get,
+            crate::commands::settings::gateway::service_gateway_transport_set,
+            crate::commands::settings::ui::app_settings_get,
+            crate::commands::settings::ui::app_settings_set,
+            crate::commands::settings::ui::app_close_to_tray_on_close_get,
+            crate::commands::settings::ui::app_close_to_tray_on_close_set,
+            // login
+            crate::commands::login::service_login_start,
+            crate::commands::login::service_login_status,
+            crate::commands::login::service_login_complete,
+            crate::commands::login::service_login_chatgpt_auth_tokens,
+            crate::commands::login::service_account_read,
+            crate::commands::login::service_account_logout,
+            crate::commands::login::service_chatgpt_auth_tokens_refresh,
+            crate::commands::login::service_chatgpt_auth_tokens_refresh_all,
+            // api key
+            crate::commands::aggregate_api::service_aggregate_api_list,
+            crate::commands::aggregate_api::service_aggregate_api_read_secret,
+            crate::commands::aggregate_api::service_aggregate_api_create,
+            crate::commands::aggregate_api::service_aggregate_api_update,
+            crate::commands::aggregate_api::service_aggregate_api_delete,
+            crate::commands::aggregate_api::service_aggregate_api_test_connection,
+            crate::commands::aggregate_api::service_aggregate_api_refresh_balance,
+            crate::commands::aggregate_api::service_aggregate_api_supplier_models_list,
+            crate::commands::aggregate_api::service_aggregate_api_supplier_model_save,
+            crate::commands::aggregate_api::service_aggregate_api_supplier_model_delete,
+            crate::commands::aggregate_api::service_aggregate_api_supplier_models_import,
+            crate::commands::apikey::service_apikey_list,
+            crate::commands::apikey::service_apikey_read_secret,
+            crate::commands::apikey::service_apikey_create,
+            crate::commands::apikey::service_apikey_models,
+            crate::commands::apikey::service_model_catalog_list,
+            crate::commands::apikey::service_model_catalog_save,
+            crate::commands::apikey::service_model_catalog_delete,
+            crate::commands::apikey::service_model_routing,
+            crate::commands::apikey::service_model_source_sync,
+            crate::commands::apikey::service_model_source_model_save,
+            crate::commands::apikey::service_model_source_mapping_save,
+            crate::commands::apikey::service_model_source_mapping_delete,
+            crate::commands::apikey::service_model_price_rules_list,
+            crate::commands::apikey::service_model_price_rule_read,
+            crate::commands::apikey::service_model_price_rule_upsert,
+            crate::commands::apikey::service_apikey_usage_stats,
+            crate::commands::apikey::service_apikey_update_model,
+            crate::commands::apikey::service_apikey_delete,
+            crate::commands::apikey::service_apikey_disable,
             crate::commands::apikey::service_apikey_enable,
             // system
             crate::commands::system::open_in_browser,
@@ -146,15 +146,15 @@ macro_rules! invoke_handler {
             crate::commands::system::open_in_file_manager,
             crate::commands::system::app_window_unsaved_draft_sections_set,
             crate::commands::system::app_show_main_window,
-            // updater
-            crate::commands::updater::app_update_check,
-            crate::commands::updater::app_update_prepare,
-            crate::commands::updater::app_update_apply_portable,
-            crate::commands::updater::app_update_launch_installer,
-            crate::commands::updater::app_update_status,
-            crate::commands::updater::app_update_open_logs_dir
-        ]
-    };
-}
-
-pub(crate) use invoke_handler;
+            // updater
+            crate::commands::updater::app_update_check,
+            crate::commands::updater::app_update_prepare,
+            crate::commands::updater::app_update_apply_portable,
+            crate::commands::updater::app_update_launch_installer,
+            crate::commands::updater::app_update_status,
+            crate::commands::updater::app_update_open_logs_dir
+        ]
+    };
+}
+
+pub(crate) use invoke_handler;
diff --git a/apps/src/app/models/page.tsx b/apps/src/app/models/page.tsx
index 4323a2646..c2482dfd6 100644
--- a/apps/src/app/models/page.tsx
+++ b/apps/src/app/models/page.tsx
@@ -68,7 +68,7 @@ import {
 import { useManagedModels } from "@/hooks/useManagedModels";
 import { usePageTransitionReady } from "@/hooks/usePageTransitionReady";
 import { useRuntimeCapabilities } from "@/hooks/useRuntimeCapabilities";
-import { accountClient } from "@/lib/api/account-client";
+import { accountClient, ModelPriceRuleEntry } from "@/lib/api/account-client";
 import { findBestMatchingModel } from "@/lib/api/model-catalog";
 import { useI18n } from "@/lib/i18n/provider";
 import { formatTsFromSeconds } from "@/lib/utils/usage";
@@ -134,6 +134,7 @@ export default function ModelsPage() {
     refreshRemote,
     saveModel,
     saveModelPriceRule,
+    readModelPriceRule,
     deleteModel,
     deleteModels,
     exportCodexCache,
@@ -160,6 +161,7 @@ export default function ModelsPage() {
   const [editingSlug, setEditingSlug] = useState<string | null>(null);
   const [selectedSlugs, setSelectedSlugs] = useState<string[]>([]);
   const [deleteSlugs, setDeleteSlugs] = useState<string[]>([]);
+  const [editingPriceRule, setEditingPriceRule] = useState<ModelPriceRuleEntry | null>(null);
   const [activeModelSlug, setActiveModelSlug] = useState<string>("");
   const [routingDialogOpen, setRoutingDialogOpen] = useState(false);
   const [sourceDraft, setSourceDraft] = useState({
@@ -245,6 +247,28 @@ export default function ModelsPage() {
     [editingSlug, models]
   );
 
+  useEffect(() => {
+    let cancelled = false;
+    const slug = editingModel?.slug;
+    if (!slug) {
+      setEditingPriceRule(null);
+      return;
+    }
+    setEditingPriceRule(null);
+    readModelPriceRule(slug)
+      .then((result) => {
+        if (!cancelled) setEditingPriceRule(result);
+      })
+      .catch((err) => {
+        console.warn("读取模型价格失败", err);
+        if (!cancelled) setEditingPriceRule(null);
+      });
+    return () => {
+      cancelled = true;
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editingModel]);
+
   const nextSortIndex = useMemo(
     () => models.reduce((maxValue, item) => Math.max(maxValue, item.sortIndex), -1) + 1,
     [models]
@@ -1412,6 +1436,7 @@ export default function ModelsPage() {
         isSaving={isSaving}
         onSave={saveModel}
         onSavePriceRule={saveModelPriceRule}
+        priceRule={editingPriceRule}
       />
       ) : null}
 
diff --git a/apps/src/components/modals/model-catalog-modal.tsx b/apps/src/components/modals/model-catalog-modal.tsx
index e6660b749..ffa442b36 100644
--- a/apps/src/components/modals/model-catalog-modal.tsx
+++ b/apps/src/components/modals/model-catalog-modal.tsx
@@ -25,6 +25,7 @@ import {
   SelectValue,
 } from "@/components/ui/select";
 import { ManagedModelPayload, ModelPriceRuleUpsertPayload } from "@/lib/api/account-client";
+import type { ModelPriceRuleEntry } from "@/lib/api/account-client";
 import { useI18n } from "@/lib/i18n/provider";
 import { ManagedModelInfo } from "@/types";
 
@@ -36,6 +37,7 @@ interface ModelCatalogModalProps {
   isSaving?: boolean;
   onSave: (payload: ManagedModelPayload) => Promise<ManagedModelInfo | null>;
   onSavePriceRule?: (payload: ModelPriceRuleUpsertPayload) => Promise<void>;
+  priceRule?: ModelPriceRuleEntry | null;
 }
 
 interface ModelCatalogDraft {
@@ -199,6 +201,7 @@ function buildAdvancedJson(model: ManagedModelInfo | null | undefined): string {
 function buildDraft(
   model: ManagedModelInfo | null | undefined,
   nextSortIndex: number,
+  priceRule?: ModelPriceRuleEntry | null,
 ): ModelCatalogDraft {
   return {
     slug: model?.slug || "",
@@ -212,9 +215,9 @@ function buildDraft(
     visibility: normalizeVisibilityValue(model?.visibility),
     defaultReasoningLevel: model?.defaultReasoningLevel || "",
     advancedJson: buildAdvancedJson(model),
-    inputPricePer1m: "",
-    cachedInputPricePer1m: "",
-    outputPricePer1m: "",
+    inputPricePer1m: priceRule?.inputPricePer1m != null ? String(priceRule.inputPricePer1m) : "",
+    cachedInputPricePer1m: priceRule?.cachedInputPricePer1m != null ? String(priceRule.cachedInputPricePer1m) : "",
+    outputPricePer1m: priceRule?.outputPricePer1m != null ? String(priceRule.outputPricePer1m) : "",
   };
 }
 
@@ -269,22 +272,46 @@ export function ModelCatalogModal({
   isSaving = false,
   onSave,
   onSavePriceRule,
+  priceRule,
 }: ModelCatalogModalProps) {
   const { t } = useI18n();
   const [draft, setDraft] = useState<ModelCatalogDraft>(() =>
-    buildDraft(model, nextSortIndex),
+    buildDraft(model, nextSortIndex, priceRule),
   );
+  const [priceError, setPriceError] = useState<string | null>(null);
+  const [savingPrice, setSavingPrice] = useState(false);
 
   useEffect(() => {
     if (!open) return;
     const frameId = window.requestAnimationFrame(() => {
-      setDraft(buildDraft(model, nextSortIndex));
+      setDraft(buildDraft(model, nextSortIndex, priceRule));
+      setPriceError(null);
     });
     return () => {
       window.cancelAnimationFrame(frameId);
     };
   }, [model, nextSortIndex, open]);
 
+  useEffect(() => {
+    if (!open) return;
+    setDraft((prev) => ({
+      ...prev,
+      inputPricePer1m:
+        priceRule?.inputPricePer1m != null
+          ? String(priceRule.inputPricePer1m)
+          : prev.inputPricePer1m,
+      cachedInputPricePer1m:
+        priceRule?.cachedInputPricePer1m != null
+          ? String(priceRule.cachedInputPricePer1m)
+          : prev.cachedInputPricePer1m,
+      outputPricePer1m:
+        priceRule?.outputPricePer1m != null
+          ? String(priceRule.outputPricePer1m)
+          : prev.outputPricePer1m,
+    }));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [priceRule, open]);
+
   const title = useMemo(
     () => (model ? t("编辑模型") : t("新增模型")),
     [model, t],
@@ -332,17 +359,40 @@ export function ModelCatalogModal({
         const ip = draft.inputPricePer1m.trim();
         const cp = draft.cachedInputPricePer1m.trim();
         const op = draft.outputPricePer1m.trim();
-        if (ip !== "" || cp !== "" || op !== "") {
+        const hasUserInput = ip !== "" || cp !== "" || op !== "";
+        const hasExisting = priceRule != null;
+        if (hasUserInput || hasExisting) {
+          if (!hasExisting && (ip !== "" || op !== "") && (ip === "" || op === "")) {
+            setPriceError("输入价格和输出价格必须同时填写");
+            return;
+          }
+          setSavingPrice(true);
           try {
+            const inputNum = ip !== "" ? Number(ip) : (priceRule?.inputPricePer1m ?? null);
+            const cachedNum = cp !== "" ? Number(cp) : (priceRule?.cachedInputPricePer1m ?? null);
+            const outputNum = op !== "" ? Number(op) : (priceRule?.outputPricePer1m ?? null);
+            if (
+              (inputNum !== null && inputNum < 0) ||
+              (cachedNum !== null && cachedNum < 0) ||
+              (outputNum !== null && outputNum < 0)
+            ) {
+              setPriceError("价格不能为负数");
+              return;
+            }
             await onSavePriceRule({
               modelPattern: slug,
-              inputPricePer1m: ip !== "" ? Number(ip) : null,
-              cachedInputPricePer1m: cp !== "" ? Number(cp) : null,
-              outputPricePer1m: op !== "" ? Number(op) : null,
+              inputPricePer1m: inputNum,
+              cachedInputPricePer1m: cachedNum,
+              outputPricePer1m: outputNum,
             });
-          } catch {
-            // price save is non-fatal
+          } catch (error) {
+            setPriceError(
+              error instanceof Error ? error.message : String(error),
+            );
+            setSavingPrice(false);
+            return;
           }
+          setSavingPrice(false);
         }
       }
       onOpenChange(false);
@@ -530,6 +580,9 @@ export function ModelCatalogModal({
               <p className="text-xs text-muted-foreground">
                 {t("零表示不计费，价格将用于请求成本估算。")}
               </p>
+              {priceError ? (
+                <p className="text-xs text-destructive">{priceError}</p>
+              ) : null}
             </div>
             <div className="grid gap-4 md:grid-cols-3">
               <div className="space-y-2">
@@ -608,7 +661,7 @@ export function ModelCatalogModal({
               onClick={() => {
                 void handleSave();
               }}
-              disabled={isSaving}
+              disabled={isSaving || savingPrice}
             >
               {isSaving ? t("保存中...") : t("保存模型")}
             </Button>
diff --git a/apps/src/hooks/useManagedModels.ts b/apps/src/hooks/useManagedModels.ts
index 214e868fb..19d571bfd 100644
--- a/apps/src/hooks/useManagedModels.ts
+++ b/apps/src/hooks/useManagedModels.ts
@@ -410,6 +410,10 @@ export function useManagedModels() {
       if (!ensureServiceReady("保存模型价格")) return;
       await accountClient.upsertModelPriceRule(params);
     },
+    readModelPriceRule: async (modelPattern: string) => {
+      if (!ensureServiceReady("读取模型价格")) return null;
+      return accountClient.readModelPriceRule(modelPattern);
+    },
     deleteModel: async (slug: string) => {
       if (!ensureServiceReady("删除模型")) return false;
       await deleteMutation.mutateAsync(slug);
diff --git a/apps/src/lib/api/transport-web-commands.ts b/apps/src/lib/api/transport-web-commands.ts
index 074b677c5..69b4f6599 100644
--- a/apps/src/lib/api/transport-web-commands.ts
+++ b/apps/src/lib/api/transport-web-commands.ts
@@ -1,273 +1,273 @@
-import type { RequestOptions } from "../utils/request";
-
-export type InvokeParams = Record<string, unknown>;
-
-export type WebCommandDescriptor = {
-  rpcMethod?: string;
-  mapParams?: (params?: InvokeParams) => InvokeParams;
-  direct?: (params?: InvokeParams, options?: RequestOptions) => Promise<unknown>;
-};
-
-type WebRpcCaller = <T>(
-  rpcMethod: string,
-  params?: InvokeParams,
-  options?: RequestOptions
-) => Promise<T>;
-
-function asRecord(value: unknown): Record<string, unknown> | null {
-  return value && typeof value === "object" && !Array.isArray(value)
-    ? (value as Record<string, unknown>)
-    : null;
-}
-
-function mapKeyIdToId(params?: InvokeParams): InvokeParams {
-  const source = params ?? {};
-  const keyId =
-    typeof source.keyId === "string" && source.keyId.trim()
-      ? source.keyId.trim()
-      : undefined;
-  if (!keyId) {
-    return source;
-  }
-  return {
-    ...source,
-    id: keyId,
-  };
-}
-
-function isSupportedBrowserImportFile(file: File): boolean {
-  const normalizedName = String(file.name || "").trim().toLowerCase();
-  return normalizedName.endsWith(".json") || normalizedName.endsWith(".txt");
-}
-
-async function pickImportFilesFromBrowser(directory: boolean): Promise<unknown> {
-  if (typeof document === "undefined") {
-    throw new Error("当前环境不支持浏览器文件选择");
-  }
-
-  const input = document.createElement("input");
-  input.type = "file";
-  input.accept = ".json,.txt,application/json,text/plain";
-  input.multiple = true;
-  if (directory) {
-    const directoryInput = input as HTMLInputElement & {
-      directory?: boolean;
-      webkitdirectory?: boolean;
-    };
-    directoryInput.directory = true;
-    directoryInput.webkitdirectory = true;
-  }
-  input.style.display = "none";
-  document.body.appendChild(input);
-
-  return await new Promise<unknown>((resolve, reject) => {
-    let finished = false;
-
-    const cleanup = () => {
-      input.removeEventListener("change", handleChange);
-      input.removeEventListener("cancel", handleCancel as EventListener);
-      input.remove();
-    };
-
-    const finish = (value: unknown) => {
-      if (finished) return;
-      finished = true;
-      cleanup();
-      resolve(value);
-    };
-
-    const fail = (error: unknown) => {
-      if (finished) return;
-      finished = true;
-      cleanup();
-      reject(error);
-    };
-
-    const handleCancel = () => {
-      finish({
-        ok: true,
-        canceled: true,
-      });
-    };
-
-    const handleChange = async () => {
-      try {
-        const files = Array.from(input.files ?? []);
-        if (!files.length) {
-          handleCancel();
-          return;
-        }
-
-        const importableFiles = files.filter(isSupportedBrowserImportFile);
-        if (!importableFiles.length) {
-          fail(
-            new Error(
-              directory
-                ? "所选目录中没有可导入的 .json 或 .txt 文件"
-                : "请选择 .json 或 .txt 文件"
-            )
-          );
-          return;
-        }
-
-        const fileEntries = await Promise.all(
-          importableFiles.map(async (file) => {
-            const content = await file.text();
-            const relativePath =
-              (file as File & { webkitRelativePath?: string }).webkitRelativePath ||
-              file.name;
-            return {
-              content,
-              path: relativePath || file.name,
-            };
-          })
-        );
-        const nonEmptyEntries = fileEntries.filter(
-          (entry) => entry.content.trim().length > 0
-        );
-        if (!nonEmptyEntries.length) {
-          fail(new Error("未在所选文件中找到可导入内容"));
-          return;
-        }
-
-        const filePaths = nonEmptyEntries.map((entry) => entry.path);
-        const contents = nonEmptyEntries.map((entry) => entry.content);
-        const directorySourcePath = filePaths[0] || fileEntries[0]?.path || "";
-        const directoryPath = directory
-          ? directorySourcePath.split("/")[0] || directorySourcePath.split("\\")[0] || ""
-          : "";
-
-        finish({
-          ok: true,
-          canceled: false,
-          directoryPath,
-          fileCount: importableFiles.length,
-          filePaths,
-          contents,
-        });
-      } catch (error) {
-        fail(error);
-      }
-    };
-
-    input.addEventListener("change", handleChange);
-    input.addEventListener("cancel", handleCancel as EventListener);
-    input.click();
-  });
-}
-
-async function exportAccountsViaBrowser(
-  postWebRpc: WebRpcCaller,
-  params: Record<string, unknown> | null = null,
-  options: RequestOptions = {}
-): Promise<unknown> {
-  if (typeof document === "undefined") {
-    throw new Error("当前环境不支持浏览器导出");
-  }
-
-  const selectedAccountIds = Array.isArray(params?.selectedAccountIds)
-    ? params.selectedAccountIds
-        .map((item) => String(item || "").trim())
-        .filter(Boolean)
-    : [];
-  const exportMode =
-    typeof params?.exportMode === "string" && params.exportMode.trim()
-      ? params.exportMode.trim()
-      : "multiple";
-  const payload =
-    asRecord(
-      await postWebRpc<unknown>(
-        "account/exportData",
-        {
-          selectedAccountIds,
-          exportMode,
-        },
-        options
-      )
-    ) ?? {};
-  const files = Array.isArray(payload.files)
-    ? payload.files
-        .map((item) => asRecord(item))
-        .filter((item): item is Record<string, unknown> => item !== null)
-    : [];
-
-  for (const item of files) {
-    const fileName =
-      typeof item.fileName === "string" && item.fileName.trim()
-        ? item.fileName.trim()
-        : "account.json";
-    const content = typeof item.content === "string" ? item.content : "";
-    const blob = new Blob([content], {
-      type: "application/json;charset=utf-8",
-    });
-    const url = URL.createObjectURL(blob);
-    const anchor = document.createElement("a");
-    anchor.href = url;
-    anchor.download = fileName;
-    anchor.style.display = "none";
-    document.body.appendChild(anchor);
-    anchor.click();
-    anchor.remove();
-    window.setTimeout(() => URL.revokeObjectURL(url), 0);
-  }
-
-  return {
-    ok: true,
-    canceled: false,
-    exported:
-      typeof payload.exported === "number" ? payload.exported : files.length,
-    outputDir: "browser-download",
-  };
-}
-
-export function createWebCommandMap(
-  postWebRpc: WebRpcCaller
-): Record<string, WebCommandDescriptor> {
-  return {
-    app_settings_get: { rpcMethod: "appSettings/get" },
-    app_settings_set: {
-      rpcMethod: "appSettings/set",
-      mapParams: (params) => asRecord(asRecord(params)?.patch) ?? {},
-    },
-    service_initialize: { rpcMethod: "initialize" },
-    service_startup_snapshot: { rpcMethod: "startup/snapshot" },
-    service_account_list: { rpcMethod: "account/list" },
-    service_account_delete: { rpcMethod: "account/delete" },
-    service_account_delete_many: { rpcMethod: "account/deleteMany" },
-    service_account_delete_by_statuses: {
-      rpcMethod: "account/deleteByStatuses",
-    },
-    service_account_delete_unavailable_free: {
-      rpcMethod: "account/deleteUnavailableFree",
-    },
-    service_account_update: { rpcMethod: "account/update" },
-    service_account_import: { rpcMethod: "account/import" },
-    service_account_import_by_file: {
-      direct: () => pickImportFilesFromBrowser(false),
-    },
-    service_account_import_by_directory: {
-      direct: () => pickImportFilesFromBrowser(true),
-    },
-    service_account_export_by_account_files: {
-      direct: (params, options) =>
-        exportAccountsViaBrowser(postWebRpc, asRecord(params), options),
-    },
-    service_account_warmup: { rpcMethod: "account/warmup" },
-    service_account_manager_status: { rpcMethod: "accountManager/status" },
-    service_account_manager_session_current: {
-      rpcMethod: "accountManager/session/current",
-    },
-    service_account_manager_profile_update: {
-      rpcMethod: "accountManager/profile/update",
-    },
-    service_account_manager_password_change: {
-      rpcMethod: "accountManager/password/change",
-    },
-    service_account_manager_users_list: { rpcMethod: "accountManager/users/list" },
-    service_account_manager_user_create: {
-      rpcMethod: "accountManager/users/create",
-      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
-    },
+import type { RequestOptions } from "../utils/request";
+
+export type InvokeParams = Record<string, unknown>;
+
+export type WebCommandDescriptor = {
+  rpcMethod?: string;
+  mapParams?: (params?: InvokeParams) => InvokeParams;
+  direct?: (params?: InvokeParams, options?: RequestOptions) => Promise<unknown>;
+};
+
+type WebRpcCaller = <T>(
+  rpcMethod: string,
+  params?: InvokeParams,
+  options?: RequestOptions
+) => Promise<T>;
+
+function asRecord(value: unknown): Record<string, unknown> | null {
+  return value && typeof value === "object" && !Array.isArray(value)
+    ? (value as Record<string, unknown>)
+    : null;
+}
+
+function mapKeyIdToId(params?: InvokeParams): InvokeParams {
+  const source = params ?? {};
+  const keyId =
+    typeof source.keyId === "string" && source.keyId.trim()
+      ? source.keyId.trim()
+      : undefined;
+  if (!keyId) {
+    return source;
+  }
+  return {
+    ...source,
+    id: keyId,
+  };
+}
+
+function isSupportedBrowserImportFile(file: File): boolean {
+  const normalizedName = String(file.name || "").trim().toLowerCase();
+  return normalizedName.endsWith(".json") || normalizedName.endsWith(".txt");
+}
+
+async function pickImportFilesFromBrowser(directory: boolean): Promise<unknown> {
+  if (typeof document === "undefined") {
+    throw new Error("当前环境不支持浏览器文件选择");
+  }
+
+  const input = document.createElement("input");
+  input.type = "file";
+  input.accept = ".json,.txt,application/json,text/plain";
+  input.multiple = true;
+  if (directory) {
+    const directoryInput = input as HTMLInputElement & {
+      directory?: boolean;
+      webkitdirectory?: boolean;
+    };
+    directoryInput.directory = true;
+    directoryInput.webkitdirectory = true;
+  }
+  input.style.display = "none";
+  document.body.appendChild(input);
+
+  return await new Promise<unknown>((resolve, reject) => {
+    let finished = false;
+
+    const cleanup = () => {
+      input.removeEventListener("change", handleChange);
+      input.removeEventListener("cancel", handleCancel as EventListener);
+      input.remove();
+    };
+
+    const finish = (value: unknown) => {
+      if (finished) return;
+      finished = true;
+      cleanup();
+      resolve(value);
+    };
+
+    const fail = (error: unknown) => {
+      if (finished) return;
+      finished = true;
+      cleanup();
+      reject(error);
+    };
+
+    const handleCancel = () => {
+      finish({
+        ok: true,
+        canceled: true,
+      });
+    };
+
+    const handleChange = async () => {
+      try {
+        const files = Array.from(input.files ?? []);
+        if (!files.length) {
+          handleCancel();
+          return;
+        }
+
+        const importableFiles = files.filter(isSupportedBrowserImportFile);
+        if (!importableFiles.length) {
+          fail(
+            new Error(
+              directory
+                ? "所选目录中没有可导入的 .json 或 .txt 文件"
+                : "请选择 .json 或 .txt 文件"
+            )
+          );
+          return;
+        }
+
+        const fileEntries = await Promise.all(
+          importableFiles.map(async (file) => {
+            const content = await file.text();
+            const relativePath =
+              (file as File & { webkitRelativePath?: string }).webkitRelativePath ||
+              file.name;
+            return {
+              content,
+              path: relativePath || file.name,
+            };
+          })
+        );
+        const nonEmptyEntries = fileEntries.filter(
+          (entry) => entry.content.trim().length > 0
+        );
+        if (!nonEmptyEntries.length) {
+          fail(new Error("未在所选文件中找到可导入内容"));
+          return;
+        }
+
+        const filePaths = nonEmptyEntries.map((entry) => entry.path);
+        const contents = nonEmptyEntries.map((entry) => entry.content);
+        const directorySourcePath = filePaths[0] || fileEntries[0]?.path || "";
+        const directoryPath = directory
+          ? directorySourcePath.split("/")[0] || directorySourcePath.split("\\")[0] || ""
+          : "";
+
+        finish({
+          ok: true,
+          canceled: false,
+          directoryPath,
+          fileCount: importableFiles.length,
+          filePaths,
+          contents,
+        });
+      } catch (error) {
+        fail(error);
+      }
+    };
+
+    input.addEventListener("change", handleChange);
+    input.addEventListener("cancel", handleCancel as EventListener);
+    input.click();
+  });
+}
+
+async function exportAccountsViaBrowser(
+  postWebRpc: WebRpcCaller,
+  params: Record<string, unknown> | null = null,
+  options: RequestOptions = {}
+): Promise<unknown> {
+  if (typeof document === "undefined") {
+    throw new Error("当前环境不支持浏览器导出");
+  }
+
+  const selectedAccountIds = Array.isArray(params?.selectedAccountIds)
+    ? params.selectedAccountIds
+        .map((item) => String(item || "").trim())
+        .filter(Boolean)
+    : [];
+  const exportMode =
+    typeof params?.exportMode === "string" && params.exportMode.trim()
+      ? params.exportMode.trim()
+      : "multiple";
+  const payload =
+    asRecord(
+      await postWebRpc<unknown>(
+        "account/exportData",
+        {
+          selectedAccountIds,
+          exportMode,
+        },
+        options
+      )
+    ) ?? {};
+  const files = Array.isArray(payload.files)
+    ? payload.files
+        .map((item) => asRecord(item))
+        .filter((item): item is Record<string, unknown> => item !== null)
+    : [];
+
+  for (const item of files) {
+    const fileName =
+      typeof item.fileName === "string" && item.fileName.trim()
+        ? item.fileName.trim()
+        : "account.json";
+    const content = typeof item.content === "string" ? item.content : "";
+    const blob = new Blob([content], {
+      type: "application/json;charset=utf-8",
+    });
+    const url = URL.createObjectURL(blob);
+    const anchor = document.createElement("a");
+    anchor.href = url;
+    anchor.download = fileName;
+    anchor.style.display = "none";
+    document.body.appendChild(anchor);
+    anchor.click();
+    anchor.remove();
+    window.setTimeout(() => URL.revokeObjectURL(url), 0);
+  }
+
+  return {
+    ok: true,
+    canceled: false,
+    exported:
+      typeof payload.exported === "number" ? payload.exported : files.length,
+    outputDir: "browser-download",
+  };
+}
+
+export function createWebCommandMap(
+  postWebRpc: WebRpcCaller
+): Record<string, WebCommandDescriptor> {
+  return {
+    app_settings_get: { rpcMethod: "appSettings/get" },
+    app_settings_set: {
+      rpcMethod: "appSettings/set",
+      mapParams: (params) => asRecord(asRecord(params)?.patch) ?? {},
+    },
+    service_initialize: { rpcMethod: "initialize" },
+    service_startup_snapshot: { rpcMethod: "startup/snapshot" },
+    service_account_list: { rpcMethod: "account/list" },
+    service_account_delete: { rpcMethod: "account/delete" },
+    service_account_delete_many: { rpcMethod: "account/deleteMany" },
+    service_account_delete_by_statuses: {
+      rpcMethod: "account/deleteByStatuses",
+    },
+    service_account_delete_unavailable_free: {
+      rpcMethod: "account/deleteUnavailableFree",
+    },
+    service_account_update: { rpcMethod: "account/update" },
+    service_account_import: { rpcMethod: "account/import" },
+    service_account_import_by_file: {
+      direct: () => pickImportFilesFromBrowser(false),
+    },
+    service_account_import_by_directory: {
+      direct: () => pickImportFilesFromBrowser(true),
+    },
+    service_account_export_by_account_files: {
+      direct: (params, options) =>
+        exportAccountsViaBrowser(postWebRpc, asRecord(params), options),
+    },
+    service_account_warmup: { rpcMethod: "account/warmup" },
+    service_account_manager_status: { rpcMethod: "accountManager/status" },
+    service_account_manager_session_current: {
+      rpcMethod: "accountManager/session/current",
+    },
+    service_account_manager_profile_update: {
+      rpcMethod: "accountManager/profile/update",
+    },
+    service_account_manager_password_change: {
+      rpcMethod: "accountManager/password/change",
+    },
+    service_account_manager_users_list: { rpcMethod: "accountManager/users/list" },
+    service_account_manager_user_create: {
+      rpcMethod: "accountManager/users/create",
+      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
+    },
     service_account_manager_user_update: {
       rpcMethod: "accountManager/users/update",
       mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
@@ -280,10 +280,10 @@ export function createWebCommandMap(
       mapParams: (params) => {
         const source = asRecord(params) ?? {};
         return {
-          ownerKind: source.owner_kind ?? source.ownerKind,
-          ownerId: source.owner_id ?? source.ownerId,
-          amountCreditMicros:
-            source.amount_credit_micros ?? source.amountCreditMicros,
+          ownerKind: source.owner_kind ?? source.ownerKind,
+          ownerId: source.owner_id ?? source.ownerId,
+          amountCreditMicros:
+            source.amount_credit_micros ?? source.amountCreditMicros,
           note: source.note,
         };
       },
@@ -301,316 +301,316 @@ export function createWebCommandMap(
         };
       },
     },
-    service_account_manager_api_key_owners_list: {
-      rpcMethod: "accountManager/apiKeyOwners/list",
-    },
-    service_account_manager_api_key_owner_set: {
-      rpcMethod: "accountManager/apiKeyOwners/set",
-      mapParams: (params) => {
-        const source = asRecord(params) ?? {};
-        return {
-          keyId: source.key_id ?? source.keyId,
-          ownerKind: source.owner_kind ?? source.ownerKind,
-          ownerUserId: source.owner_user_id ?? source.ownerUserId,
-          projectId: source.project_id ?? source.projectId,
-        };
-      },
-    },
-    service_model_groups_list: { rpcMethod: "modelGroups/list" },
-    service_model_group_save: { rpcMethod: "modelGroups/save" },
-    service_model_group_delete: { rpcMethod: "modelGroups/delete" },
-    service_model_group_models_set: { rpcMethod: "modelGroups/setModels" },
-    service_model_group_users_set: { rpcMethod: "modelGroups/setUsers" },
-    service_dashboard_admin_usage_summary: {
-      rpcMethod: "dashboard/adminUsageSummary",
-      mapParams: (params) => {
-        const source = asRecord(params) ?? {};
-        return {
-          startTs: source.start_ts ?? source.startTs,
-          endTs: source.end_ts ?? source.endTs,
-        };
-      },
-    },
-    service_dashboard_member_summary: {
-      rpcMethod: "dashboard/memberSummary",
-      mapParams: (params) => {
-        const source = asRecord(params) ?? {};
-        return {
-          userId: source.user_id ?? source.userId,
-          dayStartTs: source.day_start_ts ?? source.dayStartTs,
-          dayEndTs: source.day_end_ts ?? source.dayEndTs,
-        };
-      },
-    },
-    service_usage_read: { rpcMethod: "account/usage/read" },
-    service_usage_list: { rpcMethod: "account/usage/list" },
-    service_usage_refresh: { rpcMethod: "account/usage/refresh" },
-    service_usage_aggregate: { rpcMethod: "account/usage/aggregate" },
-    service_quota_overview: { rpcMethod: "quota/overview" },
-    service_quota_model_usage: { rpcMethod: "quota/modelUsage" },
-    service_quota_api_key_usage: { rpcMethod: "quota/apiKeyUsage" },
-    service_quota_source_list: { rpcMethod: "quota/sourceList" },
-    service_quota_model_pools: { rpcMethod: "quota/modelPools" },
-    service_quota_system_pool: { rpcMethod: "quota/systemPool" },
-    service_quota_capacity_config: { rpcMethod: "quota/capacityConfig" },
-    service_quota_billing_rules: { rpcMethod: "quota/billingRules" },
-    service_quota_billing_rule_upsert: {
-      rpcMethod: "quota/billingRule/upsert",
-      mapParams: (params) => ({
-        id: typeof params?.id === "string" ? params.id : null,
-        name: typeof params?.name === "string" ? params.name : "",
-        status: typeof params?.status === "string" ? params.status : null,
-        priority: typeof params?.priority === "number" ? params.priority : null,
-        multiplierMillis:
-          typeof params?.multiplierMillis === "number"
-            ? params.multiplierMillis
-            : typeof params?.multiplier_millis === "number"
-              ? params.multiplier_millis
-              : 1000,
-        modelPattern:
-          typeof params?.modelPattern === "string"
-            ? params.modelPattern
-            : typeof params?.model_pattern === "string"
-              ? params.model_pattern
-              : null,
-        serviceTier:
-          typeof params?.serviceTier === "string"
-            ? params.serviceTier
-            : typeof params?.service_tier === "string"
-              ? params.service_tier
-              : null,
-        userId:
-          typeof params?.userId === "string"
-            ? params.userId
-            : typeof params?.user_id === "string"
-              ? params.user_id
-              : null,
-        apiKeyId:
-          typeof params?.apiKeyId === "string"
-            ? params.apiKeyId
-            : typeof params?.api_key_id === "string"
-              ? params.api_key_id
-              : null,
-        startsAt:
-          typeof params?.startsAt === "number"
-            ? params.startsAt
-            : typeof params?.starts_at === "number"
-              ? params.starts_at
-              : null,
-        endsAt:
-          typeof params?.endsAt === "number"
-            ? params.endsAt
-            : typeof params?.ends_at === "number"
-              ? params.ends_at
-              : null,
-      }),
-    },
-    service_quota_billing_rule_delete: {
-      rpcMethod: "quota/billingRule/delete",
-      mapParams: (params) => ({
-        id: typeof params?.id === "string" ? params.id : "",
-      }),
-    },
-    service_quota_source_models_set: {
-      rpcMethod: "quota/sourceModels/set",
-      mapParams: (params) => ({
-        sourceKind:
-          typeof params?.sourceKind === "string"
-            ? params.sourceKind
-            : typeof params?.source_kind === "string"
-              ? params.source_kind
-              : "",
-        sourceId:
-          typeof params?.sourceId === "string"
-            ? params.sourceId
-            : typeof params?.source_id === "string"
-              ? params.source_id
-              : "",
-        modelSlugs: Array.isArray(params?.modelSlugs)
-          ? params.modelSlugs
-          : Array.isArray(params?.model_slugs)
-            ? params.model_slugs
-            : [],
-      }),
-    },
-    service_quota_capacity_template_update: {
-      rpcMethod: "quota/capacityTemplate/update",
-    },
-    service_quota_account_capacity_override_update: {
-      rpcMethod: "quota/accountCapacityOverride/update",
-    },
-    service_quota_refresh_sources: {
-      rpcMethod: "quota/refreshSources",
-      mapParams: (params) => ({
-        kinds: Array.isArray(params?.kinds) ? params.kinds : [],
-        sourceIds: Array.isArray(params?.sourceIds)
-          ? params.sourceIds
-          : Array.isArray(params?.source_ids)
-            ? params.source_ids
-            : [],
-      }),
-    },
-    service_aggregate_api_list: { rpcMethod: "aggregateApi/list" },
-    service_aggregate_api_create: { rpcMethod: "aggregateApi/create" },
-    service_aggregate_api_update: { rpcMethod: "aggregateApi/update" },
-    service_aggregate_api_delete: { rpcMethod: "aggregateApi/delete" },
-    service_aggregate_api_read_secret: { rpcMethod: "aggregateApi/readSecret" },
-    service_aggregate_api_test_connection: {
-      rpcMethod: "aggregateApi/testConnection",
-    },
-    service_aggregate_api_refresh_balance: {
-      rpcMethod: "aggregateApi/refreshBalance",
-    },
-    service_aggregate_api_supplier_models_list: {
-      rpcMethod: "aggregateApi/supplierModels/list",
-    },
-    service_aggregate_api_supplier_model_save: {
-      rpcMethod: "aggregateApi/supplierModels/save",
-      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
-    },
-    service_aggregate_api_supplier_model_delete: {
-      rpcMethod: "aggregateApi/supplierModels/delete",
-    },
-    service_aggregate_api_supplier_models_import: {
-      rpcMethod: "aggregateApi/sourceModels/importSupplier",
-    },
-    service_login_start: {
-      rpcMethod: "account/login/start",
-      mapParams: (params) => ({
-        ...(params ?? {}),
-        type:
-          typeof params?.loginType === "string" && params.loginType.trim()
-            ? params.loginType
-            : "chatgpt",
-        openBrowser: false,
-      }),
-    },
-    service_login_status: { rpcMethod: "account/login/status" },
-    service_login_complete: { rpcMethod: "account/login/complete" },
-    service_login_chatgpt_auth_tokens: {
-      rpcMethod: "account/login/start",
-      mapParams: (params) => ({
-        ...(params ?? {}),
-        type: "chatgptAuthTokens",
-      }),
-    },
-    service_account_read: { rpcMethod: "account/read" },
-    service_account_logout: { rpcMethod: "account/logout" },
-    service_chatgpt_auth_tokens_refresh: {
-      rpcMethod: "account/chatgptAuthTokens/refresh",
-    },
-    service_chatgpt_auth_tokens_refresh_all: {
-      rpcMethod: "account/chatgptAuthTokens/refreshAll",
-    },
-    service_apikey_list: { rpcMethod: "apikey/list" },
-    service_apikey_create: { rpcMethod: "apikey/create" },
-    service_apikey_usage_stats: { rpcMethod: "apikey/usageStats" },
-    service_apikey_delete: {
-      rpcMethod: "apikey/delete",
-      mapParams: mapKeyIdToId,
-    },
-    service_apikey_update_model: {
-      rpcMethod: "apikey/updateModel",
-      mapParams: mapKeyIdToId,
-    },
-    service_apikey_disable: {
-      rpcMethod: "apikey/disable",
-      mapParams: mapKeyIdToId,
-    },
-    service_apikey_enable: {
-      rpcMethod: "apikey/enable",
-      mapParams: mapKeyIdToId,
-    },
-    service_apikey_models: { rpcMethod: "apikey/models" },
-    service_model_catalog_list: { rpcMethod: "apikey/modelCatalogList" },
-    service_model_catalog_save: {
-      rpcMethod: "apikey/modelCatalogSave",
-      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
-    },
-    service_model_catalog_delete: { rpcMethod: "apikey/modelCatalogDelete" },
-    service_model_routing: { rpcMethod: "apikey/modelRouting" },
-    service_model_source_sync: {
-      rpcMethod: "apikey/modelSourceSync",
-      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
-    },
-    service_model_source_model_save: {
-      rpcMethod: "apikey/modelSourceModelSave",
-      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
-    },
-    service_model_source_mapping_save: {
-      rpcMethod: "apikey/modelSourceMappingSave",
-      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
-    },
-    service_model_source_mapping_delete: {
-      rpcMethod: "apikey/modelSourceMappingDelete",
-    },
-    service_model_price_rules_list: {
-      rpcMethod: "quota/modelPriceRules/list",
-    },
-    service_model_price_rule_read: {
-      rpcMethod: "quota/modelPriceRule/read",
-    },
-    service_model_price_rule_upsert: {
-      rpcMethod: "quota/modelPriceRule/upsert",
-      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
-    },
-    service_apikey_read_secret: {
-      rpcMethod: "apikey/readSecret",
-      mapParams: mapKeyIdToId,
-    },
-    service_gateway_transport_get: { rpcMethod: "gateway/transport/get" },
-    service_gateway_transport_set: { rpcMethod: "gateway/transport/set" },
-    service_gateway_upstream_proxy_get: { rpcMethod: "gateway/upstreamProxy/get" },
-    service_gateway_upstream_proxy_set: { rpcMethod: "gateway/upstreamProxy/set" },
-    service_gateway_route_strategy_get: { rpcMethod: "gateway/routeStrategy/get" },
-    service_gateway_route_strategy_set: { rpcMethod: "gateway/routeStrategy/set" },
-    service_gateway_manual_account_get: { rpcMethod: "gateway/manualAccount/get" },
-    service_gateway_manual_account_set: { rpcMethod: "gateway/manualAccount/set" },
-    service_gateway_manual_account_clear: {
-      rpcMethod: "gateway/manualAccount/clear",
-    },
-    service_gateway_background_tasks_get: {
-      rpcMethod: "gateway/backgroundTasks/get",
-    },
-    service_gateway_background_tasks_set: {
-      rpcMethod: "gateway/backgroundTasks/set",
-    },
-    service_gateway_concurrency_recommend_get: {
-      rpcMethod: "gateway/concurrencyRecommendation/get",
-    },
-    service_gateway_codex_latest_version_get: {
-      rpcMethod: "gateway/codexLatestVersion/get",
-    },
-    service_requestlog_list: { rpcMethod: "requestlog/list" },
-    service_requestlog_error_list: { rpcMethod: "requestlog/error_list" },
-    service_requestlog_error_clear: { rpcMethod: "requestlog/error_clear" },
-    service_requestlog_summary: { rpcMethod: "requestlog/summary" },
-    service_requestlog_clear: { rpcMethod: "requestlog/clear" },
-    service_requestlog_today_summary: { rpcMethod: "requestlog/today_summary" },
-    service_plugin_catalog_list: { rpcMethod: "plugin/catalog/list" },
-    service_plugin_catalog_refresh: { rpcMethod: "plugin/catalog/refresh" },
-    service_plugin_install: { rpcMethod: "plugin/install" },
-    service_plugin_update: { rpcMethod: "plugin/update" },
-    service_plugin_uninstall: { rpcMethod: "plugin/uninstall" },
-    service_plugin_list: { rpcMethod: "plugin/list" },
-    service_plugin_enable: { rpcMethod: "plugin/enable" },
-    service_plugin_disable: { rpcMethod: "plugin/disable" },
-    service_plugin_tasks_update: { rpcMethod: "plugin/tasks/update" },
-    service_plugin_tasks_list: { rpcMethod: "plugin/tasks/list" },
-    service_plugin_tasks_run: { rpcMethod: "plugin/tasks/run" },
-    service_plugin_logs_list: { rpcMethod: "plugin/logs/list" },
-    service_listen_config_get: { rpcMethod: "service/listenConfig/get" },
-    service_listen_config_set: { rpcMethod: "service/listenConfig/set" },
+    service_account_manager_api_key_owners_list: {
+      rpcMethod: "accountManager/apiKeyOwners/list",
+    },
+    service_account_manager_api_key_owner_set: {
+      rpcMethod: "accountManager/apiKeyOwners/set",
+      mapParams: (params) => {
+        const source = asRecord(params) ?? {};
+        return {
+          keyId: source.key_id ?? source.keyId,
+          ownerKind: source.owner_kind ?? source.ownerKind,
+          ownerUserId: source.owner_user_id ?? source.ownerUserId,
+          projectId: source.project_id ?? source.projectId,
+        };
+      },
+    },
+    service_model_groups_list: { rpcMethod: "modelGroups/list" },
+    service_model_group_save: { rpcMethod: "modelGroups/save" },
+    service_model_group_delete: { rpcMethod: "modelGroups/delete" },
+    service_model_group_models_set: { rpcMethod: "modelGroups/setModels" },
+    service_model_group_users_set: { rpcMethod: "modelGroups/setUsers" },
+    service_dashboard_admin_usage_summary: {
+      rpcMethod: "dashboard/adminUsageSummary",
+      mapParams: (params) => {
+        const source = asRecord(params) ?? {};
+        return {
+          startTs: source.start_ts ?? source.startTs,
+          endTs: source.end_ts ?? source.endTs,
+        };
+      },
+    },
+    service_dashboard_member_summary: {
+      rpcMethod: "dashboard/memberSummary",
+      mapParams: (params) => {
+        const source = asRecord(params) ?? {};
+        return {
+          userId: source.user_id ?? source.userId,
+          dayStartTs: source.day_start_ts ?? source.dayStartTs,
+          dayEndTs: source.day_end_ts ?? source.dayEndTs,
+        };
+      },
+    },
+    service_usage_read: { rpcMethod: "account/usage/read" },
+    service_usage_list: { rpcMethod: "account/usage/list" },
+    service_usage_refresh: { rpcMethod: "account/usage/refresh" },
+    service_usage_aggregate: { rpcMethod: "account/usage/aggregate" },
+    service_quota_overview: { rpcMethod: "quota/overview" },
+    service_quota_model_usage: { rpcMethod: "quota/modelUsage" },
+    service_quota_api_key_usage: { rpcMethod: "quota/apiKeyUsage" },
+    service_quota_source_list: { rpcMethod: "quota/sourceList" },
+    service_quota_model_pools: { rpcMethod: "quota/modelPools" },
+    service_quota_system_pool: { rpcMethod: "quota/systemPool" },
+    service_quota_capacity_config: { rpcMethod: "quota/capacityConfig" },
+    service_quota_billing_rules: { rpcMethod: "quota/billingRules" },
+    service_quota_billing_rule_upsert: {
+      rpcMethod: "quota/billingRule/upsert",
+      mapParams: (params) => ({
+        id: typeof params?.id === "string" ? params.id : null,
+        name: typeof params?.name === "string" ? params.name : "",
+        status: typeof params?.status === "string" ? params.status : null,
+        priority: typeof params?.priority === "number" ? params.priority : null,
+        multiplierMillis:
+          typeof params?.multiplierMillis === "number"
+            ? params.multiplierMillis
+            : typeof params?.multiplier_millis === "number"
+              ? params.multiplier_millis
+              : 1000,
+        modelPattern:
+          typeof params?.modelPattern === "string"
+            ? params.modelPattern
+            : typeof params?.model_pattern === "string"
+              ? params.model_pattern
+              : null,
+        serviceTier:
+          typeof params?.serviceTier === "string"
+            ? params.serviceTier
+            : typeof params?.service_tier === "string"
+              ? params.service_tier
+              : null,
+        userId:
+          typeof params?.userId === "string"
+            ? params.userId
+            : typeof params?.user_id === "string"
+              ? params.user_id
+              : null,
+        apiKeyId:
+          typeof params?.apiKeyId === "string"
+            ? params.apiKeyId
+            : typeof params?.api_key_id === "string"
+              ? params.api_key_id
+              : null,
+        startsAt:
+          typeof params?.startsAt === "number"
+            ? params.startsAt
+            : typeof params?.starts_at === "number"
+              ? params.starts_at
+              : null,
+        endsAt:
+          typeof params?.endsAt === "number"
+            ? params.endsAt
+            : typeof params?.ends_at === "number"
+              ? params.ends_at
+              : null,
+      }),
+    },
+    service_quota_billing_rule_delete: {
+      rpcMethod: "quota/billingRule/delete",
+      mapParams: (params) => ({
+        id: typeof params?.id === "string" ? params.id : "",
+      }),
+    },
+    service_quota_source_models_set: {
+      rpcMethod: "quota/sourceModels/set",
+      mapParams: (params) => ({
+        sourceKind:
+          typeof params?.sourceKind === "string"
+            ? params.sourceKind
+            : typeof params?.source_kind === "string"
+              ? params.source_kind
+              : "",
+        sourceId:
+          typeof params?.sourceId === "string"
+            ? params.sourceId
+            : typeof params?.source_id === "string"
+              ? params.source_id
+              : "",
+        modelSlugs: Array.isArray(params?.modelSlugs)
+          ? params.modelSlugs
+          : Array.isArray(params?.model_slugs)
+            ? params.model_slugs
+            : [],
+      }),
+    },
+    service_quota_capacity_template_update: {
+      rpcMethod: "quota/capacityTemplate/update",
+    },
+    service_quota_account_capacity_override_update: {
+      rpcMethod: "quota/accountCapacityOverride/update",
+    },
+    service_quota_refresh_sources: {
+      rpcMethod: "quota/refreshSources",
+      mapParams: (params) => ({
+        kinds: Array.isArray(params?.kinds) ? params.kinds : [],
+        sourceIds: Array.isArray(params?.sourceIds)
+          ? params.sourceIds
+          : Array.isArray(params?.source_ids)
+            ? params.source_ids
+            : [],
+      }),
+    },
+    service_aggregate_api_list: { rpcMethod: "aggregateApi/list" },
+    service_aggregate_api_create: { rpcMethod: "aggregateApi/create" },
+    service_aggregate_api_update: { rpcMethod: "aggregateApi/update" },
+    service_aggregate_api_delete: { rpcMethod: "aggregateApi/delete" },
+    service_aggregate_api_read_secret: { rpcMethod: "aggregateApi/readSecret" },
+    service_aggregate_api_test_connection: {
+      rpcMethod: "aggregateApi/testConnection",
+    },
+    service_aggregate_api_refresh_balance: {
+      rpcMethod: "aggregateApi/refreshBalance",
+    },
+    service_aggregate_api_supplier_models_list: {
+      rpcMethod: "aggregateApi/supplierModels/list",
+    },
+    service_aggregate_api_supplier_model_save: {
+      rpcMethod: "aggregateApi/supplierModels/save",
+      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
+    },
+    service_aggregate_api_supplier_model_delete: {
+      rpcMethod: "aggregateApi/supplierModels/delete",
+    },
+    service_aggregate_api_supplier_models_import: {
+      rpcMethod: "aggregateApi/sourceModels/importSupplier",
+    },
+    service_login_start: {
+      rpcMethod: "account/login/start",
+      mapParams: (params) => ({
+        ...(params ?? {}),
+        type:
+          typeof params?.loginType === "string" && params.loginType.trim()
+            ? params.loginType
+            : "chatgpt",
+        openBrowser: false,
+      }),
+    },
+    service_login_status: { rpcMethod: "account/login/status" },
+    service_login_complete: { rpcMethod: "account/login/complete" },
+    service_login_chatgpt_auth_tokens: {
+      rpcMethod: "account/login/start",
+      mapParams: (params) => ({
+        ...(params ?? {}),
+        type: "chatgptAuthTokens",
+      }),
+    },
+    service_account_read: { rpcMethod: "account/read" },
+    service_account_logout: { rpcMethod: "account/logout" },
+    service_chatgpt_auth_tokens_refresh: {
+      rpcMethod: "account/chatgptAuthTokens/refresh",
+    },
+    service_chatgpt_auth_tokens_refresh_all: {
+      rpcMethod: "account/chatgptAuthTokens/refreshAll",
+    },
+    service_apikey_list: { rpcMethod: "apikey/list" },
+    service_apikey_create: { rpcMethod: "apikey/create" },
+    service_apikey_usage_stats: { rpcMethod: "apikey/usageStats" },
+    service_apikey_delete: {
+      rpcMethod: "apikey/delete",
+      mapParams: mapKeyIdToId,
+    },
+    service_apikey_update_model: {
+      rpcMethod: "apikey/updateModel",
+      mapParams: mapKeyIdToId,
+    },
+    service_apikey_disable: {
+      rpcMethod: "apikey/disable",
+      mapParams: mapKeyIdToId,
+    },
+    service_apikey_enable: {
+      rpcMethod: "apikey/enable",
+      mapParams: mapKeyIdToId,
+    },
+    service_apikey_models: { rpcMethod: "apikey/models" },
+    service_model_catalog_list: { rpcMethod: "apikey/modelCatalogList" },
+    service_model_catalog_save: {
+      rpcMethod: "apikey/modelCatalogSave",
+      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
+    },
+    service_model_catalog_delete: { rpcMethod: "apikey/modelCatalogDelete" },
+    service_model_routing: { rpcMethod: "apikey/modelRouting" },
+    service_model_source_sync: {
+      rpcMethod: "apikey/modelSourceSync",
+      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
+    },
+    service_model_source_model_save: {
+      rpcMethod: "apikey/modelSourceModelSave",
+      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
+    },
+    service_model_source_mapping_save: {
+      rpcMethod: "apikey/modelSourceMappingSave",
+      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
+    },
+    service_model_source_mapping_delete: {
+      rpcMethod: "apikey/modelSourceMappingDelete",
+    },
+    service_model_price_rules_list: {
+      rpcMethod: "quota/modelPriceRules/list",
+    },
+    service_model_price_rule_read: {
+      rpcMethod: "quota/modelPriceRule/read",
+    },
+    service_model_price_rule_upsert: {
+      rpcMethod: "quota/modelPriceRule/upsert",
+      mapParams: (params) => asRecord(asRecord(params)?.payload) ?? {},
+    },
+    service_apikey_read_secret: {
+      rpcMethod: "apikey/readSecret",
+      mapParams: mapKeyIdToId,
+    },
+    service_gateway_transport_get: { rpcMethod: "gateway/transport/get" },
+    service_gateway_transport_set: { rpcMethod: "gateway/transport/set" },
+    service_gateway_upstream_proxy_get: { rpcMethod: "gateway/upstreamProxy/get" },
+    service_gateway_upstream_proxy_set: { rpcMethod: "gateway/upstreamProxy/set" },
+    service_gateway_route_strategy_get: { rpcMethod: "gateway/routeStrategy/get" },
+    service_gateway_route_strategy_set: { rpcMethod: "gateway/routeStrategy/set" },
+    service_gateway_manual_account_get: { rpcMethod: "gateway/manualAccount/get" },
+    service_gateway_manual_account_set: { rpcMethod: "gateway/manualAccount/set" },
+    service_gateway_manual_account_clear: {
+      rpcMethod: "gateway/manualAccount/clear",
+    },
+    service_gateway_background_tasks_get: {
+      rpcMethod: "gateway/backgroundTasks/get",
+    },
+    service_gateway_background_tasks_set: {
+      rpcMethod: "gateway/backgroundTasks/set",
+    },
+    service_gateway_concurrency_recommend_get: {
+      rpcMethod: "gateway/concurrencyRecommendation/get",
+    },
+    service_gateway_codex_latest_version_get: {
+      rpcMethod: "gateway/codexLatestVersion/get",
+    },
+    service_requestlog_list: { rpcMethod: "requestlog/list" },
+    service_requestlog_error_list: { rpcMethod: "requestlog/error_list" },
+    service_requestlog_error_clear: { rpcMethod: "requestlog/error_clear" },
+    service_requestlog_summary: { rpcMethod: "requestlog/summary" },
+    service_requestlog_clear: { rpcMethod: "requestlog/clear" },
+    service_requestlog_today_summary: { rpcMethod: "requestlog/today_summary" },
+    service_plugin_catalog_list: { rpcMethod: "plugin/catalog/list" },
+    service_plugin_catalog_refresh: { rpcMethod: "plugin/catalog/refresh" },
+    service_plugin_install: { rpcMethod: "plugin/install" },
+    service_plugin_update: { rpcMethod: "plugin/update" },
+    service_plugin_uninstall: { rpcMethod: "plugin/uninstall" },
+    service_plugin_list: { rpcMethod: "plugin/list" },
+    service_plugin_enable: { rpcMethod: "plugin/enable" },
+    service_plugin_disable: { rpcMethod: "plugin/disable" },
+    service_plugin_tasks_update: { rpcMethod: "plugin/tasks/update" },
+    service_plugin_tasks_list: { rpcMethod: "plugin/tasks/list" },
+    service_plugin_tasks_run: { rpcMethod: "plugin/tasks/run" },
+    service_plugin_logs_list: { rpcMethod: "plugin/logs/list" },
+    service_listen_config_get: { rpcMethod: "service/listenConfig/get" },
+    service_listen_config_set: { rpcMethod: "service/listenConfig/set" },
     open_in_browser: {
       direct: async (params) => {
         const url = typeof params?.url === "string" ? params.url.trim() : "";
         if (!url) {
-          throw new Error("缺少浏览器跳转地址");
-        }
-        if (typeof window === "undefined") {
-          throw new Error("当前环境不支持打开浏览器");
-        }
-        window.open(url, "_blank", "noopener,noreferrer");
+          throw new Error("缺少浏览器跳转地址");
+        }
+        if (typeof window === "undefined") {
+          throw new Error("当前环境不支持打开浏览器");
+        }
+        window.open(url, "_blank", "noopener,noreferrer");
         return { ok: true };
       },
     },
@@ -630,20 +630,20 @@ export function createWebCommandMap(
     open_in_file_manager: {
       direct: async () => {
         throw new Error("当前环境不支持打开本地目录");
-      },
-    },
-    app_show_main_window: {
-      direct: async () => {
-        if (typeof window !== "undefined") {
-          window.location.href = "/";
-        }
-        return { ok: true };
-      },
-    },
-    app_update_open_logs_dir: {
-      direct: async () => {
-        throw new Error("当前环境不支持打开更新日志目录");
-      },
-    },
-  };
-}
+      },
+    },
+    app_show_main_window: {
+      direct: async () => {
+        if (typeof window !== "undefined") {
+          window.location.href = "/";
+        }
+        return { ok: true };
+      },
+    },
+    app_update_open_logs_dir: {
+      direct: async () => {
+        throw new Error("当前环境不支持打开更新日志目录");
+      },
+    },
+  };
+}
diff --git a/crates/service/src/apikey/apikey_models.rs b/crates/service/src/apikey/apikey_models.rs
index f1a7dc161..f3b7b8eb2 100644
--- a/crates/service/src/apikey/apikey_models.rs
+++ b/crates/service/src/apikey/apikey_models.rs
@@ -920,7 +920,7 @@ fn auto_associate_source_models(
     }
 
     if source_kind == ROUTING_SOURCE_KIND_AGGREGATE_API && auto_create_platform_models {
-        ensure_model_price_rules_for_aggregate_api(storage, source_id, &source_models)?;
+        let _ = ensure_model_price_rules_for_aggregate_api(storage, source_id, &source_models);
     }
 
     Ok(())
diff --git a/crates/service/src/quota/read.rs b/crates/service/src/quota/read.rs
index 541032888..4a3f04cc1 100644
--- a/crates/service/src/quota/read.rs
+++ b/crates/service/src/quota/read.rs
@@ -1512,16 +1512,20 @@ pub(crate) fn upsert_model_price_rule(
 ) -> Result<ModelPriceRuleEntry, String> {
     let storage = open_storage().ok_or_else(|| "open storage failed".to_string())?;
     let now = now_ts();
+    let model_pattern = input.model_pattern.trim().to_string();
+    if model_pattern.is_empty() {
+        return Err("model_pattern 不能为空".to_string());
+    }
     let id = input
         .id
         .filter(|v| !v.is_empty())
-        .unwrap_or_else(|| format!("user-{}", input.model_pattern));
+        .unwrap_or_else(|| format!("user-{}", model_pattern));
     let rule = ModelPriceRule {
         id,
         provider: input
             .provider
             .unwrap_or_else(|| "openai".to_string()),
-        model_pattern: input.model_pattern,
+        model_pattern,
         match_type: input
             .match_type
             .unwrap_or_else(|| "exact".to_string()),

From b0153e8c1e246fd8291c27c6ca59d8367610fec9 Mon Sep 17 00:00:00 2001
From: panzeyu2013 <1971614652@qq.com>
Date: Fri, 29 May 2026 21:45:27 +0800
Subject: [PATCH 3/5] fix: prevent price cross-model leakage, stuck save
 button, and add backend negative price validation

---
 .../src/components/modals/model-catalog-modal.tsx |  8 ++++----
 crates/service/src/quota/read.rs                  | 15 +++++++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/apps/src/components/modals/model-catalog-modal.tsx b/apps/src/components/modals/model-catalog-modal.tsx
index ffa442b36..bb6915e39 100644
--- a/apps/src/components/modals/model-catalog-modal.tsx
+++ b/apps/src/components/modals/model-catalog-modal.tsx
@@ -299,15 +299,15 @@ export function ModelCatalogModal({
       inputPricePer1m:
         priceRule?.inputPricePer1m != null
           ? String(priceRule.inputPricePer1m)
-          : prev.inputPricePer1m,
+          : "",
       cachedInputPricePer1m:
         priceRule?.cachedInputPricePer1m != null
           ? String(priceRule.cachedInputPricePer1m)
-          : prev.cachedInputPricePer1m,
+          : "",
       outputPricePer1m:
         priceRule?.outputPricePer1m != null
           ? String(priceRule.outputPricePer1m)
-          : prev.outputPricePer1m,
+          : "",
     }));
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [priceRule, open]);
@@ -366,7 +366,6 @@ export function ModelCatalogModal({
             setPriceError("输入价格和输出价格必须同时填写");
             return;
           }
-          setSavingPrice(true);
           try {
             const inputNum = ip !== "" ? Number(ip) : (priceRule?.inputPricePer1m ?? null);
             const cachedNum = cp !== "" ? Number(cp) : (priceRule?.cachedInputPricePer1m ?? null);
@@ -379,6 +378,7 @@ export function ModelCatalogModal({
               setPriceError("价格不能为负数");
               return;
             }
+            setSavingPrice(true);
             await onSavePriceRule({
               modelPattern: slug,
               inputPricePer1m: inputNum,
diff --git a/crates/service/src/quota/read.rs b/crates/service/src/quota/read.rs
index 4a3f04cc1..956689c1b 100644
--- a/crates/service/src/quota/read.rs
+++ b/crates/service/src/quota/read.rs
@@ -1551,6 +1551,21 @@ pub(crate) fn upsert_model_price_rule(
         created_at: now,
         updated_at: now,
     };
+    if let Some(v) = rule.input_price_per_1m {
+        if v < 0.0 {
+            return Err("input_price_per_1m 不能为负数".to_string());
+        }
+    }
+    if let Some(v) = rule.cached_input_price_per_1m {
+        if v < 0.0 {
+            return Err("cached_input_price_per_1m 不能为负数".to_string());
+        }
+    }
+    if let Some(v) = rule.output_price_per_1m {
+        if v < 0.0 {
+            return Err("output_price_per_1m 不能为负数".to_string());
+        }
+    }
     storage
         .upsert_model_price_rule(&rule)
         .map_err(|err| format!("upsert model price rule failed: {err}"))?;

From 03dd7bffa6f994f29f1e991d0eef94c8d7788e90 Mon Sep 17 00:00:00 2001
From: panzeyu2013 <1971614652@qq.com>
Date: Fri, 29 May 2026 22:51:57 +0800
Subject: [PATCH 4/5] fix: validate NaN/Infinity prices, improve error handling
 and UX robustness

- Backend: reject NaN/Infinity via is_finite() check in upsert_model_price_rule
- Frontend: validate Number.isFinite() before sending price data
- Fix silent error swallow in aggregate API auto-provision (log::warn!)
- Fix empty slug error shown as inline message instead of unhandled throw
- Fix savingPrice state not reset on modal close, preventing stuck button
- Fix service disconnect silently losing price data (throw instead of return)
- Clean up eslint-disable comments for correct lint suppression
---
 apps/src/components/modals/model-catalog-modal.tsx | 14 ++++++++------
 apps/src/hooks/useManagedModels.ts                 |  2 +-
 crates/service/src/apikey/apikey_models.rs         |  8 +++++++-
 crates/service/src/quota/read.rs                   | 12 ++++++------
 4 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/apps/src/components/modals/model-catalog-modal.tsx b/apps/src/components/modals/model-catalog-modal.tsx
index bb6915e39..d6b3314dd 100644
--- a/apps/src/components/modals/model-catalog-modal.tsx
+++ b/apps/src/components/modals/model-catalog-modal.tsx
@@ -286,10 +286,12 @@ export function ModelCatalogModal({
     const frameId = window.requestAnimationFrame(() => {
       setDraft(buildDraft(model, nextSortIndex, priceRule));
       setPriceError(null);
+      setSavingPrice(false);
     });
     return () => {
       window.cancelAnimationFrame(frameId);
     };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [model, nextSortIndex, open]);
 
   useEffect(() => {
@@ -309,7 +311,6 @@ export function ModelCatalogModal({
           ? String(priceRule.outputPricePer1m)
           : "",
     }));
-    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [priceRule, open]);
 
   const title = useMemo(
@@ -327,7 +328,8 @@ export function ModelCatalogModal({
   const handleSave = async () => {
     const slug = draft.slug.trim();
     if (!slug) {
-      throw new Error("模型 slug 不能为空");
+      setPriceError("模型 slug 不能为空");
+      return;
     }
 
     const advancedFields = parseJsonObject(draft.advancedJson, "高级 JSON");
@@ -371,11 +373,11 @@ export function ModelCatalogModal({
             const cachedNum = cp !== "" ? Number(cp) : (priceRule?.cachedInputPricePer1m ?? null);
             const outputNum = op !== "" ? Number(op) : (priceRule?.outputPricePer1m ?? null);
             if (
-              (inputNum !== null && inputNum < 0) ||
-              (cachedNum !== null && cachedNum < 0) ||
-              (outputNum !== null && outputNum < 0)
+              (inputNum !== null && (!Number.isFinite(inputNum) || inputNum < 0)) ||
+              (cachedNum !== null && (!Number.isFinite(cachedNum) || cachedNum < 0)) ||
+              (outputNum !== null && (!Number.isFinite(outputNum) || outputNum < 0))
             ) {
-              setPriceError("价格不能为负数");
+              setPriceError("价格必须为非负有效数字");
               return;
             }
             setSavingPrice(true);
diff --git a/apps/src/hooks/useManagedModels.ts b/apps/src/hooks/useManagedModels.ts
index 19d571bfd..e21d34ca8 100644
--- a/apps/src/hooks/useManagedModels.ts
+++ b/apps/src/hooks/useManagedModels.ts
@@ -407,7 +407,7 @@ export function useManagedModels() {
       return saveMutation.mutateAsync(params);
     },
     saveModelPriceRule: async (params: ModelPriceRuleUpsertPayload) => {
-      if (!ensureServiceReady("保存模型价格")) return;
+      if (!ensureServiceReady("保存模型价格")) throw new Error("服务未就绪，无法保存模型价格");
       await accountClient.upsertModelPriceRule(params);
     },
     readModelPriceRule: async (modelPattern: string) => {
diff --git a/crates/service/src/apikey/apikey_models.rs b/crates/service/src/apikey/apikey_models.rs
index f3b7b8eb2..4fb2ea465 100644
--- a/crates/service/src/apikey/apikey_models.rs
+++ b/crates/service/src/apikey/apikey_models.rs
@@ -920,7 +920,13 @@ fn auto_associate_source_models(
     }
 
     if source_kind == ROUTING_SOURCE_KIND_AGGREGATE_API && auto_create_platform_models {
-        let _ = ensure_model_price_rules_for_aggregate_api(storage, source_id, &source_models);
+        if let Err(err) =
+            ensure_model_price_rules_for_aggregate_api(storage, source_id, &source_models)
+        {
+            log::warn!(
+                "aggregate API {source_id}: 自动创建模型价格规则失败: {err}"
+            );
+        }
     }
 
     Ok(())
diff --git a/crates/service/src/quota/read.rs b/crates/service/src/quota/read.rs
index 956689c1b..ba1993509 100644
--- a/crates/service/src/quota/read.rs
+++ b/crates/service/src/quota/read.rs
@@ -1552,18 +1552,18 @@ pub(crate) fn upsert_model_price_rule(
         updated_at: now,
     };
     if let Some(v) = rule.input_price_per_1m {
-        if v < 0.0 {
-            return Err("input_price_per_1m 不能为负数".to_string());
+        if !v.is_finite() || v < 0.0 {
+            return Err("input_price_per_1m 必须为非负有效数字".to_string());
         }
     }
     if let Some(v) = rule.cached_input_price_per_1m {
-        if v < 0.0 {
-            return Err("cached_input_price_per_1m 不能为负数".to_string());
+        if !v.is_finite() || v < 0.0 {
+            return Err("cached_input_price_per_1m 必须为非负有效数字".to_string());
         }
     }
     if let Some(v) = rule.output_price_per_1m {
-        if v < 0.0 {
-            return Err("output_price_per_1m 不能为负数".to_string());
+        if !v.is_finite() || v < 0.0 {
+            return Err("output_price_per_1m 必须为非负有效数字".to_string());
         }
     }
     storage

From 01e22879f625aa3930a857d47996428663944bd7 Mon Sep 17 00:00:00 2001
From: panzeyu2013 <1971614652@qq.com>
Date: Sat, 30 May 2026 21:46:07 +0800
Subject: [PATCH 5/5] fix: prevent zero-price rules from shadowing official
 pricing and improve save flow

- P1: skip auto-creating zero-price rules for known official model names
  via resolve_model_price check before aggregate API sync
- P2: move all local price validation before model save to avoid
  half-saved state (model saved, price rejected)
- P2: reject cached-input-only rules; require input+output when any
  price field is set
- Show 'model saved but price failed' message on RPC error
---
 .../components/modals/model-catalog-modal.tsx | 76 ++++++++++---------
 crates/service/src/apikey/apikey_models.rs    |  3 +
 2 files changed, 42 insertions(+), 37 deletions(-)

diff --git a/apps/src/components/modals/model-catalog-modal.tsx b/apps/src/components/modals/model-catalog-modal.tsx
index d6b3314dd..09716434a 100644
--- a/apps/src/components/modals/model-catalog-modal.tsx
+++ b/apps/src/components/modals/model-catalog-modal.tsx
@@ -349,6 +349,30 @@ export function ModelCatalogModal({
       updatedAt: model?.updatedAt ?? 0,
     };
 
+    const ip = draft.inputPricePer1m.trim();
+    const cp = draft.cachedInputPricePer1m.trim();
+    const op = draft.outputPricePer1m.trim();
+    const hasUserInput = ip !== "" || cp !== "" || op !== "";
+    const hasExisting = priceRule != null;
+
+    if (hasUserInput || hasExisting) {
+      const inputNum = ip !== "" ? Number(ip) : (priceRule?.inputPricePer1m ?? null);
+      const cachedNum = cp !== "" ? Number(cp) : (priceRule?.cachedInputPricePer1m ?? null);
+      const outputNum = op !== "" ? Number(op) : (priceRule?.outputPricePer1m ?? null);
+      if (
+        (inputNum !== null && (!Number.isFinite(inputNum) || inputNum < 0)) ||
+        (cachedNum !== null && (!Number.isFinite(cachedNum) || cachedNum < 0)) ||
+        (outputNum !== null && (!Number.isFinite(outputNum) || outputNum < 0))
+      ) {
+        setPriceError("价格必须为非负有效数字");
+        return;
+      }
+      if (inputNum == null || outputNum == null) {
+        setPriceError("输入价格和输出价格必须同时填写");
+        return;
+      }
+    }
+
     const saved = await onSave({
       previousSlug: model?.slug || null,
       sourceKind: nextModel.sourceKind,
@@ -357,45 +381,23 @@ export function ModelCatalogModal({
       model: nextModel,
     });
     if (saved) {
-      if (onSavePriceRule && slug) {
-        const ip = draft.inputPricePer1m.trim();
-        const cp = draft.cachedInputPricePer1m.trim();
-        const op = draft.outputPricePer1m.trim();
-        const hasUserInput = ip !== "" || cp !== "" || op !== "";
-        const hasExisting = priceRule != null;
-        if (hasUserInput || hasExisting) {
-          if (!hasExisting && (ip !== "" || op !== "") && (ip === "" || op === "")) {
-            setPriceError("输入价格和输出价格必须同时填写");
-            return;
-          }
-          try {
-            const inputNum = ip !== "" ? Number(ip) : (priceRule?.inputPricePer1m ?? null);
-            const cachedNum = cp !== "" ? Number(cp) : (priceRule?.cachedInputPricePer1m ?? null);
-            const outputNum = op !== "" ? Number(op) : (priceRule?.outputPricePer1m ?? null);
-            if (
-              (inputNum !== null && (!Number.isFinite(inputNum) || inputNum < 0)) ||
-              (cachedNum !== null && (!Number.isFinite(cachedNum) || cachedNum < 0)) ||
-              (outputNum !== null && (!Number.isFinite(outputNum) || outputNum < 0))
-            ) {
-              setPriceError("价格必须为非负有效数字");
-              return;
-            }
-            setSavingPrice(true);
-            await onSavePriceRule({
-              modelPattern: slug,
-              inputPricePer1m: inputNum,
-              cachedInputPricePer1m: cachedNum,
-              outputPricePer1m: outputNum,
-            });
-          } catch (error) {
-            setPriceError(
-              error instanceof Error ? error.message : String(error),
-            );
-            setSavingPrice(false);
-            return;
-          }
+      if (onSavePriceRule && slug && (hasUserInput || hasExisting)) {
+        try {
+          setSavingPrice(true);
+          await onSavePriceRule({
+            modelPattern: slug,
+            inputPricePer1m: hasUserInput ? (ip !== "" ? Number(ip) : (priceRule?.inputPricePer1m ?? null)) : null,
+            cachedInputPricePer1m: hasUserInput ? (cp !== "" ? Number(cp) : (priceRule?.cachedInputPricePer1m ?? null)) : null,
+            outputPricePer1m: hasUserInput ? (op !== "" ? Number(op) : (priceRule?.outputPricePer1m ?? null)) : null,
+          });
+        } catch (error) {
+          setPriceError(
+            `模型已保存，但价格保存失败: ${error instanceof Error ? error.message : String(error)}`,
+          );
           setSavingPrice(false);
+          return;
         }
+        setSavingPrice(false);
       }
       onOpenChange(false);
     }
diff --git a/crates/service/src/apikey/apikey_models.rs b/crates/service/src/apikey/apikey_models.rs
index 4fb2ea465..f33f059aa 100644
--- a/crates/service/src/apikey/apikey_models.rs
+++ b/crates/service/src/apikey/apikey_models.rs
@@ -950,6 +950,9 @@ fn ensure_model_price_rules_for_aggregate_api(
         if slug.is_empty() || existing_patterns.contains(&slug.to_ascii_lowercase()) {
             continue;
         }
+        if crate::quota::model_pricing::resolve_model_price(slug, 0).is_some() {
+            continue;
+        }
         storage
             .upsert_model_price_rule(&ModelPriceRule {
                 id: format!("agg-sync-{source_id}-{slug}"),