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

2026-07-30 02:14:43 +08:00 · 2026-01-27 12:49:36 +08:00
parent 11a9bb0c14 c74f801d66
commit 40373538d3
29 changed files with 2158 additions and 309 deletions
@@ -896,6 +896,10 @@ pub fn run() {
            commands::update_global_proxy_config,
            commands::get_proxy_config_for_app,
            commands::update_proxy_config_for_app,
+            commands::get_default_cost_multiplier,
+            commands::set_default_cost_multiplier,
+            commands::get_pricing_model_source,
+            commands::set_pricing_model_source,
            commands::is_proxy_running,
            commands::is_live_takeover_active,
            commands::switch_proxy_provider,