Port upstream CodexBar 0.49.0-0.49.2

apps/desktop-tauri/src/components/providers/providerIcons.ts

@@ -18,6 +18,7 @@ import crossmodel from "./icons/ProviderIcon-crossmodel.svg?raw";
 import cursor from "./icons/ProviderIcon-cursor.svg?raw";
 import deepgram from "./icons/ProviderIcon-deepgram.svg?raw";
 import deepinfra from "./icons/ProviderIcon-deepinfra.svg?raw";
+import fireworks from "./icons/ProviderIcon-fireworks.svg?raw";
 import aiand from "./icons/ProviderIcon-aiand.svg?raw";
 import clinepass from "./icons/ProviderIcon-clinepass.svg?raw";
 import longcat from "./icons/ProviderIcon-longcat.svg?raw";
@@ -99,6 +100,7 @@ const RAW: Record<string, string> = {
   cursor: tint(cursor),
   deepgram: tint(deepgram),
   deepinfra: tint(deepinfra),
+  fireworks: tint(fireworks),
   aiand: tint(aiand),
   clinepass: tint(clinepass),
   longcat: tint(longcat),
@@ -158,6 +160,7 @@ export const PROVIDER_ICON_REGISTRY: Record<string, ProviderIcon> = {
   cursor:      { id: "cursor",      brandColor: "#00bfa5", fallbackLetter: "▸", svgPath: RAW.cursor },
   deepgram:    { id: "deepgram",    brandColor: "#13ef93", fallbackLetter: "D", svgPath: RAW.deepgram },
   deepinfra:   { id: "deepinfra",   brandColor: "#2a3275", fallbackLetter: "D", svgPath: RAW.deepinfra },
+  fireworks:   { id: "fireworks",   brandColor: "#f25b1c", fallbackLetter: "F", svgPath: RAW.fireworks },
   aiand:       { id: "aiand",       brandColor: "#e25c2b", fallbackLetter: "&", svgPath: RAW.aiand },
   clinepass:   { id: "clinepass",   brandColor: "#61a3fa", fallbackLetter: "C", svgPath: RAW.clinepass },
   longcat:     { id: "longcat",     brandColor: "#ffd100", fallbackLetter: "L", svgPath: RAW.longcat },
@@ -246,8 +249,10 @@ const ALIASES: Record<string, string> = {
   "deep seek": "deepseek",
   "deep-seek": "deepseek",
   "deep infra": "deepinfra",
-  "deep-infra": "deepinfra",
-  di: "deepinfra",
+    "deep-infra": "deepinfra",
+    di: "deepinfra",
+    "fireworks-ai": "fireworks",
+    fw: "fireworks",
   "ai&": "aiand",
   "ai-and": "aiand",
   "ai and": "aiand",

apps/desktop-tauri/src/styles.css

@@ -4267,14 +4267,20 @@ html:has(.menu-surface--tray) {
 .menu-metric__reset {
   font-size: 11px;
   color: var(--text-secondary);
-  white-space: nowrap;
-  /* Long provider descriptions (credits remaining, etc.) used to overflow
-     the tray card because nowrap had no max-width/ellipsis. */
+  /* Upstream 0.49.0 #2742 (refs #2182): long metric reset and pace details
+     wrap to a second line instead of truncating, so non-English locales keep
+     the full reset information. #2846: the percent value keeps its own line
+     slot (row only stacks when both cannot fit) and the two-line clamp keeps
+     cached card heights bounded. */
   min-width: 0;
   max-width: 62%;
-  overflow: hidden;
-  text-overflow: ellipsis;
   text-align: right;
+  white-space: normal;
+  overflow-wrap: break-word;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+  overflow: hidden;
 }
 
 .menu-metric__exhausted {

apps/desktop-tauri/src/surfaces/TrayPanel.tsx

@@ -24,7 +24,7 @@ const HAS_DASHBOARD = new Set([
   "mimo", "minimax", "mistral", "nanogpt", "notion", "ollama", "openaiapi",
   "opencode", "opencodego", "openrouter", "perplexity", "qoder", "codebuddy", "sakana", "stepfun",
   "t3chat", "venice", "vertexai", "warp", "windsurf",
-  "xai", "zai",
+  "xai", "zai", "fireworks",
 ]);
 /** Provider IDs that have a status page URL in the backend */
 const HAS_STATUS_PAGE = new Set([

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

@@ -115,6 +115,7 @@ const WORKSPACE_EXTRA_IDS: Record<string, true> = {
   zed: true,
   sub2api: true,
   xai: true,
+  fireworks: true,
 };
 
 function extraConfig(providerId: string, t: Props["t"]) {
@@ -168,6 +169,13 @@ function extraConfig(providerId: string, t: Props["t"]) {
         placeholder: "xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx",
         help: "Required. Shown in the xAI Console URL and team settings. Or set XAI_TEAM_ID. Pair with a Management API key (not an inference key).",
       };
+    case "fireworks":
+      return {
+        title: "Fireworks account",
+        label: "Account slug",
+        placeholder: "your-account-slug",
+        help: "From app.fireworks.ai/accounts/<slug>. Or set FIREWORKS_ACCOUNT_SLUG. Pair with a Fireworks API key to read 30-day rated billing spend.",
+      };
     default:
       return null;
   }

apps/desktop-tauri/src/surfaces/settings/tabs/ProvidersTab.tsx

@@ -248,6 +248,7 @@ function providerSourceHintShort(
     case "groq":
     case "llmproxy":
     case "xai":
+    case "fireworks":
       return t("ProviderSourceApiShort");
     case "kiro":
       return t("ProviderSourceKiroEnvShort");

apps/desktop-tauri/src/test/providerCatalog.ts

@@ -34,6 +34,7 @@ export const TEST_PROVIDER_CATALOG: Array<[string, string]> = [
   ["codebuff", "Codebuff"],
   ["deepseek", "DeepSeek"],
   ["deepinfra", "DeepInfra"],
+  ["fireworks", "Fireworks"],
   ["aiand", "ai&"],
   ["zenmux", "ZenMux"],
   ["clinepass", "ClinePass"],

rust/src/core/provider.rs

@@ -80,6 +80,7 @@ pub enum ProviderId {
     QwenCloud,
     Notion,
     Xai,
+    Fireworks,
 }
 
 impl ProviderId {
@@ -155,6 +156,7 @@ impl ProviderId {
             ProviderId::QwenCloud,
             ProviderId::Notion,
             ProviderId::Xai,
+            ProviderId::Fireworks,
         ]
     }
 
@@ -196,6 +198,7 @@ impl ProviderId {
             ProviderId::Codebuff => "codebuff",
             ProviderId::DeepSeek => "deepseek",
             ProviderId::DeepInfra => "deepinfra",
+            ProviderId::Fireworks => "fireworks",
             ProviderId::AiAnd => "aiand",
             ProviderId::Windsurf => "windsurf",
             ProviderId::Manus => "manus",
@@ -272,6 +275,7 @@ impl ProviderId {
             ProviderId::Codebuff => "Codebuff",
             ProviderId::DeepSeek => "DeepSeek",
             ProviderId::DeepInfra => "DeepInfra",
+            ProviderId::Fireworks => "Fireworks",
             ProviderId::AiAnd => "ai&",
             ProviderId::Windsurf => "Windsurf",
             ProviderId::Manus => "Manus",
@@ -361,6 +365,7 @@ impl ProviderId {
             ProviderId::Codebuff => None,
             ProviderId::DeepSeek => None,
             ProviderId::DeepInfra => None,
+            ProviderId::Fireworks => None,
             ProviderId::AiAnd => None,
             ProviderId::Windsurf => None,
             ProviderId::Doubao => None,
@@ -433,6 +438,7 @@ impl ProviderId {
             "codebuff" | "manicode" => Some(ProviderId::Codebuff),
             "deepseek" | "deep-seek" | "ds" => Some(ProviderId::DeepSeek),
             "deepinfra" | "deep-infra" | "di" => Some(ProviderId::DeepInfra),
+            "fireworks" | "fireworks-ai" | "fw" => Some(ProviderId::Fireworks),
             "aiand" | "ai&" | "ai-and" | "ai and" => Some(ProviderId::AiAnd),
             "windsurf" | "codeium" => Some(ProviderId::Windsurf),
             "manus" => Some(ProviderId::Manus),
@@ -681,6 +687,8 @@ pub fn cli_name_map() -> HashMap<&'static str, ProviderId> {
     map.insert("ds", ProviderId::DeepSeek);
     map.insert("deep-infra", ProviderId::DeepInfra);
     map.insert("di", ProviderId::DeepInfra);
+    map.insert("fireworks-ai", ProviderId::Fireworks);
+    map.insert("fw", ProviderId::Fireworks);
     map.insert("ai&", ProviderId::AiAnd);
     map.insert("ai-and", ProviderId::AiAnd);
     map.insert("codeium", ProviderId::Windsurf);
@@ -740,9 +748,10 @@ mod tests {
     #[test]
     fn test_provider_id_all() {
         let all = ProviderId::all();
-        assert_eq!(all.len(), 69);
+        assert_eq!(all.len(), 70);
         assert!(all.contains(&ProviderId::Claude));
         assert!(all.contains(&ProviderId::Codex));
+        assert!(all.contains(&ProviderId::Fireworks));
         assert!(all.contains(&ProviderId::Kimi));
         assert!(all.contains(&ProviderId::KimiK2));
         assert!(all.contains(&ProviderId::Amp));

rust/src/core/provider_factory.rs

@@ -12,9 +12,9 @@ use crate::providers::{
     ClaudeProvider, ClinePassProvider, CodeBuddyProvider, CodebuffProvider, CodexProvider,
     CommandCodeProvider, CopilotProvider, CrofProvider, CrossModelProvider, CursorProvider,
     DeepInfraProvider, DeepSeekProvider, DeepgramProvider, DevinProvider, DoubaoProvider,
-    ElevenLabsProvider, FactoryProvider, GeminiProvider, GrokProvider, GroqProvider,
-    InfiniProvider, JetBrainsProvider, KiloProvider, KimiK2Provider, KimiProvider, KiroProvider,
-    LLMProxyProvider, LiteLLMProvider, LongCatProvider, ManusProvider, MiMoProvider,
+    ElevenLabsProvider, FactoryProvider, FireworksProvider, GeminiProvider, GrokProvider,
+    GroqProvider, InfiniProvider, JetBrainsProvider, KiloProvider, KimiK2Provider, KimiProvider,
+    KiroProvider, LLMProxyProvider, LiteLLMProvider, LongCatProvider, ManusProvider, MiMoProvider,
     MiniMaxProvider, MistralProvider, NanoGPTProvider, NeuralwattProvider, NotionProvider,
     OllamaProvider, OpenAIApiProvider, OpenCodeGoProvider, OpenCodeProvider, OpenRouterProvider,
     PerplexityProvider, PoeProvider, QoderProvider, QwenCloudProvider, SakanaProvider,
@@ -98,6 +98,7 @@ pub fn instantiate(id: ProviderId) -> Box<dyn Provider> {
         ProviderId::QwenCloud => Box::new(QwenCloudProvider::new()),
         ProviderId::Notion => Box::new(NotionProvider::new()),
         ProviderId::Xai => Box::new(XaiProvider::new()),
+        ProviderId::Fireworks => Box::new(FireworksProvider::new()),
     }
 }
 

rust/src/core/token_accounts.rs

@@ -343,7 +343,8 @@ impl TokenAccountSupport {
             | ProviderId::CrossModel
             | ProviderId::LongCat
             | ProviderId::Wayfinder
-            | ProviderId::QwenCloud => None,
+            | ProviderId::QwenCloud
+            | ProviderId::Fireworks => None,
         }
     }