Port upstream 0.64.0: LLM Proxy base URL setting, private-network HTTP, tolerant quota_groups

apps/desktop-tauri/src-tauri/src/commands/provider_settings.rs

@@ -326,6 +326,7 @@ fn workspace_provider(provider_id: &str) -> Option<codexbar::core::ProviderId> {
         "devin" => ProviderId::Devin,
         "opencodego" => ProviderId::OpenCodeGo,
         "zed" => ProviderId::Zed,
+        "llmproxy" => ProviderId::LLMProxy,
         "xai" => ProviderId::Xai,
         "v0" => ProviderId::V0,
         "helmcode" => ProviderId::Helmcode,

apps/desktop-tauri/src/i18n/keys.ts

@@ -887,6 +887,10 @@ export const ALL_LOCALE_KEYS = [
   "Sub2ApiBaseUrlLabel",
   "Sub2ApiBaseUrlPlaceholder",
   "Sub2ApiBaseUrlHelp",
+  "LlmProxyTitle",
+  "LlmProxyBaseUrlLabel",
+  "LlmProxyBaseUrlPlaceholder",
+  "LlmProxyBaseUrlHelp",
 
   // Tray icon visibility (Windows 11 hidden-icons overflow)
   "PromoteTrayIconLabel",

apps/desktop-tauri/src/surfaces/settings/providers/sections/CredentialsDispatcher.tsx

@@ -39,6 +39,7 @@ export function CredentialsDispatcher({ providerId, t }: Props) {
     case "opencodego":
     case "zed":
     case "sub2api":
+    case "llmproxy":
     case "xai":
       return <OpenAiExtras providerId={providerId} t={t} />;
     case "openrouter":

apps/desktop-tauri/src/surfaces/settings/providers/sections/credentials/OpenAiExtras.tsx

@@ -114,6 +114,7 @@ const WORKSPACE_EXTRA_IDS: Record<string, true> = {
   opencodego: true,
   zed: true,
   sub2api: true,
+  llmproxy: true,
   xai: true,
   fireworks: true,
 };
@@ -162,6 +163,13 @@ function extraConfig(providerId: string, t: Props["t"]) {
         placeholder: t("Sub2ApiBaseUrlPlaceholder"),
         help: t("Sub2ApiBaseUrlHelp"),
       };
+    case "llmproxy":
+      return {
+        title: t("LlmProxyTitle"),
+        label: t("LlmProxyBaseUrlLabel"),
+        placeholder: t("LlmProxyBaseUrlPlaceholder"),
+        help: t("LlmProxyBaseUrlHelp"),
+      };
     case "xai":
       return {
         title: "xAI team",

rust/src/locale.rs

@@ -1167,6 +1167,10 @@ locale_keys! {
     Sub2ApiBaseUrlLabel,
     Sub2ApiBaseUrlPlaceholder,
     Sub2ApiBaseUrlHelp,
+    LlmProxyTitle,
+    LlmProxyBaseUrlLabel,
+    LlmProxyBaseUrlPlaceholder,
+    LlmProxyBaseUrlHelp,
 
     // Tray icon visibility (Windows 11 hidden-icons overflow)
     PromoteTrayIconLabel,

rust/src/locale/en-US.ftl

@@ -797,6 +797,10 @@ Sub2ApiTitle = sub2api
 Sub2ApiBaseUrlLabel = Base URL
 Sub2ApiBaseUrlPlaceholder = https://sub2api.example.com
 Sub2ApiBaseUrlHelp = Deployment URL for GET /v1/usage. Use HTTPS, or loopback HTTP (127.0.0.1 / localhost) for local development.
+LlmProxyTitle = LLM Proxy
+LlmProxyBaseUrlLabel = Base URL
+LlmProxyBaseUrlPlaceholder = https://proxy.example.com
+LlmProxyBaseUrlHelp = Base URL for the LLM-API-Key-Proxy instance, used for /v1/quota-stats. Use HTTPS, or plain HTTP for loopback, private-network and .local hosts. LLM_PROXY_BASE_URL is the fallback.
 PromoteTrayIconLabel = Pin to Taskbar (Windows 11)
 PromoteTrayIconHelper = Always show the CodexBar icon on the taskbar instead of inside the overflow chevron
 PromoteTrayIconUnsupportedHint = Not available on this operating system. Drag the icon out of the ^ overflow area in Windows Settings > Taskbar to pin it manually.

rust/src/providers/alibabatokenplan/cli.rs

@@ -160,7 +160,7 @@ fn reset_date(value: Option<&Value>) -> Option<chrono::DateTime<Utc>> {
         return None;
     }
     let rounded = milliseconds.round();
-    if rounded < 1.0 || rounded >= 9_223_372_036_854_775_808.0 {
+    if !(1.0..9_223_372_036_854_775_808.0).contains(&rounded) {
         return None;
     }
     let millis = format!("{rounded:.0}").parse::<i64>().ok()?;

rust/src/providers/kiro/usage_limits.rs

@@ -312,9 +312,9 @@ fn endpoint_for_profile_arn(profile_arn: &str) -> Option<&'static str> {
         || fields[0] != "arn"
         || fields[1] != "aws"
         || fields[2] != "codewhisperer"
-        || !fields[5]
+        || fields[5]
             .strip_prefix("profile/")
-            .is_some_and(|name| !name.is_empty())
+            .is_none_or(|name| name.is_empty())
     {
         return None;
     }