merge: resolve conflicts from main branch, keep both pricing and common config features

src/components/providers/forms/ProviderForm.tsx

@@ -53,7 +53,10 @@ import { BasicFormFields } from "./BasicFormFields";
 import { ClaudeFormFields } from "./ClaudeFormFields";
 import { CodexFormFields } from "./CodexFormFields";
 import { GeminiFormFields } from "./GeminiFormFields";
-import { ProviderAdvancedConfig } from "./ProviderAdvancedConfig";
+import {
+  ProviderAdvancedConfig,
+  type PricingModelSourceOption,
+} from "./ProviderAdvancedConfig";
 import {
   useProviderCategory,
   useApiKeyState,
@@ -158,6 +161,9 @@ interface ProviderFormProps {
   showButtons?: boolean;
 }
 
+const normalizePricingSource = (value?: string): PricingModelSourceOption =>
+  value === "request" || value === "response" ? value : "inherit";
+
 export function ProviderForm({
   appId,
   providerId,
@@ -205,6 +211,19 @@ export function ProviderForm({
   const [proxyConfig, setProxyConfig] = useState<ProviderProxyConfig>(
     () => initialData?.meta?.proxyConfig ?? { enabled: false },
   );
+  const [pricingConfig, setPricingConfig] = useState<{
+    enabled: boolean;
+    costMultiplier?: string;
+    pricingModelSource: PricingModelSourceOption;
+  }>(() => ({
+    enabled:
+      initialData?.meta?.costMultiplier !== undefined ||
+      initialData?.meta?.pricingModelSource !== undefined,
+    costMultiplier: initialData?.meta?.costMultiplier,
+    pricingModelSource: normalizePricingSource(
+      initialData?.meta?.pricingModelSource,
+    ),
+  }));
 
   // 使用 category hook
   const { category } = useProviderCategory({
@@ -225,6 +244,15 @@ export function ProviderForm({
     setEndpointAutoSelect(initialData?.meta?.endpointAutoSelect ?? true);
     setTestConfig(initialData?.meta?.testConfig ?? { enabled: false });
     setProxyConfig(initialData?.meta?.proxyConfig ?? { enabled: false });
+    setPricingConfig({
+      enabled:
+        initialData?.meta?.costMultiplier !== undefined ||
+        initialData?.meta?.pricingModelSource !== undefined,
+      costMultiplier: initialData?.meta?.costMultiplier,
+      pricingModelSource: normalizePricingSource(
+        initialData?.meta?.pricingModelSource,
+      ),
+    });
   }, [appId, initialData]);
 
   const defaultValues: ProviderFormData = useMemo(
@@ -1116,6 +1144,13 @@ export function ProviderForm({
       // 添加高级配置
       testConfig: testConfig.enabled ? testConfig : undefined,
       proxyConfig: proxyConfig.enabled ? proxyConfig : undefined,
+      costMultiplier: pricingConfig.enabled
+        ? pricingConfig.costMultiplier
+        : undefined,
+      pricingModelSource:
+        pricingConfig.enabled && pricingConfig.pricingModelSource !== "inherit"
+          ? pricingConfig.pricingModelSource
+          : undefined,
       ...(shouldPersistCommonConfigEnabledByApp
         ? { commonConfigEnabledByApp }
         : {}),
@@ -1646,8 +1681,10 @@ export function ProviderForm({
         <ProviderAdvancedConfig
           testConfig={testConfig}
           proxyConfig={proxyConfig}
+          pricingConfig={pricingConfig}
           onTestConfigChange={setTestConfig}
           onProxyConfigChange={setProxyConfig}
+          onPricingConfigChange={setPricingConfig}
         />
 
         {showButtons && (