diff --git a/.changeset/chat-custom-agent-capture.md b/.changeset/chat-custom-agent-capture.md
deleted file mode 100644
index 8729cda8c94..00000000000
--- a/.changeset/chat-custom-agent-capture.md
+++ /dev/null
@@ -1,22 +0,0 @@
----
-"@trigger.dev/sdk": patch
----
-
-Custom chat agent loops get two ergonomic wins for owning the turn loop.
-
-`chat.writeTurnComplete()` now returns the turn boundary's resume cursors (`lastEventId` for the output stream and `sessionInEventId` for the input stream), so you can persist them straight from the task instead of round-tripping them back from the client.
-
-```ts
-const { lastEventId, sessionInEventId } = await chat.writeTurnComplete();
-await db.chats.update(chatId, { lastEventId, sessionInEventId });
-```
-
-`chat.pipeAndCapture()` no longer throws when a stream is stopped or fails. It now returns a `PipeAndCaptureResult` whose `message` holds any partial output captured before the stop or failure, alongside a typed `status` (`"complete" | "aborted" | "error"`) and, on failure, the `error`. Read the message off the result:
-
-```ts
-const { message, status, error } = await chat.pipeAndCapture(result, { signal });
-if (message) conversation.addResponse(message);
-if (status === "error") logger.error("turn failed", { error });
-```
-
-Note: `pipeAndCapture` previously resolved to `UIMessage | undefined`. Update call sites to read `.message` from the returned result.
diff --git a/.changeset/vite-ignore-optional-imports.md b/.changeset/vite-ignore-optional-imports.md
index 286f80132de..1720d87044e 100644
--- a/.changeset/vite-ignore-optional-imports.md
+++ b/.changeset/vite-ignore-optional-imports.md
@@ -2,4 +2,4 @@
 "@trigger.dev/sdk": patch
 ---
 
-Suppress a build-time warning that could appear in Vite-based projects when the optional `@ai-sdk/otel` package is not installed.
+Annotate the optional `@ai-sdk/otel` dynamic import with `@vite-ignore` so Vite-based bundlers don't warn about an unanalyzable import.
diff --git a/.gitignore b/.gitignore
index c1fe3103332..1ee5643d57d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,3 +76,6 @@ apps/**/public/build
 ailogger-output.log
 # per-package vitest timing capture (transient; merged into root test-timings.json)
 .vitest-timing.json
+
+# local git worktree checkouts (not source) — keeps oxfmt/oxlint from descending into them
+.worktrees/
diff --git a/.server-changes/default-billing-alerts.md b/.server-changes/default-billing-alerts.md
new file mode 100644
index 00000000000..e828c506050
--- /dev/null
+++ b/.server-changes/default-billing-alerts.md
@@ -0,0 +1,6 @@
+---
+area: webapp
+type: improvement
+---
+
+Organizations without billing alerts now get default spend alert thresholds, so you're notified before usage grows unexpectedly. The billing limit page no longer pre-selects an option before you've set a limit and prompts you to configure one. Alert previews now update immediately after you change your billing limit.
diff --git a/.server-changes/entrypoint-no-log-db-connection-strings.md b/.server-changes/entrypoint-no-log-db-connection-strings.md
new file mode 100644
index 00000000000..611408cf14c
--- /dev/null
+++ b/.server-changes/entrypoint-no-log-db-connection-strings.md
@@ -0,0 +1,6 @@
+---
+area: webapp
+type: fix
+---
+
+Container startup no longer prints database and ClickHouse connection strings (with credentials) to the logs.
diff --git a/.server-changes/light-theme.md b/.server-changes/light-theme.md
new file mode 100644
index 00000000000..ca2b34b7047
--- /dev/null
+++ b/.server-changes/light-theme.md
@@ -0,0 +1,6 @@
+---
+area: webapp
+type: feature
+---
+
+Adds an opt-in Interface theme setting on the account page behind a feature flag. Choose Classic (the default), System preference (follows your OS), Dark, or Light, and fine-tune the new themes with a contrast slider. System preference switches automatically when your OS appearance changes.
diff --git a/.server-changes/prevent-duplicate-root-environments.md b/.server-changes/prevent-duplicate-root-environments.md
deleted file mode 100644
index 0710595deb7..00000000000
--- a/.server-changes/prevent-duplicate-root-environments.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-area: webapp
-type: fix
----
-
-Prevent duplicate Staging and Preview environments when account setup requests overlap
diff --git a/.server-changes/realtime-emission-fanout-metrics.md b/.server-changes/realtime-emission-fanout-metrics.md
new file mode 100644
index 00000000000..bd9ef83afbc
--- /dev/null
+++ b/.server-changes/realtime-emission-fanout-metrics.md
@@ -0,0 +1,6 @@
+---
+area: webapp
+type: improvement
+---
+
+Add metrics to the realtime backend that measure how often a single changed run is served to multiple subscriptions in one batch.
diff --git a/.server-changes/side-menu-project-and-org-menus.md b/.server-changes/side-menu-project-and-org-menus.md
deleted file mode 100644
index 5558a1cec3d..00000000000
--- a/.server-changes/side-menu-project-and-org-menus.md
+++ /dev/null
@@ -1,6 +0,0 @@
----
-area: webapp
-type: improvement
----
-
-Refreshed the side menu: separate organization and account menus, a new project switcher, and the menu is now resizable by dragging its edge. The account Profile page has also been redesigned.
diff --git a/.server-changes/supervisor-outbound-request-metrics.md b/.server-changes/supervisor-outbound-request-metrics.md
new file mode 100644
index 00000000000..c66a499b815
--- /dev/null
+++ b/.server-changes/supervisor-outbound-request-metrics.md
@@ -0,0 +1,6 @@
+---
+area: supervisor
+type: improvement
+---
+
+Improved supervisor observability: it now reports metrics for its outbound requests, making failed calls to upstream services easier to monitor.
diff --git a/apps/supervisor/src/index.ts b/apps/supervisor/src/index.ts
index cf73be90eea..f30203df547 100644
--- a/apps/supervisor/src/index.ts
+++ b/apps/supervisor/src/index.ts
@@ -22,7 +22,7 @@ import {
   isKubernetesEnvironment,
 } from "@trigger.dev/core/v3/serverOnly";
 import { createK8sApi, createApiserverMetricsFetcher } from "./clients/kubernetes.js";
-import { collectDefaultMetrics, Gauge, Histogram } from "prom-client";
+import { collectDefaultMetrics, Counter, Gauge, Histogram } from "prom-client";
 import { register } from "./metrics.js";
 import { PodCleaner } from "./services/podCleaner.js";
 import { FailedPodHandler } from "./services/failedPodHandler.js";
@@ -60,6 +60,21 @@ const workloadCreateDuration = new Histogram({
   registers: [register],
 });
 
+const outboundRequestsTotal = new Counter({
+  name: "supervisor_outbound_request_total",
+  help: "Count of outbound HTTP requests from the supervisor, by target name, method, response status, and outcome (ok, http_error, invalid_response, network_error).",
+  labelNames: ["name", "method", "status", "outcome"],
+  registers: [register],
+});
+
+const outboundRequestDuration = new Histogram({
+  name: "supervisor_outbound_request_duration_seconds",
+  help: "Duration of outbound HTTP requests from the supervisor, by target name and outcome. Includes the HTTP client's internal retries and backoff.",
+  labelNames: ["name", "outcome"],
+  buckets: [0.005, 0.01, 0.025, 0.05, 0.1, 0.25, 0.5, 1, 2, 5, 10, 11, 12.5, 15, 20, 30, 60],
+  registers: [register],
+});
+
 class ManagedSupervisor {
   private readonly workerSession: SupervisorSession;
   private readonly metricsServer?: HttpServer;
@@ -322,6 +337,10 @@ class ManagedSupervisor {
       runNotificationsEnabled: env.TRIGGER_WORKLOAD_API_ENABLED,
       heartbeatIntervalSeconds: env.TRIGGER_WORKER_HEARTBEAT_INTERVAL_SECONDS,
       sendRunDebugLogs: env.SEND_RUN_DEBUG_LOGS,
+      onHttpRequestComplete: ({ name, method, status, outcome, durationMs }) => {
+        outboundRequestsTotal.inc({ name, method, status, outcome });
+        outboundRequestDuration.observe({ name, outcome }, durationMs / 1000);
+      },
       preDequeue: async () => {
         // Synchronous, hot-path-safe cached read; false when no monitors are active.
         const skipForBackpressure = this.backpressureMonitors.some((m) => m.shouldSkipDequeue());
@@ -692,6 +711,18 @@ class ManagedSupervisor {
       headers.traceparent = traceparent;
     }
 
+    const requestStart = performance.now();
+    const record = (
+      status: string,
+      outcome: "ok" | "http_error" | "invalid_response" | "network_error"
+    ) => {
+      outboundRequestsTotal.inc({ name: "warm_start", method: "POST", status, outcome });
+      outboundRequestDuration.observe(
+        { name: "warm_start", outcome },
+        (performance.now() - requestStart) / 1000
+      );
+    };
+
     try {
       const res = await fetch(warmStartUrlWithPath.href, {
         method: "POST",
@@ -700,8 +731,10 @@ class ManagedSupervisor {
       });
 
       if (!res.ok) {
+        record(String(res.status), "http_error");
         this.logger.error("Warm start failed", {
           runId: dequeuedMessage.run.id,
+          statusCode: res.status,
         });
         return false;
       }
@@ -710,6 +743,7 @@ class ManagedSupervisor {
       const parsedData = z.object({ didWarmStart: z.boolean() }).safeParse(data);
 
       if (!parsedData.success) {
+        record(String(res.status), "invalid_response");
         this.logger.error("Warm start response invalid", {
           runId: dequeuedMessage.run.id,
           data,
@@ -717,8 +751,11 @@ class ManagedSupervisor {
         return false;
       }
 
+      record(String(res.status), "ok");
+
       return parsedData.data.didWarmStart;
     } catch (error) {
+      record("none", "network_error");
       this.logger.error("Warm start error", {
         runId: dequeuedMessage.run.id,
         error,
diff --git a/apps/supervisor/src/workloadToken.ts b/apps/supervisor/src/workloadToken.ts
index 914411dd735..d28a6150744 100644
--- a/apps/supervisor/src/workloadToken.ts
+++ b/apps/supervisor/src/workloadToken.ts
@@ -4,7 +4,7 @@ import {
   type WorkloadDeploymentTokenClaims,
   type WorkloadDeploymentTokenInput,
 } from "@trigger.dev/core/v3";
-import { Counter } from "prom-client";
+import { Counter, Gauge } from "prom-client";
 import { env } from "./env.js";
 import { register } from "./metrics.js";
 
@@ -37,6 +37,16 @@ const verifyCounter = new Counter({
   registers: [register],
 });
 
+// Exports the active mode (value 1 for the current WORKLOAD_TOKEN_ENFORCEMENT) so dashboards can show
+// disabled/log/enforce at a glance — the counters alone don't distinguish log from enforce.
+const enforcementModeGauge = new Gauge({
+  name: "workload_token_enforcement_mode",
+  help: "Active runner-boundary auth mode: value 1 for the label matching WORKLOAD_TOKEN_ENFORCEMENT",
+  labelNames: ["mode"] as const,
+  registers: [register],
+});
+enforcementModeGauge.set({ mode: env.WORKLOAD_TOKEN_ENFORCEMENT }, 1);
+
 export async function mintDeploymentToken(
   claims: WorkloadDeploymentTokenInput
 ): Promise<string | undefined> {
diff --git a/apps/webapp/app/assets/icons/MachineIcon.tsx b/apps/webapp/app/assets/icons/MachineIcon.tsx
index f07e7467b0d..896ccdfbc5f 100644
--- a/apps/webapp/app/assets/icons/MachineIcon.tsx
+++ b/apps/webapp/app/assets/icons/MachineIcon.tsx
@@ -48,20 +48,25 @@ export function MachineDefaultIcon({ className }: { className?: string }) {
 
 function MachineIconNoMachine({ className }: { className?: string }) {
   return (
-    <svg className={className} viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <svg
+      className={cn("text-[#D7D9DD] light:text-charcoal-500", className)}
+      viewBox="0 0 20 20"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
       <path
         d="M16.1875 13C16.6362 13 17 13.3638 17 13.8125V16.1875C17 16.6362 16.6362 17 16.1875 17H6.18945C6.25882 16.9453 6.32663 16.8872 6.39062 16.8232L10.2139 13H16.1875Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
       <path
         d="M4.84961 12H3.8125C3.36377 12 3 11.6362 3 11.1875V8.8125C3 8.36377 3.36377 8 3.8125 8H8.84961L4.84961 12ZM16.1875 8C16.6362 8 17 8.36377 17 8.8125V11.1875C17 11.6362 16.6362 12 16.1875 12H11.2139L15.2139 8H16.1875Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
       <path
         d="M9.85059 7H3.8125C3.36377 7 3 6.63623 3 6.1875V3.8125C3 3.36377 3.36377 3 3.8125 3H13.8506L9.85059 7Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
       <line
@@ -69,7 +74,7 @@ function MachineIconNoMachine({ className }: { className?: string }) {
         y1="16.9998"
         x2="17.0018"
         y2="2.99805"
-        stroke="#D7D9DD"
+        stroke="currentColor"
         strokeOpacity="0.4"
         strokeWidth="2"
         strokeLinecap="round"
@@ -83,17 +88,17 @@ function MachineIconMicro({ className }: { className?: string }) {
     <svg className={className} viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
       <path
         d="M16.1875 13C16.6362 13 17 13.3638 17 13.8125V16.1875C17 16.6362 16.6362 17 16.1875 17H3.8125C3.36377 17 3 16.6362 3 16.1875V13.8125C3 13.3638 3.36377 13 3.8125 13H16.1875ZM5 14C4.44772 14 4 14.4477 4 15C4 15.5523 4.44772 16 5 16C5.55228 16 6 15.5523 6 15C6 14.4477 5.55228 14 5 14Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
       <path
         d="M16.1875 8C16.6362 8 17 8.36377 17 8.8125V11.1875C17 11.6362 16.6362 12 16.1875 12H3.8125C3.36377 12 3 11.6362 3 11.1875V8.8125C3 8.36377 3.36377 8 3.8125 8H16.1875ZM5 9C4.44772 9 4 9.44772 4 10C4 10.5523 4.44772 11 5 11C5.55228 11 6 10.5523 6 10C6 9.44772 5.55228 9 5 9Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
       <path
         d="M16.1875 3C16.6362 3 17 3.36377 17 3.8125V6.1875C17 6.63623 16.6362 7 16.1875 7H3.8125C3.36377 7 3 6.63623 3 6.1875V3.8125C3 3.36377 3.36377 3 3.8125 3H16.1875ZM5 4C4.44772 4 4 4.44772 4 5C4 5.55228 4.44772 6 5 6C5.55228 6 6 5.55228 6 5C6 4.44772 5.55228 4 5 4Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
     </svg>
@@ -109,12 +114,12 @@ function MachineIconSmall1x({ className }: { className?: string }) {
       />
       <path
         d="M16.1875 8C16.6362 8 17 8.36377 17 8.8125V11.1875C17 11.6362 16.6362 12 16.1875 12H3.8125C3.36377 12 3 11.6362 3 11.1875V8.8125C3 8.36377 3.36377 8 3.8125 8H16.1875ZM5 9C4.44772 9 4 9.44772 4 10C4 10.5523 4.44772 11 5 11C5.55228 11 6 10.5523 6 10C6 9.44772 5.55228 9 5 9Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
       <path
         d="M16.1875 3C16.6362 3 17 3.36377 17 3.8125V6.1875C17 6.63623 16.6362 7 16.1875 7H3.8125C3.36377 7 3 6.63623 3 6.1875V3.8125C3 3.36377 3.36377 3 3.8125 3H16.1875ZM5 4C4.44772 4 4 4.44772 4 5C4 5.55228 4.44772 6 5 6C5.55228 6 6 5.55228 6 5C6 4.44772 5.55228 4 5 4Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
     </svg>
@@ -130,12 +135,12 @@ function MachineIconSmall2x({ className }: { className?: string }) {
       />
       <path
         d="M16.1875 8C16.6362 8 17 8.36377 17 8.8125V11.1875C17 11.6362 16.6362 12 16.1875 12H3.8125C3.36377 12 3 11.6362 3 11.1875V8.8125C3 8.36377 3.36377 8 3.8125 8H16.1875ZM5 9C4.44772 9 4 9.44772 4 10C4 10.5523 4.44772 11 5 11C5.55228 11 6 10.5523 6 10C6 9.44772 5.55228 9 5 9Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
       <path
         d="M16.1875 3C16.6362 3 17 3.36377 17 3.8125V6.1875C17 6.63623 16.6362 7 16.1875 7H3.8125C3.36377 7 3 6.63623 3 6.1875V3.8125C3 3.36377 3.36377 3 3.8125 3H16.1875ZM5 4C4.44772 4 4 4.44772 4 5C4 5.55228 4.44772 6 5 6C5.55228 6 6 5.55228 6 5C6 4.44772 5.55228 4 5 4Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
     </svg>
@@ -155,7 +160,7 @@ function MachineIconMedium1x({ className }: { className?: string }) {
       />
       <path
         d="M16.1875 3C16.6362 3 17 3.36377 17 3.8125V6.1875C17 6.63623 16.6362 7 16.1875 7H3.8125C3.36377 7 3 6.63623 3 6.1875V3.8125C3 3.36377 3.36377 3 3.8125 3H16.1875ZM5 4C4.44772 4 4 4.44772 4 5C4 5.55228 4.44772 6 5 6C5.55228 6 6 5.55228 6 5C6 4.44772 5.55228 4 5 4Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
     </svg>
@@ -175,7 +180,7 @@ function MachineIconMedium2x({ className }: { className?: string }) {
       />
       <path
         d="M16.1875 3C16.6362 3 17 3.36377 17 3.8125V6.1875C17 6.63623 16.6362 7 16.1875 7H3.8125C3.36377 7 3 6.63623 3 6.1875V3.8125C3 3.36377 3.36377 3 3.8125 3H16.1875ZM5 4C4.44772 4 4 4.44772 4 5C4 5.55228 4.44772 6 5 6C5.55228 6 6 5.55228 6 5C6 4.44772 5.55228 4 5 4Z"
-        fill="#D7D9DD"
+        fill="currentColor"
         fillOpacity="0.4"
       />
     </svg>
diff --git a/apps/webapp/app/assets/images/blurred-dashboard-background-menu-bottom-light.jpg b/apps/webapp/app/assets/images/blurred-dashboard-background-menu-bottom-light.jpg
new file mode 100644
index 00000000000..59514db9d7a
Binary files /dev/null and b/apps/webapp/app/assets/images/blurred-dashboard-background-menu-bottom-light.jpg differ
diff --git a/apps/webapp/app/assets/images/blurred-dashboard-background-menu-top-light.jpg b/apps/webapp/app/assets/images/blurred-dashboard-background-menu-top-light.jpg
new file mode 100644
index 00000000000..08a4eab1d16
Binary files /dev/null and b/apps/webapp/app/assets/images/blurred-dashboard-background-menu-top-light.jpg differ
diff --git a/apps/webapp/app/assets/images/blurred-dashboard-background-table-light.jpg b/apps/webapp/app/assets/images/blurred-dashboard-background-table-light.jpg
new file mode 100644
index 00000000000..1c8bb8881e7
Binary files /dev/null and b/apps/webapp/app/assets/images/blurred-dashboard-background-table-light.jpg differ
diff --git a/apps/webapp/app/components/AskAI.tsx b/apps/webapp/app/components/AskAI.tsx
index 0d32265c251..d61ea0055fa 100644
--- a/apps/webapp/app/components/AskAI.tsx
+++ b/apps/webapp/app/components/AskAI.tsx
@@ -458,7 +458,7 @@ function ChatMessages({
         <div className="flex flex-col">
           <Callout variant="error" className="mb-4">
             <Paragraph className="font-semibold text-error">Error generating answer:</Paragraph>
-            <Paragraph className="text-rose-300">
+            <Paragraph className="text-rose-500 dark:text-rose-300">
               {error} If the problem persists after retrying, please contact support.
             </Paragraph>
           </Callout>
diff --git a/apps/webapp/app/components/BackgroundWrapper.tsx b/apps/webapp/app/components/BackgroundWrapper.tsx
index c13983a12af..f953332a845 100644
--- a/apps/webapp/app/components/BackgroundWrapper.tsx
+++ b/apps/webapp/app/components/BackgroundWrapper.tsx
@@ -1,42 +1,72 @@
 import { type ReactNode } from "react";
 import blurredDashboardBackgroundMenuTop from "~/assets/images/blurred-dashboard-background-menu-top.jpg";
+import blurredDashboardBackgroundMenuTopLight from "~/assets/images/blurred-dashboard-background-menu-top-light.jpg";
 import blurredDashboardBackgroundMenuBottom from "~/assets/images/blurred-dashboard-background-menu-bottom.jpg";
+import blurredDashboardBackgroundMenuBottomLight from "~/assets/images/blurred-dashboard-background-menu-bottom-light.jpg";
 import blurredDashboardBackgroundTable from "~/assets/images/blurred-dashboard-background-table.jpg";
+import blurredDashboardBackgroundTableLight from "~/assets/images/blurred-dashboard-background-table-light.jpg";
+
+/* Blurred dashboard screenshots; the -light set is the same artwork with the
+   lightness inverted for the light theme. */
+const BACKDROPS = [
+  {
+    images: {
+      menuTop: blurredDashboardBackgroundMenuTop,
+      menuBottom: blurredDashboardBackgroundMenuBottom,
+      table: blurredDashboardBackgroundTable,
+    },
+    tableFill: "#101214",
+    className: "hidden lg:block light:lg:hidden",
+  },
+  {
+    images: {
+      menuTop: blurredDashboardBackgroundMenuTopLight,
+      menuBottom: blurredDashboardBackgroundMenuBottomLight,
+      table: blurredDashboardBackgroundTableLight,
+    },
+    tableFill: "#f4f5f7",
+    className: "hidden light:lg:block",
+  },
+];
 
 export function BackgroundWrapper({ children }: { children: ReactNode }) {
   return (
     <div className="relative h-full w-full overflow-hidden bg-background-dimmed lg:bg-transparent">
-      <div
-        className="absolute left-0 top-0 hidden w-[260px] bg-contain bg-top-left bg-no-repeat lg:block"
-        style={{
-          backgroundImage: `url(${blurredDashboardBackgroundMenuTop})`,
-          aspectRatio: "auto",
-          height: "100vh",
-          backgroundSize: "260px auto",
-        }}
-      />
+      {BACKDROPS.map(({ images, tableFill, className }) => (
+        <div key={tableFill} className={className}>
+          <div
+            className="absolute left-0 top-0 w-[260px] bg-contain bg-top-left bg-no-repeat"
+            style={{
+              backgroundImage: `url(${images.menuTop})`,
+              aspectRatio: "auto",
+              height: "100vh",
+              backgroundSize: "260px auto",
+            }}
+          />
 
-      <div
-        className="absolute bottom-0 left-0 hidden w-[260px] bg-contain bg-bottom-left bg-no-repeat lg:block"
-        style={{
-          backgroundImage: `url(${blurredDashboardBackgroundMenuBottom})`,
-          aspectRatio: "auto",
-          height: "100vh",
-          backgroundSize: "260px auto",
-        }}
-      />
+          <div
+            className="absolute bottom-0 left-0 w-[260px] bg-contain bg-bottom-left bg-no-repeat"
+            style={{
+              backgroundImage: `url(${images.menuBottom})`,
+              aspectRatio: "auto",
+              height: "100vh",
+              backgroundSize: "260px auto",
+            }}
+          />
 
-      <div
-        className="absolute top-0 hidden bg-top-left bg-no-repeat lg:block"
-        style={{
-          left: "260px",
-          backgroundImage: `url(${blurredDashboardBackgroundTable})`,
-          width: "100%",
-          height: "100vh",
-          backgroundSize: "1200px auto",
-          backgroundColor: "#101214",
-        }}
-      />
+          <div
+            className="absolute top-0 bg-top-left bg-no-repeat"
+            style={{
+              left: "260px",
+              backgroundImage: `url(${images.table})`,
+              width: "100%",
+              height: "100vh",
+              backgroundSize: "1200px auto",
+              backgroundColor: tableFill,
+            }}
+          />
+        </div>
+      ))}
 
       <div className="relative z-10 h-full w-full">{children}</div>
     </div>
diff --git a/apps/webapp/app/components/BlankStatePanels.tsx b/apps/webapp/app/components/BlankStatePanels.tsx
index 56a7c0da45d..4aada6569b5 100644
--- a/apps/webapp/app/components/BlankStatePanels.tsx
+++ b/apps/webapp/app/components/BlankStatePanels.tsx
@@ -12,6 +12,7 @@ import {
 } from "@heroicons/react/20/solid";
 import { useLocation } from "react-use";
 import { AIChatIcon } from "~/assets/icons/AIChatIcon";
+import { AIPenIcon } from "~/assets/icons/AIPenIcon";
 import { BranchEnvironmentIconSmall } from "~/assets/icons/EnvironmentIcons";
 import { WaitpointTokenIcon } from "~/assets/icons/WaitpointTokenIcon";
 import openBulkActionsPanel from "~/assets/images/open-bulk-actions-panel.png";
@@ -744,15 +745,11 @@ export function PromptsNone() {
   return (
     <InfoPanel
       title="Define your first prompt"
-      icon={AIChatIcon}
+      icon={AIPenIcon}
       iconClassName="text-aiPrompts"
       panelClassName="max-w-lg"
       accessory={
-        <LinkButton
-          to={docsPath("prompt-management")}
-          variant="docs/small"
-          LeadingIcon={BookOpenIcon}
-        >
+        <LinkButton to={docsPath("ai/prompts")} variant="docs/small" LeadingIcon={BookOpenIcon}>
           Prompts docs
         </LinkButton>
       }
diff --git a/apps/webapp/app/components/BulkActionFilterSummary.tsx b/apps/webapp/app/components/BulkActionFilterSummary.tsx
index 3c6871a23cd..53a20395f44 100644
--- a/apps/webapp/app/components/BulkActionFilterSummary.tsx
+++ b/apps/webapp/app/components/BulkActionFilterSummary.tsx
@@ -9,7 +9,7 @@ import { Paragraph } from "./primitives/Paragraph";
 import simplur from "simplur";
 import { appliedSummary, dateFromString, timeFilterRenderValues } from "./runs/v3/SharedFilters";
 import { formatNumber } from "~/utils/numberFormatter";
-import { SpinnerWhite } from "./primitives/Spinner";
+import { Spinner } from "./primitives/Spinner";
 import { ArrowPathIcon, CheckIcon, XCircleIcon } from "@heroicons/react/20/solid";
 import { XCircleIcon as XCircleIconOutline } from "@heroicons/react/24/outline";
 import assertNever from "assert-never";
@@ -306,5 +306,5 @@ export function EstimatedCount({ count }: { count?: number }) {
     return <>~{formatNumber(count)}</>;
   }
 
-  return <SpinnerWhite className="mx-0.5 -mt-0.5 inline size-3" />;
+  return <Spinner color="blue" className="mx-0.5 -mt-0.5 inline size-3" />;
 }
diff --git a/apps/webapp/app/components/DevPresence.tsx b/apps/webapp/app/components/DevPresence.tsx
index 27d96954758..4ce4a480cb8 100644
--- a/apps/webapp/app/components/DevPresence.tsx
+++ b/apps/webapp/app/components/DevPresence.tsx
@@ -15,6 +15,7 @@ import disconnectedImage from "../assets/images/cli-disconnected.png";
 import { InlineCode } from "./code/InlineCode";
 import { Button } from "./primitives/Buttons";
 import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "./primitives/Dialog";
+import { cn } from "~/utils/cn";
 import { Paragraph } from "./primitives/Paragraph";
 import { TextLink } from "./primitives/TextLink";
 import { PackageManagerProvider, TriggerDevStepV3 } from "./SetupCommands";
@@ -165,7 +166,10 @@ export function DevPresencePanel({ isConnected }: { isConnected: boolean | undef
             width={282}
             height={45}
           />
-          <Paragraph variant="small" className={isConnected ? "text-success" : "text-error"}>
+          <Paragraph
+            variant="small"
+            className={cn("system-mono-label", isConnected ? "text-success" : "text-error")}
+          >
             {isConnected === undefined
               ? "Checking connection..."
               : isConnected
diff --git a/apps/webapp/app/components/ErrorDisplay.tsx b/apps/webapp/app/components/ErrorDisplay.tsx
index 374f427c504..4a1e2804807 100644
--- a/apps/webapp/app/components/ErrorDisplay.tsx
+++ b/apps/webapp/app/components/ErrorDisplay.tsx
@@ -60,10 +60,12 @@ type DisplayOptionsProps = {
 
 export function ErrorDisplay({ title, message, button }: DisplayOptionsProps) {
   return (
+    // The backdrop stays dark in every theme (the rotating-logo animation is
+    // dark artwork), so the text pins to the dark-theme colors on light too.
     <div className="fixed inset-0 z-50 flex flex-col items-center justify-center overflow-y-auto bg-[#16181C]">
       <div className="z-10 mt-[30vh] flex shrink-0 flex-col items-center gap-8">
-        <Header1>{title}</Header1>
-        {message && <Paragraph>{message}</Paragraph>}
+        <Header1 className="light:text-charcoal-200">{title}</Header1>
+        {message && <Paragraph className="light:text-charcoal-400">{message}</Paragraph>}
         <LinkButton
           to={button ? button.to : "/"}
           shortcut={{ key: "enter" }}
diff --git a/apps/webapp/app/components/FeatureBadges.tsx b/apps/webapp/app/components/FeatureBadges.tsx
index 1364d0f76c7..706719dc9e7 100644
--- a/apps/webapp/app/components/FeatureBadges.tsx
+++ b/apps/webapp/app/components/FeatureBadges.tsx
@@ -12,7 +12,14 @@ export function AlphaBadge({
   return (
     <SimpleTooltip
       button={
-        <Badge variant="extra-small" className={cn(inline ? "inline-grid" : "", className)}>
+        <Badge
+          variant="extra-small"
+          className={cn(
+            "system:border-transparent system:bg-blue-500 system:text-white",
+            inline ? "inline-grid" : "",
+            className
+          )}
+        >
           Alpha
         </Badge>
       }
@@ -35,7 +42,14 @@ export function BetaBadge({ inline = false, className }: { inline?: boolean; cla
   return (
     <SimpleTooltip
       button={
-        <Badge variant="extra-small" className={cn(inline ? "inline-grid" : "", className)}>
+        <Badge
+          variant="extra-small"
+          className={cn(
+            "system:border-transparent system:bg-blue-500 system:text-white",
+            inline ? "inline-grid" : "",
+            className
+          )}
+        >
           Beta
         </Badge>
       }
@@ -58,7 +72,11 @@ export function NewBadge({ inline = false, className }: { inline?: boolean; clas
   return (
     <Badge
       variant="extra-small"
-      className={cn("text-success", inline ? "inline-grid" : "", className)}
+      className={cn(
+        "text-success system:border-transparent system:bg-success system:text-white",
+        inline ? "inline-grid" : "",
+        className
+      )}
     >
       New
     </Badge>
diff --git a/apps/webapp/app/components/LoginPageLayout.tsx b/apps/webapp/app/components/LoginPageLayout.tsx
index 3e698ef87ce..1db614eb926 100644
--- a/apps/webapp/app/components/LoginPageLayout.tsx
+++ b/apps/webapp/app/components/LoginPageLayout.tsx
@@ -72,7 +72,7 @@ export function LoginPageLayout({
         {rightContent ?? (
           <>
             <div className="flex h-full flex-col items-center justify-center px-16">
-              <Header3 className="relative text-center text-2xl font-normal leading-8 text-text-dimmed transition before:relative before:right-1 before:top-0 before:text-6xl before:text-charcoal-750 before:content-['❝'] lg-height:text-xl md-height:text-lg">
+              <Header3 className="relative text-center text-2xl font-normal leading-8 text-text-dimmed transition before:relative before:right-1 before:top-0 before:text-6xl before:text-grid-bright before:content-['❝'] dark:before:text-charcoal-750 lg-height:text-xl md-height:text-lg">
                 {randomQuote?.quote}
               </Header3>
               <Paragraph className="mt-4 text-text-dimmed/60">{randomQuote?.person}</Paragraph>
diff --git a/apps/webapp/app/components/admin/debugTooltip.tsx b/apps/webapp/app/components/admin/debugTooltip.tsx
index b4ccb74f88d..2a561c1519a 100644
--- a/apps/webapp/app/components/admin/debugTooltip.tsx
+++ b/apps/webapp/app/components/admin/debugTooltip.tsx
@@ -1,4 +1,5 @@
 import { ShieldCheckIcon } from "@heroicons/react/20/solid";
+import { CopyableText } from "~/components/primitives/CopyableText";
 import * as Property from "~/components/primitives/PropertyTable";
 import {
   Tooltip,
@@ -25,7 +26,10 @@ export function AdminDebugTooltip({ children }: { children?: React.ReactNode })
         <TooltipTrigger>
           <ShieldCheckIcon className="size-5" />
         </TooltipTrigger>
-        <TooltipContent className="max-h-[90vh] overflow-y-auto">
+        {/* The copy controls below pass `hideTooltip` so their own tooltips don't fire
+            Radix's global close and dismiss this panel. `pr-8` leaves room for the
+            copy button, which is absolutely positioned to the right of each value. */}
+        <TooltipContent className="max-h-[90vh] overflow-y-auto pr-8">
           <Content>{children}</Content>
         </TooltipContent>
       </Tooltip>
@@ -40,27 +44,35 @@ function Content({ children }: { children: React.ReactNode }) {
   const user = useUser();
 
   return (
-    <div className="flex flex-col gap-2 divide-y divide-slate-700">
+    <div className="flex flex-col gap-2 divide-y divide-grid-bright">
       <Property.Table>
         <Property.Item>
           <Property.Label>User ID</Property.Label>
-          <Property.Value>{user.id}</Property.Value>
+          <Property.Value>
+            <CopyableText value={user.id} asChild hideTooltip />
+          </Property.Value>
         </Property.Item>
         {organization && (
           <Property.Item>
             <Property.Label>Org ID</Property.Label>
-            <Property.Value>{organization.id}</Property.Value>
+            <Property.Value>
+              <CopyableText value={organization.id} asChild hideTooltip />
+            </Property.Value>
           </Property.Item>
         )}
         {project && (
           <>
             <Property.Item>
               <Property.Label>Project ID</Property.Label>
-              <Property.Value>{project.id}</Property.Value>
+              <Property.Value>
+                <CopyableText value={project.id} asChild hideTooltip />
+              </Property.Value>
             </Property.Item>
             <Property.Item>
               <Property.Label>Project ref</Property.Label>
-              <Property.Value>{project.externalRef}</Property.Value>
+              <Property.Value>
+                <CopyableText value={project.externalRef} asChild hideTooltip />
+              </Property.Value>
             </Property.Item>
           </>
         )}
@@ -68,7 +80,9 @@ function Content({ children }: { children: React.ReactNode }) {
           <>
             <Property.Item>
               <Property.Label>Environment ID</Property.Label>
-              <Property.Value>{environment.id}</Property.Value>
+              <Property.Value>
+                <CopyableText value={environment.id} asChild hideTooltip />
+              </Property.Value>
             </Property.Item>
             <Property.Item>
               <Property.Label>Environment type</Property.Label>
@@ -81,7 +95,7 @@ function Content({ children }: { children: React.ReactNode }) {
           </>
         )}
       </Property.Table>
-      <div className="pt-2">{children}</div>
+      {children && <div className="pt-2">{children}</div>}
     </div>
   );
 }
diff --git a/apps/webapp/app/components/billing/AnimatedOrgBannerBar.tsx b/apps/webapp/app/components/billing/AnimatedOrgBannerBar.tsx
index b0f11b7eba3..17eef91ad5c 100644
--- a/apps/webapp/app/components/billing/AnimatedOrgBannerBar.tsx
+++ b/apps/webapp/app/components/billing/AnimatedOrgBannerBar.tsx
@@ -40,11 +40,16 @@ export function AnimatedOrgBannerBar({
           <div className="flex items-center gap-2">
             <Icon
               icon={ExclamationCircleIcon}
-              className={cn("h-5 w-5", variant === "warning" ? "text-amber-400" : "text-error")}
+              className={cn(
+                "h-5 w-5",
+                variant === "warning" ? "text-amber-400 light:text-amber-600" : "text-error"
+              )}
             />
             <Paragraph
               variant="small"
-              className={variant === "warning" ? "text-amber-200" : "text-error"}
+              className={
+                variant === "warning" ? "text-amber-700 dark:text-amber-200" : "text-error"
+              }
             >
               {children}
             </Paragraph>
diff --git a/apps/webapp/app/components/billing/BillingLimitConfigSection.tsx b/apps/webapp/app/components/billing/BillingLimitConfigSection.tsx
index c69d6f0c175..e6362d4cb1d 100644
--- a/apps/webapp/app/components/billing/BillingLimitConfigSection.tsx
+++ b/apps/webapp/app/components/billing/BillingLimitConfigSection.tsx
@@ -7,6 +7,7 @@ import { z } from "zod";
 import { getBillingLimitMode } from "~/components/billing/billingAlertsFormat";
 import { formatGracePeriodMs } from "~/components/billing/billingLimitFormat";
 import { AnimatedCallout } from "~/components/primitives/AnimatedCallout";
+import { Callout } from "~/components/primitives/Callout";
 import { Button } from "~/components/primitives/Buttons";
 import { CheckboxWithLabel } from "~/components/primitives/Checkbox";
 import { Fieldset } from "~/components/primitives/Fieldset";
@@ -51,10 +52,14 @@ type BillingLimitActionData = {
 
 export function isBillingLimitFormDirty(input: {
   billingLimit: BillingLimitResult;
-  mode: "none" | "plan" | "custom";
+  mode: "" | "none" | "plan" | "custom";
   customAmount: string;
   cancelInProgressRuns: boolean;
 }): boolean {
+  if (input.mode === "") {
+    return false;
+  }
+
   const needsInitialSave = !input.billingLimit.isConfigured;
   const savedMode = getBillingLimitMode(input.billingLimit);
   const savedCustomAmount =
@@ -75,7 +80,7 @@ export function isBillingLimitFormDirty(input: {
 
 export function getBillingLimitFormLastSubmission(
   submission: BillingLimitActionData["submission"] | undefined,
-  mode: "none" | "plan" | "custom",
+  mode: "" | "none" | "plan" | "custom",
   isDirty: boolean
 ) {
   if (!isDirty || !submission) {
@@ -111,17 +116,20 @@ export function BillingLimitConfigSection({
       : "";
   const savedCancelInProgressRuns = billingLimit.isConfigured && billingLimit.cancelInProgressRuns;
 
-  const [mode, setMode] = useState<"none" | "plan" | "custom">(savedMode);
+  // Unconfigured limit starts with nothing selected.
+  const resetMode: "" | "none" | "plan" | "custom" = billingLimit.isConfigured ? savedMode : "";
+
+  const [mode, setMode] = useState<"" | "none" | "plan" | "custom">(resetMode);
   const [customAmount, setCustomAmount] = useState(savedCustomAmount);
   const [cancelInProgressRuns, setCancelInProgressRuns] = useState(savedCancelInProgressRuns);
   const customAmountInputRef = useRef<HTMLInputElement>(null);
   const formRef = useRef<HTMLFormElement>(null);
 
   useEffect(() => {
-    setMode(savedMode);
+    setMode(resetMode);
     setCustomAmount(savedCustomAmount);
     setCancelInProgressRuns(savedCancelInProgressRuns);
-  }, [savedMode, savedCustomAmount, savedCancelInProgressRuns]);
+  }, [resetMode, savedCustomAmount, savedCancelInProgressRuns]);
 
   function handleModeChange(value: string) {
     const nextMode = value as typeof mode;
@@ -183,6 +191,13 @@ export function BillingLimitConfigSection({
         </Paragraph>
       </div>
 
+      {!billingLimit.isConfigured && (
+        <Callout variant="warning" className="mb-3">
+          Configure a monthly billing limit below to cap your spend, or set no limit to let runs
+          keep going.
+        </Callout>
+      )}
+
       <Form method="post" {...getFormProps(form)} ref={formRef}>
         <input type="hidden" name="intent" value="billing-limit" />
         <Fieldset>
@@ -283,7 +298,7 @@ export function BillingLimitConfigSection({
             </div>
           </RadioGroup>
 
-          {mode !== "none" && (
+          {(mode === "plan" || mode === "custom") && (
             <CheckboxWithLabel
               className="mt-4"
               name="cancelInProgressRuns"
@@ -295,14 +310,16 @@ export function BillingLimitConfigSection({
               onChange={setCancelInProgressRuns}
             />
           )}
-          <FormButtons
-            className={isDirty ? undefined : "invisible"}
-            confirmButton={
-              <Button type="submit" variant="primary/small" disabled={!isDirty}>
-                Save billing limit
-              </Button>
-            }
-          />
+          {mode !== "" && (
+            <FormButtons
+              className={isDirty ? undefined : "invisible"}
+              confirmButton={
+                <Button type="submit" variant="primary/small" disabled={!isDirty}>
+                  Save billing limit
+                </Button>
+              }
+            />
+          )}
         </Fieldset>
       </Form>
     </div>
diff --git a/apps/webapp/app/components/billing/BillingLimitRecoveryPanel.tsx b/apps/webapp/app/components/billing/BillingLimitRecoveryPanel.tsx
index 53b3c1695de..1dfcdd73707 100644
--- a/apps/webapp/app/components/billing/BillingLimitRecoveryPanel.tsx
+++ b/apps/webapp/app/components/billing/BillingLimitRecoveryPanel.tsx
@@ -113,7 +113,7 @@ export function BillingLimitRecoveryPanel({
       <div className="border-b border-grid-dimmed pb-3">
         <Header2 spacing>Action required</Header2>
         <Callout variant="warning">
-          <Paragraph variant="small" className="text-yellow-200">
+          <Paragraph variant="small" className="text-callout-warning-text">
             {isGrace ? (
               <>
                 Your organization has reached its billing limit. Processing is paused and new runs
diff --git a/apps/webapp/app/components/billing/OrgBanner.tsx b/apps/webapp/app/components/billing/OrgBanner.tsx
index df86f1471f7..03214bab7ec 100644
--- a/apps/webapp/app/components/billing/OrgBanner.tsx
+++ b/apps/webapp/app/components/billing/OrgBanner.tsx
@@ -151,8 +151,14 @@ function NoLimitConfiguredBanner() {
       variant="warning"
       action={
         canManageBillingLimits ? (
-          <LinkButton variant="tertiary/small" to={v3BillingLimitsPath(organization)}>
-            Configure billing limit
+          <LinkButton
+            variant="tertiary/small"
+            className="system:border-transparent system:bg-warning system:transition system:group-hover/button:bg-warning system:group-hover/button:brightness-90"
+            to={v3BillingLimitsPath(organization)}
+          >
+            <span className="mx-auto grow self-center truncate text-text-bright system:text-white">
+              Configure billing limit
+            </span>
           </LinkButton>
         ) : undefined
       }
diff --git a/apps/webapp/app/components/billing/UsageBar.tsx b/apps/webapp/app/components/billing/UsageBar.tsx
index 49346492287..fcb6377757c 100644
--- a/apps/webapp/app/components/billing/UsageBar.tsx
+++ b/apps/webapp/app/components/billing/UsageBar.tsx
@@ -67,7 +67,7 @@ export function UsageBar({ current, billingLimit, tierLimit, isPaying }: UsageBa
             animate={{ width: tierRunLimitPercentage + "%" }}
             transition={{ duration: 1.5, type: "spring" }}
             style={{ width: `${tierRunLimitPercentage}%` }}
-            className="absolute h-3 rounded-l-sm bg-green-900/50"
+            className="absolute h-3 rounded-l-sm bg-green-900/20"
           >
             <Legend
               text={isPaying ? `Included usage:` : `Tier limit:`}
diff --git a/apps/webapp/app/components/billing/billingAlertsFormat.ts b/apps/webapp/app/components/billing/billingAlertsFormat.ts
index dc99c49ff1d..5940405a84c 100644
--- a/apps/webapp/app/components/billing/billingAlertsFormat.ts
+++ b/apps/webapp/app/components/billing/billingAlertsFormat.ts
@@ -208,6 +208,11 @@ export function isLegacyDollarAmountField(
     return false;
   }
 
+  // The exact $1 absolute base marker always wins, even with levels below 100 (e.g. a $5 alert).
+  if (rawAmount === ABSOLUTE_ALERT_BASE_CENTS) {
+    return false;
+  }
+
   if (!Number.isFinite(rawAmount) || rawAmount < 10) {
     return false;
   }
@@ -315,8 +320,9 @@ export function getAlertPreviewLimitCents(
   planLimitCents: number
 ): number {
   const amountCents = getSavedAlertAmountCents(alerts);
+  // Percentages always apply to the current limit, not the base stored at last save.
   if (amountCents > 0 && percentageAlertLevelsToUiThresholds(alerts.alertLevels).length > 0) {
-    return amountCents;
+    return effectiveLimitCents;
   }
   if (percentageAlertAmountMatches(amountCents, effectiveLimitCents, planLimitCents)) {
     return amountCents;
diff --git a/apps/webapp/app/components/code/ChartConfigPanel.tsx b/apps/webapp/app/components/code/ChartConfigPanel.tsx
index 1c915c2a449..7711f063d55 100644
--- a/apps/webapp/app/components/code/ChartConfigPanel.tsx
+++ b/apps/webapp/app/components/code/ChartConfigPanel.tsx
@@ -572,7 +572,7 @@ function SeriesColorPicker({
           title="Change series color"
         >
           <span
-            className="block h-4 w-4 rounded-full border border-white/30"
+            className="block h-4 w-4 rounded-full border border-text-bright/30"
             style={{ backgroundColor: color }}
           />
         </button>
@@ -587,7 +587,7 @@ function SeriesColorPicker({
                 onColorChange(c);
                 setOpen(false);
               }}
-              className="group/swatch flex h-6 w-6 items-center justify-center rounded-full border border-white/30"
+              className="group/swatch flex h-6 w-6 items-center justify-center rounded-full border border-text-bright/30"
               style={{ backgroundColor: c }}
               title={c}
             >
diff --git a/apps/webapp/app/components/code/TSQLEditor.tsx b/apps/webapp/app/components/code/TSQLEditor.tsx
index 3b4bf202954..0ddc7cf12d5 100644
--- a/apps/webapp/app/components/code/TSQLEditor.tsx
+++ b/apps/webapp/app/components/code/TSQLEditor.tsx
@@ -284,7 +284,7 @@ export function TSQLEditor(opts: TSQLEditorProps) {
         }}
       />
       {showButtons && (
-        <div className="absolute right-0 top-0 z-10 flex items-center justify-end bg-background-deep/80 p-1.5">
+        <div className="absolute right-0 top-0 z-10 flex items-center justify-end bg-background-deep/80 light:bg-transparent p-1.5">
           {additionalActions && additionalActions}
           {showFormatButton && (
             <Button
diff --git a/apps/webapp/app/components/environments/EnvironmentLabel.tsx b/apps/webapp/app/components/environments/EnvironmentLabel.tsx
index 3fd5d526fc1..3584ec9c7cf 100644
--- a/apps/webapp/app/components/environments/EnvironmentLabel.tsx
+++ b/apps/webapp/app/components/environments/EnvironmentLabel.tsx
@@ -118,7 +118,8 @@ export function EnvironmentLabel({
       ref={spanRef}
       className={cn(
         truncate ? "truncate" : "overflow-hidden whitespace-nowrap",
-        "text-left",
+        // system-mono-label: System themes uncolor the name, only the icon stays tinted
+        "text-left system-mono-label",
         environmentTextClassName(environment),
         className
       )}
@@ -133,7 +134,10 @@ export function EnvironmentLabel({
         asChild
         button={content}
         content={
-          <span ref={spanRef} className={cn("text-left", environmentTextClassName(environment))}>
+          <span
+            ref={spanRef}
+            className={cn("text-left system-mono-label", environmentTextClassName(environment))}
+          >
             {text}
           </span>
         }
@@ -149,7 +153,11 @@ export function EnvironmentLabel({
 }
 
 export function EnvironmentSlug({ environment }: { environment: Environment & { slug: string } }) {
-  return <span className={environmentTextClassName(environment)}>{environment.slug}</span>;
+  return (
+    <span className={cn("system-mono-label", environmentTextClassName(environment))}>
+      {environment.slug}
+    </span>
+  );
 }
 
 export function environmentTitle(environment: Environment, username?: string) {
diff --git a/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx b/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx
index d6affafd3b7..b126e77b34b 100644
--- a/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx
+++ b/apps/webapp/app/components/errors/ConfigureErrorAlerts.tsx
@@ -1,12 +1,7 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { GlobeLinesIcon } from "~/assets/icons/GlobeLinesIcon";
 import { parseWithZod } from "@conform-to/zod";
-import {
-  EnvelopeIcon,
-  GlobeAltIcon,
-  HashtagIcon,
-  LockClosedIcon,
-  XMarkIcon,
-} from "@heroicons/react/20/solid";
+import { EnvelopeIcon, HashtagIcon, LockClosedIcon, XMarkIcon } from "@heroicons/react/20/solid";
 import { BellAlertIcon } from "@heroicons/react/24/solid";
 import { useFetcher, useNavigate } from "@remix-run/react";
 import { SlackIcon } from "@trigger.dev/companyicons";
@@ -319,7 +314,7 @@ export function ConfigureErrorAlerts({
                       placeholder={
                         index === 0 ? "https://example.com/webhook" : "Add another webhook URL"
                       }
-                      icon={GlobeAltIcon}
+                      icon={GlobeLinesIcon}
                       onChange={(e) => {
                         webhookFieldValues.current[index] = e.target.value;
                         if (
diff --git a/apps/webapp/app/components/errors/ErrorStatusBadge.tsx b/apps/webapp/app/components/errors/ErrorStatusBadge.tsx
index 571a209ddf1..aad2bb2f1f2 100644
--- a/apps/webapp/app/components/errors/ErrorStatusBadge.tsx
+++ b/apps/webapp/app/components/errors/ErrorStatusBadge.tsx
@@ -1,10 +1,19 @@
 import { type ErrorGroupStatus } from "@trigger.dev/database";
 import { cn } from "~/utils/cn";
 
-const styles: Record<ErrorGroupStatus, string> = {
+// Two prominence levels: `subtle` keeps the tinted look for dense lists,
+// `bright` fills the chip with the status color in the System themes for
+// solitary placements (detail headers). Classic always uses the tinted look.
+const subtleStyles: Record<ErrorGroupStatus, string> = {
   UNRESOLVED: "bg-error/10 text-error",
   RESOLVED: "bg-success/10 text-success",
-  IGNORED: "bg-blue-500/10 text-blue-400",
+  IGNORED: "bg-blue-500/10 text-blue-400 system:text-blue-500",
+};
+
+const brightStyles: Record<ErrorGroupStatus, string> = {
+  UNRESOLVED: "bg-error/10 text-error system:bg-error system:text-white",
+  RESOLVED: "bg-success/10 text-success system:bg-success system:text-white",
+  IGNORED: "bg-blue-500/10 text-blue-400 system:bg-blue-500 system:text-white",
 };
 
 const labels: Record<ErrorGroupStatus, string> = {
@@ -16,15 +25,17 @@ const labels: Record<ErrorGroupStatus, string> = {
 export function ErrorStatusBadge({
   status,
   className,
+  prominence = "subtle",
 }: {
   status: ErrorGroupStatus;
   className?: string;
+  prominence?: "subtle" | "bright";
 }) {
   return (
     <span
       className={cn(
-        "inline-flex items-center rounded px-2 py-0.5 text-xs font-medium",
-        styles[status],
+        "contrast-chip inline-flex items-center rounded px-2 py-0.5 text-xs font-medium",
+        (prominence === "bright" ? brightStyles : subtleStyles)[status],
         className
       )}
     >
diff --git a/apps/webapp/app/components/integrations/VercelOnboardingModal.tsx b/apps/webapp/app/components/integrations/VercelOnboardingModal.tsx
index 85c7816b73e..6e573f9acd1 100644
--- a/apps/webapp/app/components/integrations/VercelOnboardingModal.tsx
+++ b/apps/webapp/app/components/integrations/VercelOnboardingModal.tsx
@@ -16,7 +16,7 @@ import { Hint } from "~/components/primitives/Hint";
 import { Label } from "~/components/primitives/Label";
 import { Paragraph } from "~/components/primitives/Paragraph";
 import { Select, SelectItem } from "~/components/primitives/Select";
-import { SpinnerWhite } from "~/components/primitives/Spinner";
+import { Spinner } from "~/components/primitives/Spinner";
 import { Switch } from "~/components/primitives/Switch";
 import {
   Tooltip,
@@ -754,7 +754,7 @@ export function VercelOnboardingModal({
             </div>
           </DialogHeader>
           <div className="flex items-center justify-center py-8">
-            <SpinnerWhite className="size-6" />
+            <Spinner color="blue" className="size-6" />
           </div>
         </DialogContent>
       </Dialog>
@@ -859,7 +859,7 @@ export function VercelOnboardingModal({
                       variant="primary/medium"
                       onClick={handleProjectSelection}
                       disabled={!selectedVercelProject || fetcher.state !== "idle"}
-                      LeadingIcon={fetcher.state !== "idle" ? SpinnerWhite : undefined}
+                      LeadingIcon={fetcher.state !== "idle" ? Spinner : undefined}
                     >
                       {fetcher.state !== "idle" ? "Connecting..." : "Connect Project"}
                     </Button>
@@ -930,7 +930,7 @@ export function VercelOnboardingModal({
                     variant="primary/medium"
                     onClick={handleUpdateEnvMapping}
                     disabled={envMappingFetcher.state !== "idle"}
-                    LeadingIcon={envMappingFetcher.state !== "idle" ? SpinnerWhite : undefined}
+                    LeadingIcon={envMappingFetcher.state !== "idle" ? Spinner : undefined}
                   >
                     Next
                   </Button>
@@ -1112,7 +1112,7 @@ export function VercelOnboardingModal({
                     LeadingIcon={
                       fromMarketplaceContext &&
                       (completeOnboardingFetcher.state !== "idle" || isRedirecting)
-                        ? SpinnerWhite
+                        ? Spinner
                         : undefined
                     }
                   >
@@ -1168,7 +1168,7 @@ export function VercelOnboardingModal({
                     disabled={completeOnboardingFetcher.state !== "idle" || isRedirecting}
                     LeadingIcon={
                       completeOnboardingFetcher.state !== "idle" || isRedirecting
-                        ? SpinnerWhite
+                        ? Spinner
                         : undefined
                     }
                   >
diff --git a/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx b/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
index 17bc4a047bb..8790e479421 100644
--- a/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
+++ b/apps/webapp/app/components/navigation/OrganizationSettingsSideMenu.tsx
@@ -163,11 +163,6 @@ export function OrganizationSettingsSideMenu({
               inactiveIconColor="text-text-dimmed"
               to={organizationSsoPath(organization)}
               data-action="sso"
-              badge={
-                currentPlan?.v3Subscription?.plan?.code === "enterprise" ? undefined : (
-                  <Badge variant="extra-small">Enterprise</Badge>
-                )
-              }
             />
           )}
         </div>
diff --git a/apps/webapp/app/components/navigation/SideMenuHeader.tsx b/apps/webapp/app/components/navigation/SideMenuHeader.tsx
index 8ccbfa7de70..698ab1a2326 100644
--- a/apps/webapp/app/components/navigation/SideMenuHeader.tsx
+++ b/apps/webapp/app/components/navigation/SideMenuHeader.tsx
@@ -1,8 +1,7 @@
 import { useNavigation } from "@remix-run/react";
 import { useEffect, useState } from "react";
 import { motion } from "framer-motion";
-import { Popover, PopoverContent, PopoverCustomTrigger } from "../primitives/Popover";
-import { EllipsisHorizontalIcon } from "@heroicons/react/20/solid";
+import { Popover, PopoverContent, PopoverEllipseTrigger } from "../primitives/Popover";
 
 export function SideMenuHeader({
   title,
@@ -30,7 +29,7 @@ export function SideMenuHeader({
 
   return (
     <motion.div
-      className="group flex h-4 items-center justify-between overflow-hidden pl-1.5"
+      className="group/side-header flex h-4 items-center justify-between overflow-hidden pl-1.5"
       initial={false}
       animate={{
         opacity: hasCollapsedTitle ? 1 : isCollapsed ? 0 : 1,
@@ -46,9 +45,12 @@ export function SideMenuHeader({
       </h2>
       {children !== undefined ? (
         <Popover onOpenChange={(open) => setHeaderMenuOpen(open)} open={isHeaderMenuOpen}>
-          <PopoverCustomTrigger className="p-1">
-            <EllipsisHorizontalIcon className="h-4 w-4 text-text-faint transition group-hover:text-text-bright" />
-          </PopoverCustomTrigger>
+          <PopoverEllipseTrigger
+            isOpen={isHeaderMenuOpen}
+            variant="ghost"
+            orientation="horizontal"
+            className="group-hover/side-header:text-text-bright"
+          />
           <PopoverContent
             className="min-w-max overflow-y-auto p-0 scrollbar-thin scrollbar-track-transparent scrollbar-thumb-surface-control"
             align="start"
diff --git a/apps/webapp/app/components/navigation/SideMenuItem.tsx b/apps/webapp/app/components/navigation/SideMenuItem.tsx
index f17051266d4..f4e5feb9a8d 100644
--- a/apps/webapp/app/components/navigation/SideMenuItem.tsx
+++ b/apps/webapp/app/components/navigation/SideMenuItem.tsx
@@ -69,7 +69,10 @@ export function SideMenuItem({
         icon={icon}
         className={cn(
           "size-5 shrink-0",
-          isActive ? activeIconColor : (inactiveIconColor ?? "text-text-dimmed"),
+          // side-menu-active-icon: System themes neutralize the accent (see tailwind.css)
+          isActive
+            ? cn(activeIconColor, "side-menu-active-icon")
+            : (inactiveIconColor ?? "text-text-dimmed"),
           !isActive &&
             !disableIconHover &&
             "group-hover/menuitem:text-text-bright group-hover/menulink:text-text-bright",
diff --git a/apps/webapp/app/components/navigation/TreeConnectors.tsx b/apps/webapp/app/components/navigation/TreeConnectors.tsx
index 8479179a491..25e8212b899 100644
--- a/apps/webapp/app/components/navigation/TreeConnectors.tsx
+++ b/apps/webapp/app/components/navigation/TreeConnectors.tsx
@@ -5,7 +5,7 @@ import { cn } from "~/utils/cn";
 export function TreeConnectorBranch({ className }: { className?: string }) {
   return (
     <svg
-      className={cn("overflow-visible", className, "text-charcoal-600")}
+      className={cn("overflow-visible", className, "text-border-bright")}
       viewBox="0 0 20 20"
       fill="none"
     >
@@ -18,7 +18,7 @@ export function TreeConnectorBranch({ className }: { className?: string }) {
 export function TreeConnectorEnd({ className }: { className?: string }) {
   return (
     <svg
-      className={cn("overflow-visible", className, "text-charcoal-600")}
+      className={cn("overflow-visible", className, "text-border-bright")}
       viewBox="0 0 20 20"
       fill="none"
     >
diff --git a/apps/webapp/app/components/primitives/AppliedFilter.tsx b/apps/webapp/app/components/primitives/AppliedFilter.tsx
index c8fbc4d3ac3..6390a5826d6 100644
--- a/apps/webapp/app/components/primitives/AppliedFilter.tsx
+++ b/apps/webapp/app/components/primitives/AppliedFilter.tsx
@@ -4,11 +4,11 @@ import { cn } from "~/utils/cn";
 
 const variants = {
   "secondary/small": {
-    box: "h-6 bg-secondary rounded pl-1.5 gap-1.5 text-xs divide-x divide-black/15 group-hover:bg-surface-control group-hover:border-border-brighter text-text-bright border border-border-bright",
+    box: "h-6 bg-secondary rounded pl-1.5 gap-1.5 text-xs divide-x divide-black/15 shadow-xs group-hover:bg-background-raised text-text-bright border border-border-bright/50",
     clear: "size-6 text-text-bright hover:text-text-bright transition-colors",
   },
   "tertiary/small": {
-    box: "h-6 bg-tertiary rounded pl-1.5 gap-1.5 text-xs divide-x divide-black/15 group-hover:bg-surface-control",
+    box: "h-6 bg-tertiary rounded pl-1.5 gap-1.5 text-xs divide-x divide-black/15 group-hover:bg-background-raised",
     clear: "size-6 text-text-dimmed hover:text-text-bright transition-colors",
   },
   "minimal/medium": {
diff --git a/apps/webapp/app/components/primitives/Avatar.tsx b/apps/webapp/app/components/primitives/Avatar.tsx
index 9fc6832fcc4..728626271f4 100644
--- a/apps/webapp/app/components/primitives/Avatar.tsx
+++ b/apps/webapp/app/components/primitives/Avatar.tsx
@@ -1,10 +1,10 @@
+import { GlobeLinesIcon } from "~/assets/icons/GlobeLinesIcon";
 import {
   BoltIcon,
   BuildingOffice2Icon,
   CodeBracketSquareIcon,
   FaceSmileIcon,
   FireIcon,
-  GlobeAltIcon,
   RocketLaunchIcon,
   StarIcon,
 } from "@heroicons/react/20/solid";
@@ -117,6 +117,16 @@ function styleFromSize(size: number) {
   };
 }
 
+// Bright tiles (Yellow, Orange) need dark letters for contrast; the rest read
+// best with white.
+function letterColorForBackground(hex: string): string {
+  const match = /^#?([0-9a-f]{6})$/i.exec(hex);
+  if (!match) return "#fff";
+  const n = parseInt(match[1], 16);
+  const luminance = 0.299 * ((n >> 16) & 255) + 0.587 * ((n >> 8) & 255) + 0.114 * (n & 255);
+  return luminance > 140 ? "#272A2E" : "#fff";
+}
+
 function AvatarLetters({
   avatar,
   size,
@@ -132,15 +142,13 @@ function AvatarLetters({
 
   const style = {
     backgroundColor: avatar.hex,
+    color: letterColorForBackground(avatar.hex),
   };
 
   const scaleFactor = includePadding ? 0.8 : 1;
 
   return (
-    <span
-      className="grid shrink-0 place-items-center overflow-hidden text-charcoal-750"
-      style={styleFromSize(size)}
-    >
+    <span className="grid shrink-0 place-items-center overflow-hidden" style={styleFromSize(size)}>
       {/* This is the square container */}
       <span
         className={cn(
@@ -185,7 +193,7 @@ function AvatarImage({ avatar, size }: { avatar: ImageAvatar; size: number }) {
   if (!avatar.url) {
     return (
       <span className="grid shrink-0 place-items-center" style={styleFromSize(size)}>
-        <GlobeAltIcon className="size-[90%] text-text-dimmed" />
+        <GlobeLinesIcon className="size-[90%] text-text-dimmed" />
       </span>
     );
   }
diff --git a/apps/webapp/app/components/primitives/Badge.tsx b/apps/webapp/app/components/primitives/Badge.tsx
index f21a544a4cd..15733bcc647 100644
--- a/apps/webapp/app/components/primitives/Badge.tsx
+++ b/apps/webapp/app/components/primitives/Badge.tsx
@@ -5,13 +5,13 @@ const variants = {
   default:
     "grid place-items-center rounded-full px-2 h-5 tracking-wider text-xxs bg-background-hover text-text-bright uppercase whitespace-nowrap",
   "extra-small":
-    "grid place-items-center border border-border-bright rounded-sm px-1 h-4 text-xxs bg-background-bright text-blue-500 whitespace-nowrap",
+    "grid place-items-center border border-border-bright rounded-sm px-1 h-4 text-xxs bg-background-bright text-blue-500 system:border-transparent system:bg-blue-500/10 system:text-blue-500 whitespace-nowrap",
   small:
-    "grid place-items-center border border-border-bright rounded-sm px-1 h-5 text-xs bg-background-bright text-blue-500 whitespace-nowrap",
+    "grid place-items-center border border-border-bright rounded-sm px-1 h-5 text-xs bg-background-bright text-blue-500 system:border-transparent system:bg-blue-500/10 system:text-blue-500 whitespace-nowrap",
   "outline-rounded":
     "grid place-items-center rounded-full px-1 h-4 tracking-wider text-xxs border border-blue-500 text-blue-500 uppercase whitespace-nowrap",
   rounded:
-    "grid place-items-center rounded-full px-1.5 h-4 text-xxs border bg-blue-600 text-text-bright uppercase whitespace-nowrap",
+    "grid place-items-center rounded-full px-1.5 h-4 text-xxs border bg-blue-600 text-text-bright system:border-transparent system:text-white uppercase whitespace-nowrap",
 };
 
 type BadgeProps = React.HTMLAttributes<HTMLDivElement> & {
diff --git a/apps/webapp/app/components/primitives/BreadcrumbIcon.tsx b/apps/webapp/app/components/primitives/BreadcrumbIcon.tsx
index b5dfb55ba7e..7d7fae46be0 100644
--- a/apps/webapp/app/components/primitives/BreadcrumbIcon.tsx
+++ b/apps/webapp/app/components/primitives/BreadcrumbIcon.tsx
@@ -3,7 +3,7 @@ import { cn } from "~/utils/cn";
 export function BreadcrumbIcon({ className }: { className?: string }) {
   return (
     <svg
-      className={cn("text-charcoal-600", className)}
+      className={cn("text-border-bright", className)}
       width="9"
       height="20"
       viewBox="0 0 9 26"
diff --git a/apps/webapp/app/components/primitives/Buttons.tsx b/apps/webapp/app/components/primitives/Buttons.tsx
index 5686fe4d333..cb00db56637 100644
--- a/apps/webapp/app/components/primitives/Buttons.tsx
+++ b/apps/webapp/app/components/primitives/Buttons.tsx
@@ -58,18 +58,17 @@ type Size = keyof typeof sizes;
 
 const theme = {
   primary: {
-    textColor:
-      "text-text-bright group-hover/button:text-white transition group-disabled/button:text-text-dimmed",
+    textColor: "text-white transition group-disabled/button:text-white/60",
     button:
       "bg-indigo-600 border border-indigo-500 group-hover/button:bg-indigo-500 group-hover/button:border-indigo-400 group-disabled/button:opacity-50 group-disabled/button:bg-indigo-600 group-disabled/button:border-indigo-500 group-disabled/button:pointer-events-none",
     shortcut:
-      "border-text-bright/40 text-text-bright group-hover/button:border-text-bright/60 group-hover/button:text-text-bright",
-    icon: "text-text-bright",
+      "border-white/40 text-white group-hover/button:border-white/60 group-hover/button:text-white",
+    icon: "text-white",
   },
   secondary: {
     textColor: "text-text-bright transition group-disabled/button:text-text-dimmed/80",
     button:
-      "bg-secondary group-hover/button:bg-surface-control group-hover/button:border-border-brighter border border-border-bright group-disabled/button:bg-secondary group-disabled/button:opacity-60 group-disabled/button:pointer-events-none",
+      "bg-secondary border border-border-bright/50 shadow-xs group-hover/button:bg-background-raised group-disabled/button:bg-secondary group-disabled/button:opacity-60 group-disabled/button:pointer-events-none",
     shortcut:
       "border-text-dimmed/40 text-text-dimmed group-hover/button:text-text-bright group-hover/button:border-text-dimmed",
     icon: "text-text-bright",
@@ -91,17 +90,18 @@ const theme = {
     icon: "text-text-dimmed",
   },
   danger: {
-    textColor:
-      "text-text-bright group-hover/button:text-white transition group-disabled/button:text-text-bright/80",
+    textColor: "text-white transition group-disabled/button:text-white/80",
     button:
       "bg-error group-hover/button:bg-rose-500 disabled:opacity-50 group-disabled/button:bg-error group-disabled/button:pointer-events-none",
-    shortcut: "border-text-bright text-text-bright group-hover/button:border-text-bright/60",
-    icon: "text-text-bright",
+    shortcut: "border-white text-white group-hover/button:border-white/60",
+    icon: "text-white",
   },
   docs: {
-    textColor: "text-blue-200/70 transition group-disabled/button:text-text-dimmed/80",
+    textColor:
+      // System themes: monochrome label, the book icon keeps the blue
+      "text-callout-docs-text/70 system:text-text-bright transition group-disabled/button:text-text-dimmed/80",
     button:
-      "bg-background-raised border border-border-bright/50 shadow-sm group-hover/button:bg-secondary group-disabled/button:bg-tertiary group-disabled/button:opacity-60 group-disabled/button:pointer-events-none",
+      "bg-secondary border border-border-bright/50 shadow-xs group-hover/button:bg-background-raised group-disabled/button:bg-tertiary group-disabled/button:opacity-60 group-disabled/button:pointer-events-none",
     shortcut:
       "border-text-dimmed/40 text-text-dimmed group-hover/button:text-text-bright group-hover/button:border-text-dimmed",
     icon: "text-blue-500",
@@ -177,7 +177,7 @@ const variant = {
 };
 
 const allVariants = {
-  $all: "font-normal text-center font-sans justify-center items-center shrink-0 transition duration-150 rounded-[3px] select-none group-focus/button:outline-hidden group-disabled/button:opacity-75 group-disabled/button:pointer-events-none focus-custom",
+  $all: "cursor-pointer font-normal text-center font-sans justify-center items-center shrink-0 transition duration-150 rounded-[3px] select-none group-focus/button:outline-hidden group-disabled/button:opacity-75 group-disabled/button:pointer-events-none focus-custom",
   variant: variant,
 };
 
diff --git a/apps/webapp/app/components/primitives/Checkbox.tsx b/apps/webapp/app/components/primitives/Checkbox.tsx
index 75850b304d9..da63e2ed993 100644
--- a/apps/webapp/app/components/primitives/Checkbox.tsx
+++ b/apps/webapp/app/components/primitives/Checkbox.tsx
@@ -139,7 +139,11 @@ export const CheckboxWithLabel = React.forwardRef<HTMLInputElement, CheckboxProp
           className={cn(
             inputPositionClasses,
             props.readOnly || disabled ? "cursor-default" : "cursor-pointer",
-            "read-only:border-border-bright disabled:border-border-bright rounded-sm border border-border-bright bg-transparent transition checked:bg-indigo-500! read-only:bg-background-raised! group-hover:bg-background-deep checked:group-hover:bg-indigo-500 group-focus:ring-1 focus:ring-indigo-500 focus:ring-offset-0 focus:ring-offset-transparent focus-visible:outline-hidden  focus-visible:ring-indigo-500 disabled:bg-background-raised!"
+            // NB: don't use the `read-only:` variant here — checkboxes always
+            // match :read-only, so it would override the checked style.
+            "rounded-sm border border-border-bright bg-transparent transition checked:bg-indigo-500! group-hover:bg-background-deep checked:group-hover:bg-indigo-500 group-focus:ring-1 focus:ring-indigo-500 focus:ring-offset-0 focus:ring-offset-transparent focus-visible:outline-hidden focus-visible:ring-indigo-500",
+            (isDisabled || props.readOnly) &&
+              "bg-background-raised! checked:bg-background-raised! checked:group-hover:bg-background-raised! group-hover:bg-background-raised!"
           )}
           id={id}
           ref={ref}
@@ -189,7 +193,13 @@ export const Checkbox = forwardRef<HTMLInputElement, SimpleCheckboxProps>(
             : props.readOnly
               ? "cursor-default"
               : "cursor-pointer",
-          "read-only:border-border-bright disabled:border-border-bright disabled:opacity-50 rounded-sm border border-border-bright bg-transparent transition checked:bg-indigo-500! read-only:bg-background-raised! group-hover:bg-background-deep checked:group-hover:bg-indigo-500 group-focus:ring-1 focus:ring-indigo-500 focus:ring-offset-0 focus:ring-offset-transparent focus-visible:outline-hidden focus-visible:ring-indigo-500 disabled:bg-background-raised!"
+          // NB: don't use the `read-only:` variant here — checkboxes always
+          // match :read-only, so it would override the checked style.
+          "rounded-sm border border-border-bright bg-transparent transition checked:bg-indigo-500! group-hover:bg-background-deep checked:group-hover:bg-indigo-500 group-focus:ring-1 focus:ring-indigo-500 focus:ring-offset-0 focus:ring-offset-transparent focus-visible:outline-hidden focus-visible:ring-indigo-500",
+          props.disabled && "opacity-50",
+          (props.disabled || props.readOnly) &&
+            "bg-background-raised! checked:bg-background-raised! checked:group-hover:bg-background-raised! group-hover:bg-background-raised!",
+          className
         )}
         {...props}
         ref={ref}
diff --git a/apps/webapp/app/components/primitives/ClientTabs.tsx b/apps/webapp/app/components/primitives/ClientTabs.tsx
index 533a09c84e6..48757676d61 100644
--- a/apps/webapp/app/components/primitives/ClientTabs.tsx
+++ b/apps/webapp/app/components/primitives/ClientTabs.tsx
@@ -122,10 +122,10 @@ const ClientTabsTrigger = React.forwardRef<
             <motion.div
               layoutId={layoutId}
               transition={{ duration: 0.4, type: "spring" }}
-              className="absolute inset-0 rounded-[2px] border border-border-brightest/50 bg-surface-control"
+              className="absolute inset-0 rounded-[2px] border border-grid-bright bg-white dark:border-border-brightest/50 dark:bg-surface-control"
             />
           ) : (
-            <div className="absolute inset-0 rounded-[2px] border border-border-brightest/50 bg-surface-control" />
+            <div className="absolute inset-0 rounded-[2px] border border-grid-bright bg-white dark:border-border-brightest/50 dark:bg-surface-control" />
           )
         ) : null}
       </TabsPrimitive.Trigger>
@@ -175,7 +175,7 @@ const ClientTabsTrigger = React.forwardRef<
       ref={ref}
       tabIndex={0}
       className={cn(
-        "inline-flex items-center justify-center whitespace-nowrap border-r border-grid-bright px-2 text-sm transition-all first:pl-0 last:border-none focus-custom data-[state=active]:text-indigo-500 data-[state=inactive]:text-text-dimmed data-[state=inactive]:hover:text-text-bright disabled:pointer-events-none disabled:opacity-50",
+        "inline-flex items-center justify-center whitespace-nowrap border-r border-grid-bright px-2 text-sm transition-all first:pl-0 last:border-none focus-custom data-[state=active]:text-indigo-500 system:data-[state=active]:text-text-bright data-[state=inactive]:text-text-dimmed data-[state=inactive]:hover:text-text-bright disabled:pointer-events-none disabled:opacity-50",
         className
       )}
       {...props}
diff --git a/apps/webapp/app/components/primitives/ClipboardField.tsx b/apps/webapp/app/components/primitives/ClipboardField.tsx
index 0304e5bca6b..07d82f5efe3 100644
--- a/apps/webapp/app/components/primitives/ClipboardField.tsx
+++ b/apps/webapp/app/components/primitives/ClipboardField.tsx
@@ -5,7 +5,7 @@ import { CopyButton } from "./CopyButton";
 const variants = {
   "primary/small": {
     container:
-      "flex items-center text-text-dimmed font-mono rounded border bg-background-hover text-xs transition hover:bg-background-raised focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 focus:border-transparent focus:outline-hidden focus:ring-0 focus:ring-transparent",
+      "flex items-center text-text-dimmed font-mono rounded border border-border-bright/50 shadow-xs bg-input-bg text-xs transition hover:bg-background-raised focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 focus:border-transparent focus:outline-hidden focus:ring-0 focus:ring-transparent",
     input:
       "bg-transparent border-0 text-xs px-2 w-auto rounded-l h-6 leading-6 focus:ring-transparent",
     buttonVariant: "primary" as const,
@@ -14,7 +14,7 @@ const variants = {
   },
   "secondary/small": {
     container:
-      "flex items-center text-text-dimmed font-mono rounded border bg-background-hover text-xs transition hover:bg-background-raised focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 focus:border-transparent focus:outline-hidden focus:ring-0 focus:ring-transparent",
+      "flex items-center text-text-dimmed font-mono rounded border border-border-bright/50 shadow-xs bg-input-bg text-xs transition hover:bg-background-raised focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 focus:border-transparent focus:outline-hidden focus:ring-0 focus:ring-transparent",
     input:
       "bg-transparent border-0 text-xs px-2 w-auto rounded-l h-6 leading-6 focus:ring-transparent",
     buttonVariant: "tertiary" as const,
@@ -33,7 +33,7 @@ const variants = {
   },
   "primary/medium": {
     container:
-      "flex items-center text-text-dimmed font-mono rounded border bg-background-hover text-sm transition hover:bg-background-raised focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 focus:border-transparent focus:outline-hidden focus:ring-0 focus:ring-transparent",
+      "flex items-center text-text-dimmed font-mono rounded border border-border-bright/50 shadow-xs bg-input-bg text-sm transition hover:bg-background-raised focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 focus:border-transparent focus:outline-hidden focus:ring-0 focus:ring-transparent",
     input:
       "bg-transparent border-0 text-sm px-3 w-auto rounded-l h-8 leading-6 focus:ring-transparent",
     buttonVariant: "primary" as const,
@@ -42,7 +42,7 @@ const variants = {
   },
   "secondary/medium": {
     container:
-      "flex items-center text-text-dimmed font-mono rounded bg-background-hover text-sm transition hover:bg-background-raised focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 focus:border-transparent focus:outline-hidden focus:ring-0 focus:ring-transparent",
+      "flex items-center text-text-dimmed font-mono rounded border border-border-bright/50 shadow-xs bg-input-bg text-sm transition hover:bg-background-raised focus-visible:outline-hidden focus-visible:ring-0 focus-visible:ring-offset-0 focus:border-transparent focus:outline-hidden focus:ring-0 focus:ring-transparent",
     input:
       "bg-transparent border-0 text-sm px-3 w-auto rounded-l h-8 leading-6 focus:ring-transparent",
     buttonVariant: "tertiary" as const,
diff --git a/apps/webapp/app/components/primitives/CopyableText.tsx b/apps/webapp/app/components/primitives/CopyableText.tsx
index f8e19402aed..9634ad1ac01 100644
--- a/apps/webapp/app/components/primitives/CopyableText.tsx
+++ b/apps/webapp/app/components/primitives/CopyableText.tsx
@@ -11,12 +11,19 @@ export function CopyableText({
   className,
   asChild,
   variant,
+  hideTooltip,
 }: {
   value: string;
   copyValue?: string;
   className?: string;
   asChild?: boolean;
   variant?: "icon-right" | "text-below";
+  /**
+   * Hide the "Copy"/"Copied" hint tooltip. Use when this is rendered inside another
+   * Radix tooltip (e.g. the admin debug panel): the nested tooltip would otherwise
+   * fire Radix's global "one tooltip open at a time" close and dismiss the parent.
+   */
+  hideTooltip?: boolean;
 }) {
   const [isHovered, setIsHovered] = useState(false);
   const { copy, copied } = useCopy(copyValue ?? value);
@@ -24,6 +31,24 @@ export function CopyableText({
   const resolvedVariant = variant ?? "icon-right";
 
   if (resolvedVariant === "icon-right") {
+    const iconButton = (
+      <span
+        className={cn(
+          "ml-1 flex size-6 items-center justify-center rounded border border-border-bright bg-background-hover",
+          asChild && "p-1",
+          copied
+            ? "text-green-500"
+            : "text-text-dimmed hover:border-border-bright hover:bg-background-raised hover:text-text-bright"
+        )}
+      >
+        {copied ? (
+          <ClipboardCheckIcon className="size-3.5" />
+        ) : (
+          <ClipboardIcon className="size-3.5" />
+        )}
+      </span>
+    );
+
     return (
       <span
         className={cn("group relative inline-flex h-6 items-center", className)}
@@ -38,29 +63,17 @@ export function CopyableText({
             isHovered ? "flex" : "hidden"
           )}
         >
-          <SimpleTooltip
-            button={
-              <span
-                className={cn(
-                  "ml-1 flex size-6 items-center justify-center rounded border border-border-bright bg-background-hover",
-                  asChild && "p-1",
-                  copied
-                    ? "text-green-500"
-                    : "text-text-dimmed hover:border-border-bright hover:bg-background-raised hover:text-text-bright"
-                )}
-              >
-                {copied ? (
-                  <ClipboardCheckIcon className="size-3.5" />
-                ) : (
-                  <ClipboardIcon className="size-3.5" />
-                )}
-              </span>
-            }
-            content={copied ? "Copied!" : "Copy"}
-            className="font-sans"
-            disableHoverableContent
-            asChild={asChild}
-          />
+          {hideTooltip ? (
+            iconButton
+          ) : (
+            <SimpleTooltip
+              button={iconButton}
+              content={copied ? "Copied!" : "Copy"}
+              className="font-sans"
+              disableHoverableContent
+              asChild={asChild}
+            />
+          )}
         </span>
       </span>
     );
diff --git a/apps/webapp/app/components/primitives/DateField.tsx b/apps/webapp/app/components/primitives/DateField.tsx
index 56cf5086493..a68616fc1b1 100644
--- a/apps/webapp/app/components/primitives/DateField.tsx
+++ b/apps/webapp/app/components/primitives/DateField.tsx
@@ -275,7 +275,7 @@ function DateSegmentGuide({ segment }: { segment: DateSegment }) {
       style={{
         minWidth: minWidthForSegment(segment),
       }}
-      className={`group box-content rounded-sm px-0.5 text-right text-sm tabular-nums text-rose-500 outline-hidden ${
+      className={`group box-content rounded-sm px-0.5 text-right text-sm tabular-nums outline-hidden ${
         !segment.isEditable ? "text-text-faint" : "text-text-bright"
       }`}
     >
diff --git a/apps/webapp/app/components/primitives/DateTime.tsx b/apps/webapp/app/components/primitives/DateTime.tsx
index 355af397a11..3c1227e0c9a 100644
--- a/apps/webapp/app/components/primitives/DateTime.tsx
+++ b/apps/webapp/app/components/primitives/DateTime.tsx
@@ -1,4 +1,5 @@
-import { GlobeAltIcon, GlobeAmericasIcon } from "@heroicons/react/20/solid";
+import { GlobeAmericasIcon } from "@heroicons/react/20/solid";
+import { GlobeLinesIcon } from "~/assets/icons/GlobeLinesIcon";
 import { useRouteLoaderData } from "@remix-run/react";
 import { formatDistanceToNow } from "date-fns";
 import { Laptop } from "lucide-react";
@@ -523,7 +524,7 @@ function TooltipContent({
           title="UTC"
           dateTime={formatDateTime(realDate, "UTC", locales, true, true, true)}
           isoDateTime={formatDateTimeISO(realDate, "UTC")}
-          icon={<GlobeAltIcon className="size-4 text-blue-500" />}
+          icon={<GlobeLinesIcon className="size-4 text-blue-500" />}
         />
         <DateTimeTooltipContent
           title="Local"
diff --git a/apps/webapp/app/components/primitives/Input.tsx b/apps/webapp/app/components/primitives/Input.tsx
index 4f20c0c11d6..5c3235a66c9 100644
--- a/apps/webapp/app/components/primitives/Input.tsx
+++ b/apps/webapp/app/components/primitives/Input.tsx
@@ -12,21 +12,21 @@ const inputBase =
 const variants = {
   large: {
     container:
-      "px-1 w-full h-10 rounded-[3px] border border-background-bright bg-background-hover hover:border-border-bright hover:bg-secondary",
+      "px-1 w-full h-10 rounded-[3px] border border-border-bright/50 shadow-xs bg-input-bg hover:bg-background-raised",
     input: "px-2 text-sm",
     iconSize: "size-4 ml-1",
     accessory: "pr-1",
   },
   medium: {
     container:
-      "px-1 h-8 w-full rounded border border-background-bright bg-background-hover hover:border-border-bright hover:bg-secondary",
+      "px-1 h-8 w-full rounded border border-border-bright/50 shadow-xs bg-input-bg hover:bg-background-raised",
     input: "px-1.5 rounded text-sm",
     iconSize: "size-4 ml-0.5",
     accessory: "pr-1",
   },
   small: {
     container:
-      "px-1 h-6 w-full rounded border border-background-bright bg-background-hover hover:border-border-bright hover:bg-secondary",
+      "px-1 h-6 w-full rounded border border-border-bright/50 shadow-xs bg-input-bg hover:bg-background-raised",
     input: "px-1 rounded text-xs",
     iconSize: "size-3 ml-0.5",
     accessory: "pr-0.5",
@@ -39,7 +39,7 @@ const variants = {
   },
   "secondary-small": {
     container:
-      "px-1 h-6 w-full rounded border border-border-bright hover:border-border-brighter bg-grid-dimmed hover:bg-secondary",
+      "px-1 h-6 w-full rounded border border-border-bright/50 shadow-xs bg-input-bg hover:bg-background-raised",
     input: "px-1 rounded text-xs",
     iconSize: "size-3 ml-0.5",
     accessory: "pr-0.5",
diff --git a/apps/webapp/app/components/primitives/InputNumberStepper.tsx b/apps/webapp/app/components/primitives/InputNumberStepper.tsx
index 6869b4424ff..11fbb676f2b 100644
--- a/apps/webapp/app/components/primitives/InputNumberStepper.tsx
+++ b/apps/webapp/app/components/primitives/InputNumberStepper.tsx
@@ -189,13 +189,14 @@ export function InputNumberStepper({
           aria-label={`Decrease by ${step}`}
           className={cn(
             "flex items-center justify-center rounded border border-error/30 bg-error/20 transition",
+            "system:border-transparent system:bg-error system:transition system:hover:bg-error system:hover:brightness-90",
             size.button,
             "hover:border-error/50 hover:bg-error/30",
             "disabled:cursor-not-allowed disabled:opacity-40",
             "focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-text-link"
           )}
         >
-          <MinusIcon className={cn("text-error", size.icon)} />
+          <MinusIcon className={cn("text-error system:text-white", size.icon)} />
         </button>
 
         <button
@@ -206,13 +207,14 @@ export function InputNumberStepper({
           aria-label={`Increase by ${step}`}
           className={cn(
             "flex items-center justify-center rounded border border-success/30 bg-success/10 transition",
+            "system:border-transparent system:bg-success system:transition system:hover:bg-success system:hover:brightness-90",
             size.button,
             "hover:border-success/40 hover:bg-success/20",
             "disabled:cursor-not-allowed disabled:opacity-40 disabled:hover:bg-transparent",
             "focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-text-link"
           )}
         >
-          <PlusIcon className={cn("text-success", size.icon)} />
+          <PlusIcon className={cn("text-success system:text-white", size.icon)} />
         </button>
       </div>
     </div>
diff --git a/apps/webapp/app/components/primitives/Popover.tsx b/apps/webapp/app/components/primitives/Popover.tsx
index 21ff5cd9045..fccba52a89b 100644
--- a/apps/webapp/app/components/primitives/Popover.tsx
+++ b/apps/webapp/app/components/primitives/Popover.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { CheckIcon } from "@heroicons/react/20/solid";
-import { EllipsisVerticalIcon } from "@heroicons/react/24/solid";
+import { EllipsisHorizontalIcon, EllipsisVerticalIcon } from "@heroicons/react/24/solid";
 import * as PopoverPrimitive from "@radix-ui/react-popover";
 import { Link } from "@remix-run/react";
 import * as React from "react";
@@ -279,20 +279,29 @@ const popoverVerticalEllipseVariants = {
       "size-6 rounded border border-border-bright bg-secondary text-text-bright hover:bg-surface-control hover:border-border-brighter",
     icon: "size-4",
   },
+  // No box/background — the icon inherits the trigger's text color, so callers
+  // can drive brightening from a parent hover (e.g. a section header).
+  ghost: {
+    trigger: "p-1 text-text-faint hover:text-text-bright",
+    icon: "size-4",
+  },
 } as const;
 
 type PopoverVerticalEllipseVariant = keyof typeof popoverVerticalEllipseVariants;
 
-function PopoverVerticalEllipseTrigger({
+function PopoverEllipseTrigger({
   isOpen,
   variant = "minimal",
+  orientation = "vertical",
   className,
   ...props
 }: {
   isOpen?: boolean;
   variant?: PopoverVerticalEllipseVariant;
+  orientation?: "vertical" | "horizontal";
 } & React.ComponentPropsWithoutRef<typeof PopoverTrigger>) {
   const styles = popoverVerticalEllipseVariants[variant];
+  const Icon = orientation === "horizontal" ? EllipsisHorizontalIcon : EllipsisVerticalIcon;
   return (
     <PopoverTrigger
       {...props}
@@ -302,11 +311,14 @@ function PopoverVerticalEllipseTrigger({
         className
       )}
     >
-      <EllipsisVerticalIcon className={cn(styles.icon, "transition")} />
+      <Icon className={cn(styles.icon, "transition")} />
     </PopoverTrigger>
   );
 }
 
+// Back-compat alias: the trigger now supports both orientations.
+const PopoverVerticalEllipseTrigger = PopoverEllipseTrigger;
+
 export {
   Popover,
   PopoverArrowTrigger,
@@ -314,6 +326,7 @@ export {
   PopoverCustomTrigger,
   PopoverMenuItem,
   PopoverSectionHeader,
+  PopoverEllipseTrigger,
   PopoverSideMenuTrigger,
   PopoverTrigger,
   PopoverVerticalEllipseTrigger,
diff --git a/apps/webapp/app/components/primitives/RadioButton.tsx b/apps/webapp/app/components/primitives/RadioButton.tsx
index c52389f788f..d936a81b923 100644
--- a/apps/webapp/app/components/primitives/RadioButton.tsx
+++ b/apps/webapp/app/components/primitives/RadioButton.tsx
@@ -22,7 +22,7 @@ const variants = {
   },
   "button/small": {
     button:
-      "flex items-center w-fit h-8 pl-2 pr-3 rounded-md border hover:data-[state=checked]:border-border-bright border-border-bright hover:border-border-bright transition data-disabled:opacity-70 data-disabled:hover:bg-transparent hover:data-[state=checked]:bg-white/4 data-[state=checked]:bg-white/4",
+      "flex items-center w-fit h-8 pl-2 pr-3 rounded-md border border-border-bright/50 shadow-xs bg-secondary transition hover:bg-background-raised data-disabled:opacity-70 data-disabled:hover:bg-secondary hover:data-[state=checked]:bg-text-bright/4 data-[state=checked]:bg-text-bright/4",
     label: "text-sm text-text-bright select-none",
     description: "text-text-dimmed",
     inputPosition: "mt-0",
@@ -30,7 +30,7 @@ const variants = {
   },
   button: {
     button:
-      "w-fit py-2 pl-3 pr-4 rounded border border-border-bright hover:bg-background-dimmed hover:border-border-brightest transition data-[state=checked]:bg-background-dimmed data-disabled:opacity-70",
+      "w-fit py-2 pl-3 pr-4 rounded border border-border-bright/50 shadow-xs bg-secondary hover:bg-background-raised transition data-[state=checked]:bg-background-dimmed data-disabled:opacity-70",
     label: "text-text-bright select-none",
     description: "text-text-dimmed",
     inputPosition: "mt-1",
@@ -38,7 +38,7 @@ const variants = {
   },
   description: {
     button:
-      "w-full p-2.5 hover:data-[state=checked]:bg-white/4 data-[state=checked]:bg-white/4 transition data-disabled:opacity-70 hover:border-border-bright border-border-bright hover:data-[state=checked]:border-border-bright border rounded-md",
+      "w-full p-2.5 rounded-md border border-border-bright/50 shadow-xs bg-secondary transition hover:bg-background-raised data-disabled:opacity-70 hover:data-[state=checked]:bg-text-bright/4 data-[state=checked]:bg-text-bright/4",
     label: "text-text-bright font-semibold -mt-0.5 text-left text-sm",
     description: "text-text-dimmed mt-0 text-left",
     inputPosition: "mt-0",
@@ -46,7 +46,7 @@ const variants = {
   },
   icon: {
     button:
-      "w-full p-2.5 pb-4 hover:bg-background-dimmed transition data-disabled:opacity-70 data-[state=checked]:bg-background-dimmed border-border-bright border rounded-sm",
+      "w-full p-2.5 pb-4 rounded-sm border border-border-bright/50 shadow-xs bg-secondary hover:bg-background-raised transition data-disabled:opacity-70 data-[state=checked]:bg-background-dimmed",
     label: "text-text-bright font-semibold -mt-1 text-left",
     description: "text-text-dimmed mt-0 text-left",
     inputPosition: "mt-0",
@@ -82,7 +82,10 @@ export function RadioButtonCircle({
           )}
         >
           <Circle
-            className={cn("size-2 fill-text-bright text-text-bright", innerCircleClassName)}
+            className={cn(
+              "size-2 fill-white text-white dark:fill-text-bright dark:text-text-bright",
+              innerCircleClassName
+            )}
           />
         </div>
       )}
@@ -136,7 +139,7 @@ export const RadioGroupItem = React.forwardRef<
           )}
         >
           <RadioGroupPrimitive.Indicator className="flex h-full w-full items-center justify-center rounded-full bg-indigo-600">
-            <Circle className="size-2 fill-text-bright text-text-bright" />
+            <Circle className="size-2 fill-white text-white dark:fill-text-bright dark:text-text-bright" />
           </RadioGroupPrimitive.Indicator>
         </div>
         <div className={cn(icon ? "flex h-full flex-col justify-end" : "")}>
diff --git a/apps/webapp/app/components/primitives/Resizable.tsx b/apps/webapp/app/components/primitives/Resizable.tsx
index 59550332c26..0bd4f8e86d9 100644
--- a/apps/webapp/app/components/primitives/Resizable.tsx
+++ b/apps/webapp/app/components/primitives/Resizable.tsx
@@ -2,6 +2,8 @@
 
 import React, { useRef } from "react";
 import { PanelGroup, Panel, PanelResizer } from "@window-splitter/react";
+import { useTypedMatchesData } from "~/hooks/useTypedMatchData";
+import type { loader as rootLoader } from "~/root";
 import { cn } from "~/utils/cn";
 
 const ResizablePanelGroup = ({ className, ...props }: React.ComponentProps<typeof PanelGroup>) => (
@@ -14,7 +16,25 @@ const ResizablePanelGroup = ({ className, ...props }: React.ComponentProps<typeo
   />
 );
 
-const ResizablePanel = Panel;
+// react-window-splitter drives the collapse animation through @react-spring/rafz,
+// which has timing/interaction issues with Firefox that produce visual glitches
+// (alternating frames, panels stuck at min, panelHasSpace invariant violations),
+// so the animation is dropped on Firefox. The browser check must agree between
+// SSR and hydration (a client-only `navigator` check made the panel tree differ
+// and shifted useIds), so it comes from the root loader's user-agent sniff.
+const ResizablePanel = React.forwardRef<
+  React.ElementRef<typeof Panel>,
+  React.ComponentProps<typeof Panel>
+>(function ResizablePanel({ collapseAnimation, ...props }, ref) {
+  const rootData = useTypedMatchesData<typeof rootLoader>({ id: "root" });
+  return (
+    <Panel
+      ref={ref}
+      collapseAnimation={rootData?.isFirefox ? undefined : collapseAnimation}
+      {...props}
+    />
+  );
+});
 
 const ResizableHandle = ({
   withHandle = true,
@@ -69,14 +89,8 @@ const ResizableHandle = ({
   </PanelResizer>
 );
 
-// react-window-splitter drives the collapse animation through @react-spring/rafz,
-// which has timing/interaction issues with Firefox that produce visual glitches
-// (alternating frames, panels stuck at min, panelHasSpace invariant violations).
-// Disable the animation on Firefox; it works correctly in Chromium and Safari.
-const RESIZABLE_PANEL_ANIMATION =
-  typeof navigator !== "undefined" && /firefox/i.test(navigator.userAgent)
-    ? undefined
-    : ({ easing: "ease-in-out", duration: 300 } as const);
+// Firefox filtering happens inside ResizablePanel (see above).
+const RESIZABLE_PANEL_ANIMATION = { easing: "ease-in-out", duration: 300 } as const;
 
 const COLLAPSIBLE_HANDLE_CLASSNAME = "transition-opacity duration-200";
 
diff --git a/apps/webapp/app/components/primitives/SegmentedControl.tsx b/apps/webapp/app/components/primitives/SegmentedControl.tsx
index 2f749215c29..5cf65fce4dc 100644
--- a/apps/webapp/app/components/primitives/SegmentedControl.tsx
+++ b/apps/webapp/app/components/primitives/SegmentedControl.tsx
@@ -24,10 +24,11 @@ const theme = {
     selected: "absolute inset-0 rounded-[2px] outline-solid outline-3 outline-primary",
   },
   secondary: {
-    base: "bg-background-raised/50",
+    base: "bg-transparent dark:bg-background-raised/50",
     active: "text-text-bright",
     inactive: "text-text-dimmed transition hover:text-text-bright",
-    selected: "absolute inset-0 rounded bg-background-raised border border-border-bright",
+    selected:
+      "absolute inset-0 rounded bg-white border border-grid-bright dark:bg-background-raised dark:border-border-bright",
   },
 };
 
diff --git a/apps/webapp/app/components/primitives/Select.tsx b/apps/webapp/app/components/primitives/Select.tsx
index 66b291b7524..68e1bae5882 100644
--- a/apps/webapp/app/components/primitives/Select.tsx
+++ b/apps/webapp/app/components/primitives/Select.tsx
@@ -30,7 +30,7 @@ const style = {
   },
   secondary: {
     button:
-      "bg-secondary focus-custom border border-border-bright hover:text-text-bright hover:border-border-brighter text-text-bright hover:bg-surface-control",
+      "bg-secondary focus-custom border border-border-bright/50 shadow-xs hover:text-text-bright text-text-bright hover:bg-background-raised",
   },
 };
 
@@ -62,6 +62,7 @@ type Section<TItem> = {
 
 function isSection<TItem>(data: TItem[] | Section<TItem>[]): data is Section<TItem>[] {
   const firstItem = data[0];
+  if (!firstItem) return false;
   return (
     (firstItem as Section<TItem>).type === "section" &&
     (firstItem as Section<TItem>).items !== undefined &&
diff --git a/apps/webapp/app/components/primitives/Slider.tsx b/apps/webapp/app/components/primitives/Slider.tsx
index b5af54e2ba4..4d6568bbf0b 100644
--- a/apps/webapp/app/components/primitives/Slider.tsx
+++ b/apps/webapp/app/components/primitives/Slider.tsx
@@ -5,6 +5,18 @@ import type { RenderIcon } from "./Icon";
 import { Icon } from "./Icon";
 
 const variants = {
+  /* Quiet variant for settings rows: no hover box, no thumb halo */
+  settings: {
+    container: "h-6 gap-1 rounded-sm px-1",
+    icons: "h-4 w-4 text-text-bright",
+    root: "h-4 grow",
+    track: "h-1 bg-grid-bright",
+    range: "bg-transparent",
+    // Matches the Switch thumb; the secondary-button hairline+shadow keeps the
+    // white dot visible on the light track
+    thumb:
+      "h-3 w-3 border border-border-bright bg-white shadow-sm dark:border-transparent dark:bg-charcoal-200 dark:shadow-none",
+  },
   tertiary: {
     container: "h-6 gap-1 rounded-sm hover:bg-background-raised px-1",
     icons: "h-4 w-4 text-text-bright",
diff --git a/apps/webapp/app/components/primitives/Switch.tsx b/apps/webapp/app/components/primitives/Switch.tsx
index 96943e9bebb..e07187176a8 100644
--- a/apps/webapp/app/components/primitives/Switch.tsx
+++ b/apps/webapp/app/components/primitives/Switch.tsx
@@ -36,7 +36,7 @@ const variations = {
   "secondary/small": {
     container: cn(
       small.container,
-      "border border-border-bright hover:border-border-brighter bg-secondary hover:bg-surface-control"
+      "border border-border-bright/50 shadow-xs bg-secondary hover:bg-background-raised"
     ),
     root: cn(
       small.root,
@@ -98,7 +98,7 @@ export const Switch = React.forwardRef<React.ElementRef<typeof SwitchPrimitives.
         <SwitchPrimitives.Thumb
           className={cn(
             thumb,
-            "pointer-events-none block rounded-full bg-charcoal-200 transition group-data-[state=checked]:bg-text-bright"
+            "pointer-events-none block rounded-full bg-white transition dark:bg-charcoal-200 dark:group-data-[state=checked]:bg-text-bright"
           )}
         />
       </div>
diff --git a/apps/webapp/app/components/primitives/UsageSparkline.tsx b/apps/webapp/app/components/primitives/UsageSparkline.tsx
index 89c471a405e..e0de505a8f3 100644
--- a/apps/webapp/app/components/primitives/UsageSparkline.tsx
+++ b/apps/webapp/app/components/primitives/UsageSparkline.tsx
@@ -107,7 +107,7 @@ export function UsageSparkline({
         </ResponsiveContainer>
       </div>
       {hideTotal ? null : (
-        <span className={cn("-mt-1 text-xs tabular-nums", totalClassName)}>
+        <span className={cn("-mt-1 text-xs tabular-nums system-mono-label", totalClassName)}>
           {formatTotal ? formatTotal(total) : total.toLocaleString()}
         </span>
       )}
diff --git a/apps/webapp/app/components/primitives/charts/Chart.tsx b/apps/webapp/app/components/primitives/charts/Chart.tsx
index a742fbbde4c..e0b6e6bb211 100644
--- a/apps/webapp/app/components/primitives/charts/Chart.tsx
+++ b/apps/webapp/app/components/primitives/charts/Chart.tsx
@@ -5,7 +5,9 @@ import { AnimatedNumber } from "../AnimatedNumber";
 import TooltipPortal from "../TooltipPortal";
 
 // Format: { THEME_NAME: CSS_SELECTOR }
-const THEMES = { light: "", dark: '[data-theme="dark"]' } as const;
+// dark covers Classic too; :is() keeps it one scoped selector when the prefix is
+// interpolated as `${prefix} [data-chart=...]` below (a comma would break scoping).
+const THEMES = { light: "", dark: ':is([data-theme="dark"], [data-theme="classic"])' } as const;
 
 export type ChartState = "loading" | "noData" | "invalid" | "loaded" | undefined;
 
diff --git a/apps/webapp/app/components/primitives/charts/ChartZoom.tsx b/apps/webapp/app/components/primitives/charts/ChartZoom.tsx
index 375a133f445..4be839f3f68 100644
--- a/apps/webapp/app/components/primitives/charts/ChartZoom.tsx
+++ b/apps/webapp/app/components/primitives/charts/ChartZoom.tsx
@@ -126,8 +126,8 @@ export function ZoomTooltip({
         className={cn(
           "absolute whitespace-nowrap rounded border px-2 py-1 text-xxs tabular-nums",
           invalidSelection
-            ? "border-amber-800 bg-amber-950 text-amber-400"
-            : "border-blue-800 bg-[#1B2334] text-blue-400"
+            ? "border-amber-800 bg-amber-950 text-amber-400 light:border-amber-300 light:bg-amber-50 light:text-amber-700"
+            : "border-blue-800 bg-[#1B2334] text-blue-400 light:border-blue-300 light:bg-blue-50 light:text-blue-700"
         )}
         style={{
           left: coordinate?.x,
@@ -140,8 +140,8 @@ export function ZoomTooltip({
           className={cn(
             "absolute top-[-5px] left-1/2 h-2 w-2 -translate-x-1/2 rotate-45",
             invalidSelection
-              ? "border-l border-t border-amber-800 bg-amber-950"
-              : "border-l border-t border-blue-800 bg-[#1B2334]"
+              ? "border-l border-t border-amber-800 bg-amber-950 light:border-amber-300 light:bg-amber-50"
+              : "border-l border-t border-blue-800 bg-[#1B2334] light:border-blue-300 light:bg-blue-50"
           )}
         />
       </div>
diff --git a/apps/webapp/app/components/query/QueryEditor.tsx b/apps/webapp/app/components/query/QueryEditor.tsx
index 039bc7ccbf2..447f8398a4e 100644
--- a/apps/webapp/app/components/query/QueryEditor.tsx
+++ b/apps/webapp/app/components/query/QueryEditor.tsx
@@ -241,7 +241,7 @@ const QueryEditorForm = forwardRef<
   );
 
   return (
-    <div className="flex h-full flex-col gap-2 bg-background-deep pb-2">
+    <div className="flex h-full flex-col gap-2 bg-white pb-2 dark:bg-background-deep">
       <TSQLEditor
         defaultValue={query}
         onChange={setQuery}
diff --git a/apps/webapp/app/components/queues/QueueControls.tsx b/apps/webapp/app/components/queues/QueueControls.tsx
index 9c4302d06e7..542d60d1847 100644
--- a/apps/webapp/app/components/queues/QueueControls.tsx
+++ b/apps/webapp/app/components/queues/QueueControls.tsx
@@ -3,6 +3,7 @@ import { DialogClose } from "@radix-ui/react-dialog";
 import { Form, useNavigation } from "@remix-run/react";
 import type { QueueItem } from "@trigger.dev/core/v3/schemas";
 import { useEffect, useState } from "react";
+import { cn } from "~/utils/cn";
 import { Button, type ButtonVariant } from "~/components/primitives/Buttons";
 import { Dialog, DialogContent, DialogHeader, DialogTrigger } from "~/components/primitives/Dialog";
 import { FormButtons } from "~/components/primitives/FormButtons";
@@ -58,8 +59,18 @@ export function QueuePauseResumeButton({
                 <Button
                   type="button"
                   variant={variant}
+                  className={
+                    iconOnly
+                      ? queue.paused
+                        ? "system:border-transparent system:bg-success system:transition system:group-hover/button:bg-success system:group-hover/button:brightness-90"
+                        : "system:border-transparent system:bg-warning system:transition system:group-hover/button:bg-warning system:group-hover/button:brightness-90"
+                      : undefined
+                  }
                   LeadingIcon={queue.paused ? PlayIcon : PauseIcon}
-                  leadingIconClassName={queue.paused ? "text-success" : "text-warning"}
+                  leadingIconClassName={cn(
+                    queue.paused ? "text-success" : "text-warning",
+                    iconOnly && "system:text-white"
+                  )}
                   fullWidth={fullWidth}
                   textAlignLeft={fullWidth}
                   aria-label={label}
diff --git a/apps/webapp/app/components/queues/QueueMetricCards.tsx b/apps/webapp/app/components/queues/QueueMetricCards.tsx
index b7694eade44..6e463ebb585 100644
--- a/apps/webapp/app/components/queues/QueueMetricCards.tsx
+++ b/apps/webapp/app/components/queues/QueueMetricCards.tsx
@@ -23,9 +23,9 @@ import { formatNumberCompact } from "~/utils/numberFormatter";
 // so pages render instantly; loaders only supply live counts and identifiers.
 
 export const QUEUE_METRIC_COLORS = {
-  running: "var(--color-queues)",
-  limit: "#4D525B",
-  queued: "var(--color-queues)",
+  running: "var(--color-queues-chart)",
+  limit: "var(--color-queues-chart-ref)",
+  queued: "var(--color-queues-chart)",
   p50: "#22D3EE",
   p95: "#F59E0B",
   p99: "#EF4444",
diff --git a/apps/webapp/app/components/runs/v3/AIFilterInput.tsx b/apps/webapp/app/components/runs/v3/AIFilterInput.tsx
index 03b70499ed4..d6a6b32340b 100644
--- a/apps/webapp/app/components/runs/v3/AIFilterInput.tsx
+++ b/apps/webapp/app/components/runs/v3/AIFilterInput.tsx
@@ -206,7 +206,7 @@ function ErrorPopover({
       <PopoverContent
         align="start"
         side="bottom"
-        className="w-(--radix-popover-trigger-width) min-w-(--radix-popover-trigger-width) max-w-(--radix-popover-trigger-width) border border-error/20 bg-[#2F1D24] px-3 py-2 text-xs text-text-dimmed"
+        className="w-(--radix-popover-trigger-width) min-w-(--radix-popover-trigger-width) max-w-(--radix-popover-trigger-width) border border-error/20 bg-[#2F1D24] light:bg-error/10 px-3 py-2 text-xs text-text-dimmed"
       >
         {error}
       </PopoverContent>
diff --git a/apps/webapp/app/components/runs/v3/BatchStatus.tsx b/apps/webapp/app/components/runs/v3/BatchStatus.tsx
index 17d02b23378..243c5eaac19 100644
--- a/apps/webapp/app/components/runs/v3/BatchStatus.tsx
+++ b/apps/webapp/app/components/runs/v3/BatchStatus.tsx
@@ -42,7 +42,12 @@ export function BatchStatusCombo({
 }
 
 export function BatchStatusLabel({ status }: { status: BatchTaskRunStatus }) {
-  return <span className={batchStatusColor(status)}>{batchStatusTitle(status)}</span>;
+  // system-mono-label: System themes uncolor the label (see tailwind.css)
+  return (
+    <span className={cn("system-mono-label", batchStatusColor(status))}>
+      {batchStatusTitle(status)}
+    </span>
+  );
 }
 
 export function BatchStatusIcon({
diff --git a/apps/webapp/app/components/runs/v3/BulkAction.tsx b/apps/webapp/app/components/runs/v3/BulkAction.tsx
index 3c25aa4409a..c472ebdaaef 100644
--- a/apps/webapp/app/components/runs/v3/BulkAction.tsx
+++ b/apps/webapp/app/components/runs/v3/BulkAction.tsx
@@ -121,13 +121,14 @@ export function BulkActionStatusLabel({
   status: BulkActionStatus;
   className?: string;
 }) {
+  // system-mono-label: System themes uncolor the label (see tailwind.css)
   switch (status) {
     case "PENDING":
-      return <span className={cn("text-pending", className)}>In progress</span>;
+      return <span className={cn("system-mono-label text-pending", className)}>In progress</span>;
     case "COMPLETED":
-      return <span className={cn("text-success", className)}>Completed</span>;
+      return <span className={cn("system-mono-label text-success", className)}>Completed</span>;
     case "ABORTED":
-      return <span className={cn("text-error", className)}>Aborted</span>;
+      return <span className={cn("system-mono-label text-error", className)}>Aborted</span>;
     default: {
       assertNever(status);
     }
diff --git a/apps/webapp/app/components/runs/v3/DeploymentStatus.tsx b/apps/webapp/app/components/runs/v3/DeploymentStatus.tsx
index f4142cffce2..aae5f97ecb4 100644
--- a/apps/webapp/app/components/runs/v3/DeploymentStatus.tsx
+++ b/apps/webapp/app/components/runs/v3/DeploymentStatus.tsx
@@ -35,7 +35,8 @@ export function DeploymentStatusLabel({
   isBuilt: boolean;
 }) {
   return (
-    <span className={deploymentStatusClassNameColor(status)}>
+    // system-mono-label: System themes uncolor the label (see tailwind.css)
+    <span className={cn("system-mono-label", deploymentStatusClassNameColor(status))}>
       {deploymentStatusTitle(status, isBuilt)}
     </span>
   );
diff --git a/apps/webapp/app/components/runs/v3/RunFilters.tsx b/apps/webapp/app/components/runs/v3/RunFilters.tsx
index f5980d9e597..1e4462577b5 100644
--- a/apps/webapp/app/components/runs/v3/RunFilters.tsx
+++ b/apps/webapp/app/components/runs/v3/RunFilters.tsx
@@ -1,9 +1,9 @@
 import * as Ariakit from "@ariakit/react";
+import { GlobeLinesIcon } from "~/assets/icons/GlobeLinesIcon";
 import {
   CalendarIcon,
   CpuChipIcon,
   FingerPrintIcon,
-  GlobeAltIcon,
   PlusIcon,
   RectangleStackIcon,
   Squares2X2Icon,
@@ -282,7 +282,7 @@ export function filterIcon(filterKey: string): ReactNode | undefined {
     case "queues":
       return <RectangleStackIcon className="size-4" />;
     case "regions":
-      return <GlobeAltIcon className="size-4" />;
+      return <GlobeLinesIcon className="size-4" />;
     case "machines":
       return <MachineDefaultIcon className="size-4" />;
     case "versions":
@@ -423,7 +423,7 @@ const filterTypes = [
   { name: "tags", title: "Tags", icon: <TagIcon className="size-4" /> },
   { name: "versions", title: "Versions", icon: <IconRotateClockwise2 className="size-4" /> },
   { name: "queues", title: "Queues", icon: <RectangleStackIcon className="size-4" /> },
-  { name: "regions", title: "Region", icon: <GlobeAltIcon className="size-4" /> },
+  { name: "regions", title: "Region", icon: <GlobeLinesIcon className="size-4" /> },
   { name: "machines", title: "Machines", icon: <MachineDefaultIcon className="size-4" /> },
   { name: "run", title: "Run ID", icon: <FingerPrintIcon className="size-4" /> },
   { name: "batch", title: "Batch ID", icon: <Squares2X2Icon className="size-4" /> },
@@ -673,7 +673,7 @@ function PermanentStatusFilter() {
                     className="pl-1"
                   />
                 ) : (
-                  <div className="flex h-6 items-center gap-1 rounded border border-border-bright bg-secondary pl-1 pr-2 text-xs text-text-bright transition group-hover:border-border-brighter group-hover:bg-surface-control">
+                  <div className="flex h-6 items-center gap-1 rounded border border-border-bright/50 shadow-xs bg-secondary pl-1 pr-2 text-xs text-text-bright transition group-hover:bg-background-raised">
                     <div className="grid size-4 place-items-center">
                       <div className="size-[75%] rounded-full border-2 border-text-bright" />
                     </div>
@@ -852,7 +852,7 @@ function PermanentTasksFilter({ possibleTasks }: Pick<RunFiltersProps, "possible
                     className="pl-1"
                   />
                 ) : (
-                  <div className="flex h-6 items-center gap-1.5 rounded border border-border-bright bg-secondary pl-1 pr-2 text-xs text-text-bright transition group-hover:border-border-brighter group-hover:bg-surface-control">
+                  <div className="flex h-6 items-center gap-1.5 rounded border border-border-bright/50 shadow-xs bg-secondary pl-1 pr-2 text-xs text-text-bright transition group-hover:bg-background-raised">
                     {filterIcon("tasks")}
                     <span>Tasks</span>
                   </div>
diff --git a/apps/webapp/app/components/runs/v3/RunTag.tsx b/apps/webapp/app/components/runs/v3/RunTag.tsx
index 3d6c6751ce3..16d2333632e 100644
--- a/apps/webapp/app/components/runs/v3/RunTag.tsx
+++ b/apps/webapp/app/components/runs/v3/RunTag.tsx
@@ -1,5 +1,4 @@
 import { useCallback, useMemo, useState } from "react";
-import tagLeftPath from "./tag-left.svg";
 import { SimpleTooltip } from "~/components/primitives/Tooltip";
 import { Link } from "@remix-run/react";
 import { cn } from "~/utils/cn";
@@ -7,6 +6,26 @@ import { ClipboardCheckIcon, ClipboardIcon, XIcon } from "lucide-react";
 
 type Tag = string | { key: string; value: string };
 
+function TagNotch() {
+  return (
+    <svg
+      width="9"
+      height="25"
+      viewBox="0 0 9 25"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      className="block h-full w-2.25"
+      aria-hidden="true"
+    >
+      <path
+        d="M8.51694 0.5H10.5V24.5H8.51694C7.17088 24.5 5.94409 23.7281 5.36161 22.5146L1.69703 14.88C0.974863 13.3755 0.974863 11.6245 1.69703 10.12L5.3616 2.48544C5.94409 1.27194 7.17088 0.5 8.51694 0.5Z"
+        vectorEffect="non-scaling-stroke"
+        className="fill-background-bright stroke-grid-bright"
+      />
+    </svg>
+  );
+}
+
 export function RunTag({
   tag,
   to,
@@ -26,8 +45,8 @@ export function RunTag({
     if (typeof tagResult === "string") {
       return (
         <>
-          <img src={tagLeftPath} alt="" className="block h-full w-2.25" />
-          <span className="flex items-center rounded-r-sm border-y border-r border-grid-bright bg-background-bright pr-1.5 text-text-dimmed group-hover:rounded-r-none group-hover:group-has-[[href]]:border-border-bright group-hover:group-has-[[href]]:text-charcoal-300">
+          <TagNotch />
+          <span className="flex items-center rounded-r-sm border-y border-r border-grid-bright bg-background-bright pr-1.5 text-text-dimmed group-hover:rounded-r-none group-hover:group-has-[[href]]:border-border-bright group-hover:group-has-[[href]]:text-text-bright">
             {tag}
           </span>
         </>
@@ -35,11 +54,11 @@ export function RunTag({
     } else {
       return (
         <>
-          <img src={tagLeftPath} alt="" className="block h-full w-2.25" />
-          <span className="flex items-center border-y border-r border-grid-bright bg-background-bright pr-1.5 text-text-dimmed group-hover:group-has-[[href]]:border-border-bright group-hover:group-has-[[href]]:text-charcoal-300">
+          <TagNotch />
+          <span className="flex items-center border-y border-r border-grid-bright bg-background-bright pr-1.5 text-text-dimmed group-hover:group-has-[[href]]:border-border-bright group-hover:group-has-[[href]]:text-text-bright">
             {tagResult.key}
           </span>
-          <span className="flex items-center whitespace-nowrap rounded-r-sm border-y border-r border-grid-bright bg-background-hover px-1.5 text-text-dimmed group-hover:rounded-r-none group-hover:group-has-[[href]]:border-border-bright group-hover:group-has-[[href]]:bg-background-raised group-hover:group-has-[[href]]:text-charcoal-300">
+          <span className="flex items-center whitespace-nowrap rounded-r-sm border-y border-r border-grid-bright bg-background-hover px-1.5 text-text-dimmed group-hover:rounded-r-none group-hover:group-has-[[href]]:border-border-bright group-hover:group-has-[[href]]:bg-background-raised group-hover:group-has-[[href]]:text-text-bright">
             {tagResult.value}
           </span>
         </>
diff --git a/apps/webapp/app/components/runs/v3/SpanEvents.tsx b/apps/webapp/app/components/runs/v3/SpanEvents.tsx
index c79a147b86f..069246c89b7 100644
--- a/apps/webapp/app/components/runs/v3/SpanEvents.tsx
+++ b/apps/webapp/app/components/runs/v3/SpanEvents.tsx
@@ -85,7 +85,7 @@ export function SpanEventError({
       />
       {enhancedException.message && (
         <Callout variant="error">
-          <pre className="text-wrap font-sans text-sm font-normal text-rose-200">
+          <pre className="text-wrap font-sans text-sm font-normal text-rose-500 dark:text-rose-200">
             {enhancedException.message}
           </pre>
         </Callout>
diff --git a/apps/webapp/app/components/runs/v3/SpanTitle.tsx b/apps/webapp/app/components/runs/v3/SpanTitle.tsx
index e01b1599cae..be363ca6ab3 100644
--- a/apps/webapp/app/components/runs/v3/SpanTitle.tsx
+++ b/apps/webapp/app/components/runs/v3/SpanTitle.tsx
@@ -231,7 +231,8 @@ export function eventBorderClassName(event: RunEvent) {
 function textClassNameForVariant(variant: TaskEventStyle["variant"]) {
   switch (variant) {
     case "primary": {
-      return "text-blue-500";
+      // System themes: monochrome span titles, icons carry the color
+      return "text-blue-500 system:text-text-bright";
     }
     default: {
       return "text-text-dimmed";
diff --git a/apps/webapp/app/components/runs/v3/TaskRunAttemptStatus.tsx b/apps/webapp/app/components/runs/v3/TaskRunAttemptStatus.tsx
index 36333f6d968..6358ccecd9a 100644
--- a/apps/webapp/app/components/runs/v3/TaskRunAttemptStatus.tsx
+++ b/apps/webapp/app/components/runs/v3/TaskRunAttemptStatus.tsx
@@ -39,7 +39,10 @@ export function TaskRunAttemptStatusLabel({
   status: ExtendedTaskAttemptStatus | null;
 }) {
   return (
-    <span className={runAttemptStatusClassNameColor(status)}>{runAttemptStatusTitle(status)}</span>
+    // system-mono-label: System themes uncolor the label (see tailwind.css)
+    <span className={cn("system-mono-label", runAttemptStatusClassNameColor(status))}>
+      {runAttemptStatusTitle(status)}
+    </span>
   );
 }
 
diff --git a/apps/webapp/app/components/runs/v3/TaskRunStatus.tsx b/apps/webapp/app/components/runs/v3/TaskRunStatus.tsx
index 9d20f5a525e..d0a4c74ffbb 100644
--- a/apps/webapp/app/components/runs/v3/TaskRunStatus.tsx
+++ b/apps/webapp/app/components/runs/v3/TaskRunStatus.tsx
@@ -149,7 +149,12 @@ export function TaskRunStatusReason({
 }
 
 export function TaskRunStatusLabel({ status }: { status: TaskRunStatus }) {
-  return <span className={runStatusClassNameColor(status)}>{runStatusTitle(status)}</span>;
+  // system-mono-label: System themes uncolor the label (see tailwind.css)
+  return (
+    <span className={cn("system-mono-label", runStatusClassNameColor(status))}>
+      {runStatusTitle(status)}
+    </span>
+  );
 }
 
 export function TaskRunStatusIcon({
diff --git a/apps/webapp/app/components/runs/v3/WaitpointStatus.tsx b/apps/webapp/app/components/runs/v3/WaitpointStatus.tsx
index 9879286e565..e5825088b3a 100644
--- a/apps/webapp/app/components/runs/v3/WaitpointStatus.tsx
+++ b/apps/webapp/app/components/runs/v3/WaitpointStatus.tsx
@@ -24,7 +24,10 @@ export function WaitpointStatusCombo({
 
 export function WaitpointStatusLabel({ status }: { status: WaitpointTokenStatus }) {
   return (
-    <span className={waitpointStatusClassNameColor(status)}>{waitpointStatusTitle(status)}</span>
+    // system-mono-label: System themes uncolor the label (see tailwind.css)
+    <span className={cn("system-mono-label", waitpointStatusClassNameColor(status))}>
+      {waitpointStatusTitle(status)}
+    </span>
   );
 }
 
diff --git a/apps/webapp/app/components/runs/v3/agent/AgentMessageView.tsx b/apps/webapp/app/components/runs/v3/agent/AgentMessageView.tsx
index a82d8b9d0c6..e696f202559 100644
--- a/apps/webapp/app/components/runs/v3/agent/AgentMessageView.tsx
+++ b/apps/webapp/app/components/runs/v3/agent/AgentMessageView.tsx
@@ -136,7 +136,9 @@ export function renderPart(part: UIMessage["parts"][number], i: number) {
     return (
       <div key={i} className="border-l-2 border-amber-500/40 pl-2">
         <ChatBubble>
-          <div className="whitespace-pre-wrap text-xs italic text-amber-200/70">{p.text ?? ""}</div>
+          <div className="whitespace-pre-wrap text-xs italic text-amber-700 dark:text-amber-200/70">
+            {p.text ?? ""}
+          </div>
         </ChatBubble>
       </div>
     );
diff --git a/apps/webapp/app/components/runs/v3/ai/AIChatMessages.tsx b/apps/webapp/app/components/runs/v3/ai/AIChatMessages.tsx
index a5115897f97..ae46cbe867c 100644
--- a/apps/webapp/app/components/runs/v3/ai/AIChatMessages.tsx
+++ b/apps/webapp/app/components/runs/v3/ai/AIChatMessages.tsx
@@ -483,7 +483,7 @@ function SubAgentContent({ parts }: { parts: any[] }) {
         if (partType === "reasoning" && part.text) {
           return (
             <div key={j} className="border-l-2 border-amber-500/40 pl-2">
-              <div className="whitespace-pre-wrap text-xs italic text-amber-200/70">
+              <div className="whitespace-pre-wrap text-xs italic text-amber-700 dark:text-amber-200/70">
                 {part.text}
               </div>
             </div>
diff --git a/apps/webapp/app/components/runs/v3/ai/AIModelSummary.tsx b/apps/webapp/app/components/runs/v3/ai/AIModelSummary.tsx
index 11ef7aa8a52..775efd7c308 100644
--- a/apps/webapp/app/components/runs/v3/ai/AIModelSummary.tsx
+++ b/apps/webapp/app/components/runs/v3/ai/AIModelSummary.tsx
@@ -128,7 +128,7 @@ function MetricRow({
   bold?: boolean;
 }) {
   return (
-    <div className="grid h-7 grid-cols-[1fr_auto] items-center gap-4 rounded-sm px-1.5 transition odd:bg-background-hover/40 @[28rem]:grid-cols-[8rem_1fr] hover:bg-white/4">
+    <div className="grid h-7 grid-cols-[1fr_auto] items-center gap-4 rounded-sm px-1.5 transition odd:bg-background-hover/40 @[28rem]:grid-cols-[8rem_1fr] hover:bg-text-bright/4">
       <span className="text-text-dimmed">{label}</span>
       <span
         className={`text-right @[28rem]:text-left ${
diff --git a/apps/webapp/app/components/runs/v3/ai/SpanMetricRow.tsx b/apps/webapp/app/components/runs/v3/ai/SpanMetricRow.tsx
index a94dd1b3727..3faa5a64491 100644
--- a/apps/webapp/app/components/runs/v3/ai/SpanMetricRow.tsx
+++ b/apps/webapp/app/components/runs/v3/ai/SpanMetricRow.tsx
@@ -2,7 +2,7 @@ import type { ReactNode } from "react";
 
 export function SpanMetricRow({ label, value }: { label: string; value: ReactNode }) {
   return (
-    <div className="grid h-7 grid-cols-[1fr_auto] items-center gap-4 rounded-sm px-1.5 transition odd:bg-background-hover/40 @[28rem]:grid-cols-[8rem_1fr] hover:bg-white/4">
+    <div className="grid h-7 grid-cols-[1fr_auto] items-center gap-4 rounded-sm px-1.5 transition odd:bg-background-hover/40 @[28rem]:grid-cols-[8rem_1fr] hover:bg-text-bright/4">
       <span className="text-text-dimmed">{label}</span>
       <span className="text-right text-text-bright @[28rem]:text-left">{value}</span>
     </div>
diff --git a/apps/webapp/app/components/sessions/v1/SessionStatus.tsx b/apps/webapp/app/components/sessions/v1/SessionStatus.tsx
index 5c917b0d30f..69dfdf5092d 100644
--- a/apps/webapp/app/components/sessions/v1/SessionStatus.tsx
+++ b/apps/webapp/app/components/sessions/v1/SessionStatus.tsx
@@ -74,7 +74,12 @@ export function SessionStatusIcon({
 }
 
 export function SessionStatusLabel({ status }: { status: SessionStatus }) {
-  return <span className={sessionStatusColor(status)}>{sessionStatusTitle(status)}</span>;
+  // system-mono-label: System themes uncolor the label (see tailwind.css)
+  return (
+    <span className={cn("system-mono-label", sessionStatusColor(status))}>
+      {sessionStatusTitle(status)}
+    </span>
+  );
 }
 
 export function SessionStatusCombo({
diff --git a/apps/webapp/app/hooks/useSystemThemeSync.ts b/apps/webapp/app/hooks/useSystemThemeSync.ts
new file mode 100644
index 00000000000..6b2a678396f
--- /dev/null
+++ b/apps/webapp/app/hooks/useSystemThemeSync.ts
@@ -0,0 +1,29 @@
+import { useEffect } from "react";
+import { type ThemePreference } from "~/utils/themePreference";
+
+/**
+ * Keeps `data-theme` on <html> in sync with the preference. For `system` it
+ * follows the OS color scheme live; for pinned themes it writes the attribute
+ * explicitly - React can skip the write when its virtual DOM already matched
+ * the SSR fallback while the inline script had changed the real attribute.
+ * The single resolution rule (dark vs light) lives here and in the blocking
+ * inline script in root.tsx; downstream consumers react to the `data-theme`
+ * mutation (see useThemeColor).
+ */
+export function useSystemThemeSync(preference: ThemePreference) {
+  useEffect(() => {
+    if (preference !== "system") {
+      document.documentElement.setAttribute("data-theme", preference);
+      return;
+    }
+
+    const media = window.matchMedia("(prefers-color-scheme: dark)");
+    const apply = () => {
+      document.documentElement.setAttribute("data-theme", media.matches ? "dark" : "light");
+    };
+
+    apply();
+    media.addEventListener("change", apply);
+    return () => media.removeEventListener("change", apply);
+  }, [preference]);
+}
diff --git a/apps/webapp/app/hooks/useThemeColor.ts b/apps/webapp/app/hooks/useThemeColor.ts
index d78fd39fa79..f088d16b525 100644
--- a/apps/webapp/app/hooks/useThemeColor.ts
+++ b/apps/webapp/app/hooks/useThemeColor.ts
@@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useEffect, useState } from "react";
 
 /**
  * Normalize any CSS color (hex, oklch, hsl, ...) to rgb()/rgba() by rendering
@@ -17,16 +17,28 @@ function toRgb(color: string): string {
 }
 
 /**
- * Resolve a theme CSS variable to a concrete, animatable color once on mount.
+ * Resolve a theme CSS variable to a concrete, animatable color.
  * framer-motion can't interpolate `var()` strings or oklch values, so animated
- * colors must be resolved and normalized first. The fallback is used during
- * SSR and should match the default dark theme (see tailwind.css).
+ * colors must be resolved and normalized first. Resolution happens in an
+ * effect so server and hydration renders both use the fallback — resolving
+ * during render caused hydration style mismatches. Long-lived components
+ * (e.g. the side menu) outlive theme switches, so re-resolve whenever
+ * `data-theme` flips on <html>.
  */
 export function useThemeColor(variable: `--${string}`, fallback: string): string {
-  const [color] = useState(() => {
-    if (typeof document === "undefined") return fallback;
-    const value = getComputedStyle(document.documentElement).getPropertyValue(variable).trim();
-    return value ? toRgb(value) : fallback;
-  });
+  const [color, setColor] = useState(fallback);
+  useEffect(() => {
+    const resolve = () => {
+      const value = getComputedStyle(document.documentElement).getPropertyValue(variable).trim();
+      if (value) setColor(toRgb(value));
+    };
+    resolve();
+    const observer = new MutationObserver(resolve);
+    observer.observe(document.documentElement, {
+      attributes: true,
+      attributeFilter: ["data-theme"],
+    });
+    return () => observer.disconnect();
+  }, [variable]);
   return color;
 }
diff --git a/apps/webapp/app/models/organization.server.ts b/apps/webapp/app/models/organization.server.ts
index a4b8a8ab5f5..9f7fb382315 100644
--- a/apps/webapp/app/models/organization.server.ts
+++ b/apps/webapp/app/models/organization.server.ts
@@ -6,6 +6,7 @@ import type {
   RuntimeEnvironment,
   User,
 } from "@trigger.dev/database";
+import { tryCatch } from "@trigger.dev/core/utils";
 import { customAlphabet } from "nanoid";
 import { generate } from "random-words";
 import slug from "slug";
@@ -13,8 +14,14 @@ import { $replica, prisma, type PrismaClientOrTransaction } from "~/db.server";
 import { env } from "~/env.server";
 import { featuresForUrl } from "~/features.server";
 import { createApiKeyForEnv, createPkApiKeyForEnv, envSlug } from "./api-key.server";
-import { getDefaultEnvironmentConcurrencyLimit } from "~/services/platform.v3.server";
+import {
+  getDefaultEnvironmentConcurrencyLimit,
+  isBillingConfigured,
+  setBillingAlert,
+} from "~/services/platform.v3.server";
+import { buildDefaultBillingAlerts } from "~/services/billingAlertsDefaults.server";
 import { enqueueAttioWorkspaceSync } from "~/services/attio.server";
+import { logger } from "~/services/logger.server";
 import {
   applyBillingLimitPauseAfterEnvCreate,
   getInitialEnvPauseStateForBillingLimit,
@@ -122,9 +129,39 @@ export async function createOrganization(
     adminUserId: userId,
   });
 
+  // Awaited so the seed can't land after the user's first alert edit.
+  await seedDefaultBillingAlerts(organization.id);
+
   return { ...organization };
 }
 
+// The platform client has no request timeout; don't let a slow billing backend stall org creation.
+const SEED_ALERTS_TIMEOUT_MS = 5_000;
+
+/** Seed default billing alerts for a new org. Never fails org creation. */
+async function seedDefaultBillingAlerts(organizationId: string): Promise<void> {
+  if (!isBillingConfigured()) {
+    return;
+  }
+
+  let timer: NodeJS.Timeout | undefined;
+  const timeout = new Promise<never>((_, reject) => {
+    timer = setTimeout(() => reject(new Error("Timed out")), SEED_ALERTS_TIMEOUT_MS);
+  });
+
+  const [error] = await tryCatch(
+    Promise.race([setBillingAlert(organizationId, buildDefaultBillingAlerts()), timeout]).finally(
+      () => clearTimeout(timer)
+    )
+  );
+  if (error) {
+    logger.warn("Failed to seed default billing alerts for new org", {
+      organizationId,
+      error: error instanceof Error ? error.message : error,
+    });
+  }
+}
+
 export async function createEnvironment({
   organization,
   project,
diff --git a/apps/webapp/app/root.tsx b/apps/webapp/app/root.tsx
index 839f44b4bbc..219afc83541 100644
--- a/apps/webapp/app/root.tsx
+++ b/apps/webapp/app/root.tsx
@@ -1,4 +1,5 @@
 import type { LinksFunction, LoaderFunctionArgs, MetaFunction } from "@remix-run/node";
+import type { CSSProperties } from "react";
 import type { ShouldRevalidateFunction } from "@remix-run/react";
 import { Links, Meta, Outlet, Scripts, ScrollRestoration } from "@remix-run/react";
 import { type UseDataFunctionReturn, typedjson, useTypedLoaderData } from "remix-typedjson";
@@ -19,7 +20,14 @@ import { TimezoneSetter } from "./components/TimezoneSetter";
 import { env } from "./env.server";
 import { featuresForRequest } from "./features.server";
 import { usePostHog } from "./hooks/usePostHog";
+import { useSystemThemeSync } from "./hooks/useSystemThemeSync";
 import { getUser } from "./services/session.server";
+import {
+  normalizeThemeContrast,
+  normalizeThemePreference,
+  type ThemePreference,
+} from "~/utils/themePreference";
+import { flag } from "~/v3/featureFlags.server";
 import { getTimezonePreference } from "./services/preferences/uiPreferences.server";
 import { appEnvTitleTag } from "./utils";
 
@@ -70,6 +78,18 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
   };
 
   const user = await getUser(request);
+  // Theme switching is feature-flagged; while off, everyone stays on the
+  // classic theme even if a preference was saved earlier.
+  const showThemeSwitcher = user
+    ? await flag({ key: "hasThemeSwitcher", defaultValue: true })
+    : false;
+  // Logged-out pages (login, invites) always render the branded Classic look.
+  const themePreference: ThemePreference = showThemeSwitcher
+    ? normalizeThemePreference(user?.dashboardPreferences.theme)
+    : "classic";
+  const themeContrast = showThemeSwitcher
+    ? normalizeThemeContrast(user?.dashboardPreferences.contrast)
+    : 0;
 
   const headers = new Headers();
   headers.append("Set-Cookie", await commitSession(session));
@@ -87,6 +107,12 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
       triggerCliTag: env.TRIGGER_CLI_TAG,
       kapa,
       timezone,
+      showThemeSwitcher,
+      themePreference,
+      themeContrast,
+      // Consumed by ResizablePanel: the browser check must match between SSR
+      // and hydration, so it is derived from the request user-agent.
+      isFirefox: /firefox/i.test(request.headers.get("user-agent") ?? ""),
     },
     { headers }
   );
@@ -105,7 +131,7 @@ export const shouldRevalidate: ShouldRevalidateFunction = (options) => {
 export function ErrorBoundary() {
   return (
     <>
-      <html lang="en" className="h-full" data-theme="dark">
+      <html lang="en" className="h-full" data-theme="classic">
         <head>
           <meta charSet="utf-8" />
 
@@ -129,13 +155,35 @@ export function ErrorBoundary() {
 }
 
 export default function App() {
-  const { posthogProjectKey, posthogUiHost, kapa: _kapa } = useTypedLoaderData<typeof loader>();
+  const {
+    posthogProjectKey,
+    posthogUiHost,
+    kapa: _kapa,
+    themePreference,
+    themeContrast,
+  } = useTypedLoaderData<typeof loader>();
   usePostHog(posthogProjectKey, posthogUiHost);
+  useSystemThemeSync(themePreference);
+  // SSR falls back to dark for `system`; the inline script below corrects it
+  // before paint, and useSystemThemeSync keeps it live afterwards.
+  const resolvedTheme = themePreference === "system" ? "dark" : themePreference;
 
   return (
     <>
-      <html lang="en" className="h-full" data-theme="dark">
+      <html
+        lang="en"
+        className="h-full"
+        data-theme={resolvedTheme}
+        data-theme-preference={themePreference}
+        // Contrast overlay input for the System themes; Classic never reads it
+        style={{ "--theme-contrast": themeContrast / 100 } as CSSProperties}
+      >
         <head>
+          <script
+            dangerouslySetInnerHTML={{
+              __html: `try{if(document.documentElement.getAttribute("data-theme-preference")==="system"){document.documentElement.setAttribute("data-theme",matchMedia("(prefers-color-scheme: dark)").matches?"dark":"light")}}catch(e){}`,
+            }}
+          />
           <StaleAssetRecovery isProduction={isProduction} />
           <Meta />
           <Links />
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx
index bdbea4b25c6..5a30d931c52 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam._index/route.tsx
@@ -16,6 +16,7 @@ import { PlusIcon } from "~/assets/icons/PlusIcon";
 import { QuestionMarkIcon } from "~/assets/icons/QuestionMarkIcon";
 import { RunsIcon } from "~/assets/icons/RunsIcon";
 import { TaskIcon } from "~/assets/icons/TaskIcon";
+import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
 import { CodeBlock } from "~/components/code/CodeBlock";
 import { InlineCode } from "~/components/code/InlineCode";
 import { HasNoTasksDeployed, HasNoTasksDev } from "~/components/BlankStatePanels";
@@ -267,6 +268,7 @@ export default function Page() {
       <NavBar>
         <PageTitle title="Tasks" accessory={<TasksHelpTooltip />} />
         <PageAccessories>
+          <AdminDebugTooltip />
           <LinkButton
             variant={"docs/small"}
             LeadingIcon={BookOpenIcon}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
index 563155468f4..f121900e901 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts.new/route.tsx
@@ -471,7 +471,7 @@ export default function Page() {
               cancelButton={
                 <LinkButton
                   to={v3ProjectAlertsPath(organization, project, environment)}
-                  variant="tertiary/medium"
+                  variant="secondary/medium"
                 >
                   Cancel
                 </LinkButton>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
index 9bf64da1603..62ecec6890f 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.alerts/route.tsx
@@ -1,11 +1,11 @@
 import { getFormProps, useForm } from "@conform-to/react";
+import { GlobeLinesIcon } from "~/assets/icons/GlobeLinesIcon";
 import { parseWithZod } from "@conform-to/zod";
 import {
   BellAlertIcon,
   BellSlashIcon,
   BookOpenIcon,
   EnvelopeIcon,
-  GlobeAltIcon,
   LockClosedIcon,
   PlusIcon,
   TrashIcon,
@@ -599,7 +599,7 @@ export function AlertChannelTypeIcon({
     case "SLACK":
       return <SlackIcon className={className} />;
     case "WEBHOOK":
-      return <GlobeAltIcon className={className} />;
+      return <GlobeLinesIcon className={className} />;
     default: {
       assertNever(channelType);
     }
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.apikeys/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.apikeys/route.tsx
index 839b66f70b3..cb6df265573 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.apikeys/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.apikeys/route.tsx
@@ -2,6 +2,7 @@ import { BookOpenIcon } from "@heroicons/react/20/solid";
 import { type MetaFunction } from "@remix-run/react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
+import { CopyableText } from "~/components/primitives/CopyableText";
 import { CodeBlock } from "~/components/code/CodeBlock";
 import { InlineCode } from "~/components/code/InlineCode";
 import {
@@ -113,7 +114,9 @@ export default function Page() {
             <Property.Table>
               <Property.Item key={environment.id}>
                 <Property.Label>{environment.slug}</Property.Label>
-                <Property.Value>{environment.id}</Property.Value>
+                <Property.Value>
+                  <CopyableText value={environment.id} asChild hideTooltip />
+                </Property.Value>
               </Property.Item>
             </Property.Table>
           </AdminDebugTooltip>
@@ -190,7 +193,7 @@ export default function Page() {
               )}
 
               <Accordion type="single" collapsible>
-                <AccordionItem value="item-1">
+                <AccordionItem value="item-1" className="bg-white dark:bg-transparent">
                   <AccordionTrigger>How to set these environment variables</AccordionTrigger>
                   <AccordionContent>
                     <div className="flex flex-col gap-2">
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
index 8c1de33c6f6..909a8bb6381 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.branches/route.tsx
@@ -242,7 +242,9 @@ export default function Page() {
               {branches.map((branch) => (
                 <Property.Item key={branch.id}>
                   <Property.Label>{branch.branchName}</Property.Label>
-                  <Property.Value>{branch.id}</Property.Value>
+                  <Property.Value>
+                    <CopyableText value={branch.id} asChild hideTooltip />
+                  </Property.Value>
                 </Property.Item>
               ))}
             </Property.Table>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
index 1bc359af598..e9542b5c8f5 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.concurrency/route.tsx
@@ -21,6 +21,7 @@ import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import simplur from "simplur";
 import { z } from "zod";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
+import { CopyableText } from "~/components/primitives/CopyableText";
 import { EnvironmentCombo } from "~/components/environments/EnvironmentLabel";
 import { Feedback } from "~/components/Feedback";
 import {
@@ -270,7 +271,9 @@ export default function Page() {
                     {environment.type}{" "}
                     {environment.branchName ? ` (${environment.branchName})` : ""}
                   </Property.Label>
-                  <Property.Value>{environment.id}</Property.Value>
+                  <Property.Value>
+                    <CopyableText value={environment.id} asChild hideTooltip />
+                  </Property.Value>
                 </Property.Item>
               ))}
             </Property.Table>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx
index 20dd91d34b4..c4950277288 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.deployments.$deploymentParam/route.tsx
@@ -18,6 +18,7 @@ import { GitMetadata } from "~/components/GitMetadata";
 import { VercelLink } from "~/components/integrations/VercelLink";
 import { RuntimeIcon } from "~/components/RuntimeIcon";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
+import { CopyableText } from "~/components/primitives/CopyableText";
 import { EnvironmentCombo } from "~/components/environments/EnvironmentLabel";
 import { Badge } from "~/components/primitives/Badge";
 import { LinkButton } from "~/components/primitives/Buttons";
@@ -283,20 +284,28 @@ export default function Page() {
           <Property.Table>
             <Property.Item>
               <Property.Label>ID</Property.Label>
-              <Property.Value>{deployment.id}</Property.Value>
+              <Property.Value>
+                <CopyableText value={deployment.id} asChild hideTooltip />
+              </Property.Value>
             </Property.Item>
             <Property.Item>
               <Property.Label>Project ID</Property.Label>
-              <Property.Value>{deployment.projectId}</Property.Value>
+              <Property.Value>
+                <CopyableText value={deployment.projectId} asChild hideTooltip />
+              </Property.Value>
             </Property.Item>
             <Property.Item>
               <Property.Label>Org ID</Property.Label>
-              <Property.Value>{deployment.organizationId}</Property.Value>
+              <Property.Value>
+                <CopyableText value={deployment.organizationId} asChild hideTooltip />
+              </Property.Value>
             </Property.Item>
             {deployment.imageReference && (
               <Property.Item>
                 <Property.Label>Image</Property.Label>
-                <Property.Value>{deployment.imageReference}</Property.Value>
+                <Property.Value>
+                  <CopyableText value={deployment.imageReference} asChild hideTooltip />
+                </Property.Value>
               </Property.Item>
             )}
             <Property.Item>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dev-branches/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dev-branches/route.tsx
index 9f704a54f9b..dd2679085e4 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dev-branches/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.dev-branches/route.tsx
@@ -95,7 +95,9 @@ export default function Page() {
               {branches.map((branch) => (
                 <Property.Item key={branch.id}>
                   <Property.Label>{branch.branchName}</Property.Label>
-                  <Property.Value>{branch.id}</Property.Value>
+                  <Property.Value>
+                    <CopyableText value={branch.id} asChild hideTooltip />
+                  </Property.Value>
                 </Property.Item>
               ))}
             </Property.Table>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
index cdbe364d88e..bd152e58033 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.environment-variables/route.tsx
@@ -913,7 +913,7 @@ function DeleteEnvironmentVariableButton({
         fullWidth
         textAlignLeft
         LeadingIcon={TrashIcon}
-        leadingIconClassName="text-rose-500 group-hover/button:text-text-bright transition-colors"
+        leadingIconClassName="text-rose-500 group-hover/button:text-white dark:group-hover/button:text-text-bright transition-colors"
         className="ml-0.5 transition-colors group-hover/button:bg-error"
       >
         {isLoading ? "Deleting" : ""}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
index ea6b33eedae..6ec1aa7fce1 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.errors.$fingerprint/route.tsx
@@ -589,7 +589,11 @@ function ErrorDetailSidebar({
               <Property.Label>Error status</Property.Label>
               <Property.Value>
                 <div className="flex items-center justify-between">
-                  <ErrorStatusBadge status={errorGroup.state.status} className="w-fit" />
+                  <ErrorStatusBadge
+                    status={errorGroup.state.status}
+                    prominence="bright"
+                    className="w-fit"
+                  />
                   <ErrorStatusDropdown
                     state={errorGroup.state}
                     taskIdentifier={errorGroup.taskIdentifier}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.limits/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.limits/route.tsx
index e27b11b7545..40eb8356f73 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.limits/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.limits/route.tsx
@@ -7,11 +7,11 @@ import { Gauge } from "lucide-react";
 import { typedjson, useTypedLoaderData } from "remix-typedjson";
 import { ConcurrencyIcon } from "~/assets/icons/ConcurrencyIcon";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
+import { CopyableText } from "~/components/primitives/CopyableText";
 import { Feedback } from "~/components/Feedback";
 import { PageBody, PageContainer } from "~/components/layout/AppLayout";
 import { EnvironmentSelector } from "~/components/navigation/EnvironmentSelector";
 import { AnimatedNumber } from "~/components/primitives/AnimatedNumber";
-import { Badge } from "~/components/primitives/Badge";
 import { Button, LinkButton } from "~/components/primitives/Buttons";
 import { Header2 } from "~/components/primitives/Headers";
 import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
@@ -125,7 +125,9 @@ export default function Page() {
               </Property.Item>
               <Property.Item>
                 <Property.Label>Organization ID</Property.Label>
-                <Property.Value>{data.organizationId}</Property.Value>
+                <Property.Value>
+                  <CopyableText value={data.organizationId} asChild hideTooltip />
+                </Property.Value>
               </Property.Item>
             </Property.Table>
           </AdminDebugTooltip>
@@ -195,7 +197,7 @@ function CurrentPlanSection({
   return (
     <div className="flex flex-col gap-3">
       <Header2 className="flex items-center gap-1">
-        <IconCardsFilled className="size-5 text-amber-400" />
+        <IconCardsFilled className="size-5 text-amber-400 system-mono-icon" />
         Current plan
       </Header2>
       <Table variant="bright/no-hover">
@@ -230,7 +232,7 @@ function ConcurrencySection({ concurrencyPath }: { concurrencyPath: string }) {
   return (
     <div className="flex flex-col gap-3">
       <Header2 className="flex items-center gap-1.5">
-        <ConcurrencyIcon className="size-5 text-orange-500" />
+        <ConcurrencyIcon className="size-5 text-orange-500 system-mono-icon" />
         Concurrency limits
         <InfoIconTooltip
           content="Concurrency limits control how many runs execute at the same time."
@@ -274,7 +276,7 @@ function RateLimitsSection({
     <div className="flex flex-col gap-3">
       <div className="flex items-center justify-between">
         <Header2 className="flex items-center gap-1.5">
-          <Gauge className="size-5 text-indigo-500" />
+          <Gauge className="size-5 text-indigo-500 system-mono-icon" />
           Rate limits
           <InfoIconTooltip
             content="Rate limits control how many API requests can be made within a time window. They are tracked per API key."
@@ -445,21 +447,24 @@ function RateLimitTypeBadge({
   switch (rateLimitType) {
     case "tokenBucket":
       return (
-        <Badge variant="small" className="w-fit bg-blue-500/20 text-blue-400">
-          Token bucket
-        </Badge>
+        <RateLimitTypePill
+          className="bg-blue-500/10 text-blue-600 dark:text-blue-400 system:text-blue-500"
+          label="Token bucket"
+        />
       );
     case "fixedWindow":
       return (
-        <Badge variant="small" className="w-fit bg-purple-500/20 text-purple-400">
-          Fixed window
-        </Badge>
+        <RateLimitTypePill
+          className="bg-purple-500/10 text-purple-600 dark:text-purple-400 system:text-purple-500"
+          label="Fixed window"
+        />
       );
     case "slidingWindow":
       return (
-        <Badge variant="small" className="w-fit bg-green-500/20 text-green-400">
-          Sliding window
-        </Badge>
+        <RateLimitTypePill
+          className="bg-green-500/10 text-green-700 dark:text-green-400 system:text-green-600"
+          label="Sliding window"
+        />
       );
     default:
       return null;
@@ -541,7 +546,7 @@ function QuotasSection({
   return (
     <div className="flex flex-col gap-3">
       <Header2 className="flex items-center gap-1">
-        <IconTallymark4 className="size-6 text-blue-500" />
+        <IconTallymark4 className="size-6 text-blue-500 system-mono-icon" />
         Quotas
         <InfoIconTooltip
           content="Quotas define the maximum resources available to your organization."
@@ -726,7 +731,7 @@ function FeaturesSection({
   return (
     <div className="flex flex-col gap-3">
       <Header2 className="flex items-center gap-1.5">
-        <IconDiamondFilled className="size-5 text-green-600" />
+        <IconDiamondFilled className="size-5 text-green-600 system-mono-icon" />
         Plan features
       </Header2>
       <Table variant="bright/no-hover">
@@ -858,19 +863,32 @@ function getUsageColorClass(
   }
 }
 
+function RateLimitTypePill({ className, label }: { className: string; label: string }) {
+  return (
+    <span
+      className={cn(
+        "contrast-chip inline-flex w-fit items-center rounded px-2 py-0.5 text-xs font-medium",
+        className
+      )}
+    >
+      {label}
+    </span>
+  );
+}
+
 function SourceBadge({ source }: { source: "default" | "plan" | "override" }) {
   const variants: Record<typeof source, { label: string; className: string }> = {
     default: {
       label: "Default",
-      className: "bg-indigo-500/20 text-indigo-400",
+      className: "bg-indigo-500/10 text-indigo-600 dark:text-indigo-400 system:text-indigo-500",
     },
     plan: {
       label: "Plan",
-      className: "bg-purple-500/20 text-purple-400",
+      className: "bg-purple-500/10 text-purple-600 dark:text-purple-400 system:text-purple-500",
     },
     override: {
       label: "Override",
-      className: "bg-amber-500/20 text-amber-400",
+      className: "bg-amber-500/10 text-amber-700 dark:text-amber-400 system:text-warning",
     },
   };
 
@@ -879,7 +897,7 @@ function SourceBadge({ source }: { source: "default" | "plan" | "override" }) {
   return (
     <span
       className={cn(
-        "inline-flex items-center rounded px-1.5 py-0.5 text-xs font-medium",
+        "contrast-chip inline-flex items-center rounded px-2 py-0.5 text-xs font-medium",
         variant.className
       )}
     >
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.models._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.models._index/route.tsx
index 9a3a0d0500c..744c29235aa 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.models._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.models._index/route.tsx
@@ -67,6 +67,7 @@ import {
   TableRow,
 } from "~/components/primitives/Table";
 import { TabButton, TabContainer } from "~/components/primitives/Tabs";
+import { SimpleTooltip } from "~/components/primitives/Tooltip";
 import { UsageSparkline } from "~/components/primitives/UsageSparkline";
 import {
   appliedSummary,
@@ -1311,21 +1312,21 @@ function YourModelsTab({
           <Table className="table-fixed">
             <TableHeader>
               <TableRow>
-                <TableHeaderCell className="w-[18%]">Model</TableHeaderCell>
-                <TableHeaderCell className="w-[12%]">Provider</TableHeaderCell>
+                <TableHeaderCell className="w-[24%]">Model</TableHeaderCell>
+                <TableHeaderCell className="w-[10%]">Provider</TableHeaderCell>
                 <TableHeaderCell className="w-[8%]" alignment="right">
                   Calls
                 </TableHeaderCell>
                 <TableHeaderCell className="w-[8%]" alignment="right">
                   Cost
                 </TableHeaderCell>
-                <TableHeaderCell className="w-[10%]" alignment="right">
+                <TableHeaderCell className="w-[9%]" alignment="right">
                   Cache savings
                 </TableHeaderCell>
-                <TableHeaderCell className="w-[9%]" alignment="right">
+                <TableHeaderCell className="w-[8%]" alignment="right">
                   Avg TTFC
                 </TableHeaderCell>
-                <TableHeaderCell className="w-[11%]" alignment="right">
+                <TableHeaderCell className="w-[9%]" alignment="right">
                   Avg tokens/sec
                 </TableHeaderCell>
                 <TableHeaderCell className="w-[12%]">Calls trend</TableHeaderCell>
@@ -1351,7 +1352,13 @@ function YourModelsTab({
                     isSelected={!!catalogItem && selectedModelId === catalogItem.friendlyId}
                   >
                     <TableCell onClick={select} isTabbableCell={!!select}>
-                      {displayId}
+                      <SimpleTooltip
+                        asChild
+                        button={<span className="block truncate">{displayId}</span>}
+                        content={displayId}
+                        side="top"
+                        disableHoverableContent
+                      />
                     </TableCell>
                     <TableCell onClick={select}>
                       <span className="flex items-center gap-1.5">
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.prompts.$promptSlug/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.prompts.$promptSlug/route.tsx
index a10461bdf56..cfdfb44fec7 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.prompts.$promptSlug/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.prompts.$promptSlug/route.tsx
@@ -555,7 +555,10 @@ export default function PromptDetailPage() {
                 <span className="text-xs text-text-dimmed">v{selectedVersion.version}</span>
                 {isCurrent && <Badge variant="extra-small">current</Badge>}
                 {selectedVersion.labels.includes("override") && (
-                  <Badge variant="extra-small" className="border-amber-500/30 text-amber-400">
+                  <Badge
+                    variant="extra-small"
+                    className="border-amber-500/30 text-amber-400 system:border-transparent system:bg-warning system:text-white"
+                  >
                     override
                   </Badge>
                 )}
@@ -613,7 +616,7 @@ export default function PromptDetailPage() {
               exit={{ opacity: 0, height: 0 }}
               transition={{ duration: 0.2, ease: "easeInOut" }}
             >
-              <span className="py-1.5 text-xs text-amber-300">
+              <span className="py-1.5 text-xs text-amber-300 light:text-amber-800">
                 Override v{overrideVersion.version} is active. API calls resolve to this version
                 instead of the deployed prompt.
               </span>
@@ -622,20 +625,22 @@ export default function PromptDetailPage() {
                   hasPermission={canWritePrompts}
                   noPermissionTooltip="You don't have permission to edit prompt overrides"
                   variant="tertiary/small"
-                  className="border-amber-300/50 bg-amber-400/10 text-amber-300 group-hover/button:border-amber-400/60 group-hover/button:bg-amber-500/25 group-hover/button:text-amber-200"
+                  className="border-amber-300/50 bg-amber-400/10 text-amber-300 group-hover/button:border-amber-400/60 group-hover/button:bg-amber-500/25 group-hover/button:text-amber-200 system:border-transparent system:bg-warning system:text-white system:transition system:group-hover/button:bg-warning system:group-hover/button:brightness-90 system:group-hover/button:text-white"
                   onClick={() => setOverrideDialogOpen(true)}
                 >
-                  Edit
+                  <span className="mx-auto grow self-center truncate text-text-bright system:text-white">
+                    Edit
+                  </span>
                 </PermissionButton>
                 <PermissionButton
                   hasPermission={canWritePrompts}
                   noPermissionTooltip="You don't have permission to edit prompt overrides"
                   variant="tertiary/small"
-                  className="border-amber-300/50 bg-amber-400/10 text-amber-300 group-hover/button:border-amber-400/60 group-hover/button:bg-amber-500/25 group-hover/button:text-amber-200"
+                  className="border-amber-300/50 bg-amber-400/10 text-amber-300 group-hover/button:border-amber-400/60 group-hover/button:bg-amber-500/25 group-hover/button:text-amber-200 system:border-warning/60 system:bg-transparent system:transition system:group-hover/button:bg-warning/10"
                   onClick={() => fetcher.submit({ intent: "removeOverride" }, { method: "POST" })}
                   disabled={fetcher.state !== "idle"}
                 >
-                  Remove
+                  <span className="mx-auto grow self-center truncate text-text-bright">Remove</span>
                 </PermissionButton>
               </div>
             </motion.div>
@@ -934,7 +939,11 @@ function OverrideDialog({
           className="-mx-3 w-auto flex-1 border-b border-t border-grid-dimmed"
         >
           {/* Editor */}
-          <ResizablePanel id="override-editor" min="300px" className="bg-[#121317]">
+          <ResizablePanel
+            id="override-editor"
+            min="300px"
+            className="bg-[#121317] light:bg-editor-background"
+          >
             <TextEditor
               className="h-full"
               autoFocus
@@ -2097,7 +2106,10 @@ function VersionsTab({
                 />
                 <span className="font-medium text-text-bright">v{v.version}</span>
                 {isOverride && (
-                  <Badge variant="extra-small" className="border-amber-500/30 text-amber-400">
+                  <Badge
+                    variant="extra-small"
+                    className="border-amber-500/30 text-amber-400 system:border-transparent system:bg-warning system:text-white"
+                  >
                     override
                   </Badge>
                 )}
@@ -2115,7 +2127,7 @@ function VersionsTab({
               {(v.model || v.commitMessage) && (
                 <div className="flex items-center gap-1.5 truncate text-xs text-text-dimmed">
                   {v.model && <span>{v.model}</span>}
-                  {v.model && v.commitMessage && <span className="text-charcoal-600">/</span>}
+                  {v.model && v.commitMessage && <span className="text-text-dimmed/50">/</span>}
                   {v.commitMessage && <span className="truncate">{v.commitMessage}</span>}
                 </div>
               )}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/TableSchemaContent.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/TableSchemaContent.tsx
index 346a993cc48..3cc52c03d49 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/TableSchemaContent.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.query/TableSchemaContent.tsx
@@ -10,7 +10,7 @@ function ColumnHelpItem({ col }: { col: ColumnSchema }) {
   return (
     <div className="pt-1">
       <div className="flex items-center gap-2">
-        <CopyableText value={col.name} className="text-sm text-indigo-400" />
+        <CopyableText value={col.name} className="text-sm text-indigo-400 light:text-indigo-600" />
         <Badge className="font-mono text-xxs">{col.type}</Badge>
       </div>
       {col.description && (
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
index 1a9ef75c272..48e44d06baa 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues/route.tsx
@@ -531,8 +531,9 @@ function QueuesWithMetricsView() {
                   ) : null}
                   <LinkButton
                     variant="secondary/small-icon"
+                    className="system:border-transparent system:bg-runs system:transition system:group-hover/button:bg-runs system:group-hover/button:brightness-90"
                     LeadingIcon={RunsIcon}
-                    leadingIconClassName="text-runs"
+                    leadingIconClassName="text-runs system:text-white"
                     to={v3RunsPath(organization, project, env, {
                       statuses: ["PENDING"],
                       period: "30d",
@@ -552,7 +553,12 @@ function QueuesWithMetricsView() {
               valueClassName={cn(limitClassName, "tabular-nums")}
               suffix={
                 limitStatus === "burst" ? (
-                  <span className={cn(limitClassName, "flex items-center gap-1")}>
+                  <span
+                    className={cn(
+                      limitClassName,
+                      "system:text-text-dimmed flex items-center gap-1"
+                    )}
+                  >
                     Including {envRunningLive - environment.concurrencyLimit} burst runs{" "}
                     <BurstFactorTooltip environment={environment} />
                   </span>
@@ -563,8 +569,9 @@ function QueuesWithMetricsView() {
               accessory={
                 <LinkButton
                   variant="secondary/small-icon"
+                  className="system:border-transparent system:bg-runs system:transition system:group-hover/button:bg-runs system:group-hover/button:brightness-90"
                   LeadingIcon={RunsIcon}
-                  leadingIconClassName="text-runs"
+                  leadingIconClassName="text-runs system:text-white"
                   to={v3RunsPath(organization, project, env, {
                     statuses: ["DEQUEUED", "EXECUTING"],
                     period: "30d",
@@ -604,16 +611,18 @@ function QueuesWithMetricsView() {
                     <LinkButton
                       to={concurrencyPath(organization, project, env)}
                       variant="secondary/small-icon"
+                      className="system:border-transparent system:bg-concurrency system:transition system:group-hover/button:bg-concurrency system:group-hover/button:brightness-90"
                       LeadingIcon={ConcurrencyIcon}
-                      leadingIconClassName="text-amber-500"
+                      leadingIconClassName="text-amber-500 system:text-white"
                       tooltip="Increase limit"
                     />
                   ) : (
                     <LinkButton
                       to={v3BillingPath(organization, "Upgrade your plan for more concurrency")}
                       variant="secondary/small-icon"
+                      className="system:border-transparent system:bg-runs system:transition system:group-hover/button:bg-runs system:group-hover/button:brightness-90"
                       LeadingIcon={ArrowUpCircleIcon}
-                      leadingIconClassName="text-indigo-500"
+                      leadingIconClassName="text-indigo-500 system:text-white"
                       tooltip="Increase limit"
                     />
                   )
@@ -925,7 +934,7 @@ function QueuesWithMetricsView() {
                             bucketStartMs={metrics?.bucketStartMs}
                             bucketIntervalMs={metrics?.bucketIntervalMs}
                             width={134}
-                            color="var(--color-queues)"
+                            color="var(--color-queues-chart)"
                             unitLabel={{ singular: "queued", plural: "queued" }}
                             showPeak={false}
                             formatPeak={(v) => v.toLocaleString()}
@@ -1063,8 +1072,17 @@ function EnvironmentPauseResumeButton({
                   <Button
                     type="button"
                     variant="secondary/small-icon"
+                    className={
+                      env.paused
+                        ? "system:border-transparent system:bg-success system:transition system:group-hover/button:bg-success system:group-hover/button:brightness-90"
+                        : "system:border-transparent system:bg-warning system:transition system:group-hover/button:bg-warning system:group-hover/button:brightness-90"
+                    }
                     LeadingIcon={env.paused ? PlayIcon : PauseIcon}
-                    leadingIconClassName={env.paused ? "text-success" : "text-warning"}
+                    leadingIconClassName={
+                      env.paused
+                        ? "text-success system:text-white"
+                        : "text-warning system:text-white"
+                    }
                     aria-label={
                       env.paused
                         ? `Resume processing runs in ${environmentFullTitle(env)}`
@@ -1246,7 +1264,7 @@ const QUEUE_HEADER_TILES: QueueHeaderTile[] = [
     id: "saturation",
     label: "Env saturation",
     description: "Running as a share of the environment limit. Yellow over 100% (burst headroom).",
-    color: "var(--color-queues)",
+    color: "var(--color-queues-chart)",
     // Numerator: running summed across the visible set. Denominator: the env-wide limit (same for
     // every queue in a bucket), so the line reads as the set's share of the environment capacity.
     query: `SELECT timeBucket() AS t,\n  queue,\n  max(max_running) AS running,\n  max(max_env_limit) AS env_limit\nFROM queue_metrics\nGROUP BY t, queue\nORDER BY t`,
@@ -1267,7 +1285,7 @@ const QUEUE_HEADER_TILES: QueueHeaderTile[] = [
     id: "backlog",
     label: "Backlog",
     description: "Runs waiting across these queues over time.",
-    color: "var(--color-queues)",
+    color: "var(--color-queues-chart)",
     query: `SELECT timeBucket() AS t,\n  queue,\n  max(max_queued) AS queued\nFROM queue_metrics\nGROUP BY t, queue\nORDER BY t`,
     derive: (rows) => {
       const points = sumByBucket(rows, (r) => tileNumber(r.queued)).map(({ bucket, sum }) => ({
@@ -1283,7 +1301,7 @@ const QUEUE_HEADER_TILES: QueueHeaderTile[] = [
     label: "Scheduling delay p95",
     description: "p95 wait from eligible to dequeued. Yellow over 1 min.",
     totalTooltip: "The worst p95 in the selected window.",
-    color: "var(--color-queues)",
+    color: "var(--color-queues-chart)",
     // quantilesMerge over the set's rows in a bucket is the true p95 across the union of samples
     // (merging quantile states is valid; averaging per-queue percentiles would not be).
     query: `SELECT timeBucket() AS t,\n  round(quantilesMerge(0.5, 0.9, 0.95, 0.99)(wait_quantiles)[3]) AS p95\nFROM queue_metrics\nGROUP BY t\nORDER BY t`,
@@ -1296,7 +1314,7 @@ const QUEUE_HEADER_TILES: QueueHeaderTile[] = [
         points,
         total: worst,
         formatTotal: (v) => (v > 0 ? formatWaitMs(v) : "–"),
-        totalClassName: worst >= 60_000 ? "text-warning" : undefined,
+        totalClassName: worst >= 60_000 ? "system-mono-label text-warning" : undefined,
       };
     },
   },
@@ -1305,7 +1323,7 @@ const QUEUE_HEADER_TILES: QueueHeaderTile[] = [
     label: "Throttled",
     description: "Times dequeuing was blocked by a limit.",
     totalTooltip: "The share of the selected window with at least one blocked dequeue.",
-    color: "var(--color-queues)",
+    color: "var(--color-queues-chart)",
     query: `SELECT timeBucket() AS t,\n  sum(throttled_count) AS throttled\nFROM queue_metrics\nGROUP BY t\nORDER BY t`,
     derive: (rows) => {
       const points = rows.map((r) => ({
@@ -1322,7 +1340,7 @@ const QUEUE_HEADER_TILES: QueueHeaderTile[] = [
         points,
         total: pct,
         formatTotal: (v) => `${v}% of window`,
-        totalClassName: pct > 0 ? "text-warning" : undefined,
+        totalClassName: pct > 0 ? "system-mono-label text-warning" : undefined,
       };
     },
   },
@@ -1514,20 +1532,26 @@ function queueHealthLabel({ paused, running, queued, limit }: QueueHealth): Queu
   return "Idle";
 }
 
+// Tint + colored text, sized like the error status chips (see ErrorStatusBadge).
 const QUEUE_HEALTH_STYLES: Record<QueueHealthLabel, string> = {
-  Paused: "text-warning",
-  "At capacity": "text-warning",
-  Backlogged: "text-blue-500",
-  Active: "text-success",
-  Idle: "text-text-dimmed",
+  Paused: "bg-warning/10 text-warning",
+  "At capacity": "bg-warning/10 text-warning",
+  Backlogged: "bg-blue-500/10 text-blue-500",
+  Active: "bg-success/10 text-success",
+  Idle: "bg-charcoal-500/10 text-text-dimmed",
 };
 
 function QueueHealthBadge(health: QueueHealth) {
   const label = queueHealthLabel(health);
   return (
-    <Badge variant="extra-small" className={cn("ml-auto w-fit", QUEUE_HEALTH_STYLES[label])}>
+    <span
+      className={cn(
+        "contrast-chip ml-auto inline-flex w-fit items-center rounded px-2 py-0.5 text-xs font-medium",
+        QUEUE_HEALTH_STYLES[label]
+      )}
+    >
       {label}
-    </Badge>
+    </span>
   );
 }
 
@@ -1634,7 +1658,12 @@ function ClassicQueuesView() {
               valueClassName={cn(limitClassName, "tabular-nums")}
               suffix={
                 limitStatus === "burst" ? (
-                  <span className={cn(limitClassName, "flex items-center gap-1")}>
+                  <span
+                    className={cn(
+                      limitClassName,
+                      "system:text-text-dimmed flex items-center gap-1"
+                    )}
+                  >
                     Including {environment.running - environment.concurrencyLimit} burst runs{" "}
                     <BurstFactorTooltip environment={environment} />
                   </span>
@@ -1665,7 +1694,12 @@ function ClassicQueuesView() {
               valueClassName={limitClassName}
               suffix={
                 environment.burstFactor > 1 ? (
-                  <span className={cn(limitClassName, "flex items-center gap-1")}>
+                  <span
+                    className={cn(
+                      limitClassName,
+                      "system:text-text-dimmed flex items-center gap-1"
+                    )}
+                  >
                     Burst limit {environment.burstFactor * environment.concurrencyLimit}{" "}
                     <BurstFactorTooltip environment={environment} />
                   </span>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues_.$queueParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues_.$queueParam/route.tsx
index a2792b4f4d6..665b65806e2 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues_.$queueParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.queues_.$queueParam/route.tsx
@@ -1012,8 +1012,9 @@ function QueueStats({
         accessory={
           <LinkButton
             variant="secondary/small-icon"
+            className="system:border-transparent system:bg-runs system:transition system:group-hover/button:bg-runs system:group-hover/button:brightness-90"
             LeadingIcon={RunsIcon}
-            leadingIconClassName="text-runs"
+            leadingIconClassName="text-runs system:text-white"
             to={queuedRunsPath}
             tooltip="View queued runs"
           />
@@ -1082,7 +1083,12 @@ function ConcurrencyBlock({
               / {limit !== null ? limit.toLocaleString() : "∞"}
             </span>
             {limit !== null && limit > 0 && (
-              <span className={cn("text-xs", atLimit ? "text-warning" : "text-text-dimmed")}>
+              <span
+                className={cn(
+                  "text-xs",
+                  atLimit ? "system-mono-label text-warning" : "text-text-dimmed"
+                )}
+              >
                 {/* Separator so the limit and the percentage don't read as one number
                     (e.g. "/ 25" + "44%" mashing into "2544%"). */}
                 <span className="mr-1 text-text-dimmed">·</span>
@@ -1091,7 +1097,7 @@ function ConcurrencyBlock({
             )}
           </div>
           {limit !== null && limit > 0 && (
-            <div className="h-1.5 w-full overflow-hidden rounded-full bg-charcoal-750">
+            <div className="h-1.5 w-full overflow-hidden rounded-full bg-black/5 dark:bg-charcoal-750">
               <div
                 className={cn("h-full rounded-full", atLimit ? "bg-warning" : "bg-queues")}
                 style={{ width: `${pct}%` }}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx
index 7992f28cc92..486d384ce4a 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.regions/route.tsx
@@ -163,7 +163,9 @@ export default function Page() {
               {regions.map((region) => (
                 <Property.Item key={region.id}>
                   <Property.Label>{region.name}</Property.Label>
-                  <Property.Value>{region.id}</Property.Value>
+                  <Property.Value>
+                    <CopyableText value={region.id} asChild hideTooltip />
+                  </Property.Value>
                 </Property.Item>
               ))}
             </Property.Table>
@@ -308,6 +310,7 @@ export default function Page() {
                         <Paragraph variant="extra-small">Suggest a new region</Paragraph>
                       </TableCell>
                       <TableCellMenu
+                        className="suggest-region-cell"
                         alignment="right"
                         isSticky
                         visibleButtons={
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx
index dc5e8e591c1..085fa8f23ac 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam/route.tsx
@@ -489,19 +489,27 @@ export default function Page() {
             <Property.Table>
               <Property.Item>
                 <Property.Label>ID</Property.Label>
-                <Property.Value>{run.id}</Property.Value>
+                <Property.Value>
+                  <CopyableText value={run.id} asChild hideTooltip />
+                </Property.Value>
               </Property.Item>
               <Property.Item>
                 <Property.Label>Trace ID</Property.Label>
-                <Property.Value>{run.traceId}</Property.Value>
+                <Property.Value>
+                  <CopyableText value={run.traceId} asChild hideTooltip />
+                </Property.Value>
               </Property.Item>
               <Property.Item>
                 <Property.Label>Env ID</Property.Label>
-                <Property.Value>{run.environment.id}</Property.Value>
+                <Property.Value>
+                  <CopyableText value={run.environment.id} asChild hideTooltip />
+                </Property.Value>
               </Property.Item>
               <Property.Item>
                 <Property.Label>Org ID</Property.Label>
-                <Property.Value>{run.environment.organizationId}</Property.Value>
+                <Property.Value>
+                  <CopyableText value={run.environment.organizationId} asChild hideTooltip />
+                </Property.Value>
               </Property.Item>
             </Property.Table>
           </AdminDebugTooltip>
@@ -1482,7 +1490,7 @@ function TimelineView({
                         {(ms) => (
                           <motion.div
                             className={cn(
-                              "-ml-0.5 size-3 rounded-full border-2 border-background-bright",
+                              "timeline-point -ml-0.5 size-3 rounded-full border-2 border-background-bright",
                               eventBackgroundClassName(node.data)
                             )}
                             layoutId={disableSpansAnimations ? undefined : node.id}
@@ -1736,7 +1744,7 @@ function SpanWithDuration({
     <Timeline.Span {...props}>
       <motion.div
         className={cn(
-          "relative flex h-4 w-full min-w-0.5 items-center",
+          "timeline-span relative flex h-4 w-full min-w-0.5 items-center",
           eventBackgroundClassName(node.data),
           fadeLeft ? "rounded-r-sm bg-linear-to-r from-black/50 to-transparent" : "rounded-sm"
         )}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx
index a69e3e82a97..dfb921e2691 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs._index/route.tsx
@@ -11,6 +11,7 @@ import {
 import { ListCheckedIcon } from "~/assets/icons/ListCheckedIcon";
 import { QuestionMarkIcon } from "~/assets/icons/QuestionMarkIcon";
 import { TaskIcon } from "~/assets/icons/TaskIcon";
+import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
 import { DevDisconnectedBanner, useDevPresence } from "~/components/DevPresence";
 import { InlineCode } from "~/components/code/InlineCode";
 import { StepContentContainer } from "~/components/StepContentContainer";
@@ -166,6 +167,7 @@ export default function Page() {
           <DevDisconnectedBanner isConnected={isConnected} />
         )}
         <PageAccessories>
+          <AdminDebugTooltip />
           <LinkButton
             variant={"docs/small"}
             LeadingIcon={BookOpenIcon}
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings/route.tsx
index 1777d50e197..f99a14f336c 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.projects.$projectParam.env.$envParam.settings/route.tsx
@@ -2,9 +2,9 @@ import { Outlet, type MetaFunction } from "@remix-run/react";
 import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";
 import { PageBody, PageContainer } from "~/components/layout/AppLayout";
 import { NavBar, PageAccessories, PageTitle } from "~/components/primitives/PageHeader";
-import { Paragraph } from "~/components/primitives/Paragraph";
 import * as Property from "~/components/primitives/PropertyTable";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
+import { CopyableText } from "~/components/primitives/CopyableText";
 import { useProject } from "~/hooks/useProject";
 import { requireUserId } from "~/services/session.server";
 import {
@@ -55,14 +55,15 @@ export default function SettingsLayout() {
             <Property.Table>
               <Property.Item>
                 <Property.Label>ID</Property.Label>
-                <Property.Value>{project.id}</Property.Value>
-                <div className="flex items-center gap-2">
-                  <Paragraph variant="extra-small/bright/mono">{project.id}</Paragraph>
-                </div>
+                <Property.Value>
+                  <CopyableText value={project.id} asChild hideTooltip />
+                </Property.Value>
               </Property.Item>
               <Property.Item>
                 <Property.Label>Org ID</Property.Label>
-                <Property.Value>{project.organizationId}</Property.Value>
+                <Property.Value>
+                  <CopyableText value={project.organizationId} asChild hideTooltip />
+                </Property.Value>
               </Property.Item>
             </Property.Table>
           </AdminDebugTooltip>
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
index 6f37ac02dda..348658ba9ef 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings._index/route.tsx
@@ -5,7 +5,6 @@ import {
   CheckIcon,
   ExclamationTriangleIcon,
   FolderIcon,
-  GlobeAltIcon,
   TrashIcon,
 } from "@heroicons/react/20/solid";
 import { Form, type MetaFunction, useActionData, useNavigation, useSubmit } from "@remix-run/react";
@@ -13,6 +12,7 @@ import { json, type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { useEffect, useRef, useState } from "react";
 import { redirect, typedjson, useTypedLoaderData } from "remix-typedjson";
 import { z } from "zod";
+import { GlobeLinesIcon } from "~/assets/icons/GlobeLinesIcon";
 import { InlineCode } from "~/components/code/InlineCode";
 import {
   MainHorizontallyCenteredContainer,
@@ -515,7 +515,7 @@ function LogoForm({
                     onLoad={() => setFaviconError(false)}
                   />
                 ) : (
-                  <GlobeAltIcon className="size-6 text-text-dimmed" />
+                  <GlobeLinesIcon className="size-6 text-indigo-500" />
                 )}
               </button>
               <Input
@@ -681,7 +681,7 @@ function RadioDot({ active }: { active: boolean }) {
 }
 
 const iconTileClass =
-  "box-content grid size-10 shrink-0 place-items-center rounded-sm border-2 bg-charcoal-775";
+  "box-content grid size-10 shrink-0 place-items-center rounded-sm border-2 bg-background-bright";
 
 function toRecord(json: unknown): Record<string, unknown> {
   return json && typeof json === "object" ? (json as Record<string, unknown>) : {};
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections._index/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections._index/route.tsx
index cbb1d6370e9..914e9ceb232 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections._index/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.private-connections._index/route.tsx
@@ -114,17 +114,17 @@ export const action = async ({ request, params }: ActionFunctionArgs) => {
 };
 
 const STATUS_COLORS: Record<PrivateLinkConnectionStatus, string> = {
-  PENDING: "bg-amber-500/20 text-amber-400",
-  PROVISIONING: "bg-blue-500/20 text-blue-400",
-  ACTIVE: "bg-emerald-500/20 text-emerald-400",
-  ERROR: "bg-rose-500/20 text-rose-400",
-  DELETING: "bg-surface-control-active/20 text-text-dimmed",
+  PENDING: "bg-amber-500/10 text-amber-700 dark:text-amber-400 system:text-warning",
+  PROVISIONING: "bg-blue-500/10 text-blue-600 dark:text-blue-400 system:text-blue-500",
+  ACTIVE: "bg-emerald-500/10 text-emerald-700 dark:text-emerald-400 system:text-emerald-600",
+  ERROR: "bg-rose-500/10 text-rose-600 dark:text-rose-400 system:text-error",
+  DELETING: "bg-charcoal-500/10 text-text-dimmed",
 };
 
 function StatusBadge({ status }: { status: PrivateLinkConnectionStatus }) {
   return (
     <span
-      className={`inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium ${STATUS_COLORS[status]}`}
+      className={`contrast-chip inline-flex items-center rounded px-2 py-0.5 text-xs font-medium ${STATUS_COLORS[status]}`}
     >
       {status}
     </span>
@@ -190,11 +190,6 @@ export default function Page() {
           >
             Private connection docs
           </LinkButton>
-          {hasPrivateNetworking && canAdd && (
-            <LinkButton variant="primary/small" LeadingIcon={PlusIcon} to="new">
-              Add Connection
-            </LinkButton>
-          )}
         </PageAccessories>
       </NavBar>
       <PageBody scrollable={true}>
@@ -292,6 +287,14 @@ export default function Page() {
                   </div>
                 ))}
 
+                {canAdd && (
+                  <div className="flex justify-center pt-2">
+                    <LinkButton variant="primary/small" LeadingIcon={PlusIcon} to="new">
+                      Add Connection
+                    </LinkButton>
+                  </div>
+                )}
+
                 {!canAdd && (
                   <Paragraph variant="extra-small" className="text-text-dimmed">
                     Connection limit reached ({limit}). Delete an existing connection to add a new
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.sso/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.sso/route.tsx
index e58afdb65df..927c8ed0a8e 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.sso/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.sso/route.tsx
@@ -668,7 +668,7 @@ function DomainList({ domains }: { domains: ReadonlyArray<DomainRow> }) {
             <div className="flex flex-col">
               <span className="font-mono text-sm text-text-bright">{d.domain}</span>
               {d.state === "failed" && d.verificationFailedReason && (
-                <span className="mt-0.5 text-xs text-rose-400">
+                <span className="mt-0.5 text-xs text-rose-500 dark:text-rose-400">
                   Reason: <span className="font-mono">{d.verificationFailedReason}</span>
                 </span>
               )}
@@ -848,7 +848,7 @@ function StatusIndicator({ label, active = true }: { label: string; active?: boo
         active ? "text-success" : "text-text-dimmed"
       )}
     >
-      <span className={cn("size-1.5 rounded-full", active ? "bg-success" : "bg-charcoal-500")} />
+      <span className={cn("size-1.5 rounded-full", active ? "bg-success" : "bg-text-dimmed")} />
       {label}
     </span>
   );
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx
index 32920a678ff..3e11636aeec 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.team/route.tsx
@@ -18,6 +18,7 @@ import { z } from "zod";
 import { Feedback } from "~/components/Feedback";
 import { UserAvatar } from "~/components/UserProfilePhoto";
 import { AdminDebugTooltip } from "~/components/admin/debugTooltip";
+import { CopyableText } from "~/components/primitives/CopyableText";
 import { PageBody, PageContainer } from "~/components/layout/AppLayout";
 import {
   Alert,
@@ -372,7 +373,9 @@ export default function Page() {
             <Property.Table>
               <Property.Item>
                 <Property.Label>Org ID</Property.Label>
-                <Property.Value>{organization.id}</Property.Value>
+                <Property.Value>
+                  <CopyableText value={organization.id} asChild hideTooltip />
+                </Property.Value>
               </Property.Item>
 
               {members.map((member) => (
diff --git a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.usage/route.tsx b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.usage/route.tsx
index da2359a3057..03636f285d2 100644
--- a/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.usage/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.$organizationSlug.settings.usage/route.tsx
@@ -170,7 +170,7 @@ export default function Page() {
                   </p>
                 </div>
                 <div className="flex w-full flex-1 flex-col gap-1 pb-1">
-                  <div className="h-2 w-full overflow-hidden rounded-full bg-charcoal-700">
+                  <div className="h-2 w-full overflow-hidden rounded-full bg-background-raised">
                     <div
                       className="h-full rounded-full bg-blue-500"
                       style={{
diff --git a/apps/webapp/app/routes/_app.orgs.new/route.tsx b/apps/webapp/app/routes/_app.orgs.new/route.tsx
index 3ae844dfbdb..b06d9bafd93 100644
--- a/apps/webapp/app/routes/_app.orgs.new/route.tsx
+++ b/apps/webapp/app/routes/_app.orgs.new/route.tsx
@@ -1,6 +1,7 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
+import { GlobeLinesIcon } from "~/assets/icons/GlobeLinesIcon";
 import { parseWithZod } from "@conform-to/zod";
-import { BuildingOffice2Icon, GlobeAltIcon } from "@heroicons/react/20/solid";
+import { BuildingOffice2Icon } from "@heroicons/react/20/solid";
 import { RadioGroup } from "@radix-ui/react-radio-group";
 import { json, redirect, type ActionFunction, type LoaderFunctionArgs } from "@remix-run/node";
 import { Form, useActionData, useNavigation } from "@remix-run/react";
@@ -140,7 +141,7 @@ export default function NewOrganizationPage() {
         onLoad={() => setFaviconError(false)}
       />
     ) : (
-      GlobeAltIcon
+      GlobeLinesIcon
     );
 
   return (
diff --git a/apps/webapp/app/routes/account._index/route.tsx b/apps/webapp/app/routes/account._index/route.tsx
index 99ef9b87bb3..60d3975a1bd 100644
--- a/apps/webapp/app/routes/account._index/route.tsx
+++ b/apps/webapp/app/routes/account._index/route.tsx
@@ -1,7 +1,14 @@
 import { getFormProps, getInputProps, useForm } from "@conform-to/react";
 import { conformZodMessage, parseWithZod } from "@conform-to/zod";
-import { Form, type MetaFunction, useActionData } from "@remix-run/react";
-import { type ActionFunction, json } from "@remix-run/server-runtime";
+import { ComputerDesktopIcon, MoonIcon, SunIcon, SwatchIcon } from "@heroicons/react/20/solid";
+import {
+  Form,
+  type MetaFunction,
+  useActionData,
+  useFetcher,
+  useLoaderData,
+} from "@remix-run/react";
+import { type ActionFunction, json, type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { z } from "zod";
 import { UserProfilePhoto } from "~/components/UserProfilePhoto";
 import {
@@ -10,6 +17,8 @@ import {
   PageContainer,
 } from "~/components/layout/AppLayout";
 import { Button } from "~/components/primitives/Buttons";
+import { Select, SelectItem } from "~/components/primitives/Select";
+import { Slider } from "~/components/primitives/Slider";
 import { FormError } from "~/components/primitives/FormError";
 import { Header2 } from "~/components/primitives/Headers";
 import { Input } from "~/components/primitives/Input";
@@ -21,9 +30,50 @@ import { prisma } from "~/db.server";
 import { useUser } from "~/hooks/useUser";
 import { redirectWithSuccessMessage } from "~/models/message.server";
 import { updateUser } from "~/models/user.server";
-import { requireUserId } from "~/services/session.server";
+import {
+  updateContrastPreference,
+  updateThemePreference,
+} from "~/services/dashboardPreferences.server";
+import {
+  normalizeThemeContrast,
+  normalizeThemePreference,
+  type ThemePreference,
+} from "~/utils/themePreference";
+import { flag } from "~/v3/featureFlags.server";
+import { requireUser, requireUserId } from "~/services/session.server";
+import { emailSchema, MAX_EMAIL_LENGTH } from "~/utils/emailValidation";
 import { accountPath } from "~/utils/pathBuilder";
 
+const THEME_LABELS: Record<ThemePreference, string> = {
+  classic: "Classic",
+  system: "System preference",
+  dark: "Dark",
+  light: "Light",
+};
+
+function themeLabel(value: ThemePreference) {
+  return THEME_LABELS[value];
+}
+
+function themeIcon(value: ThemePreference) {
+  switch (value) {
+    case "classic":
+      return <SwatchIcon className="size-4 text-text-dimmed" />;
+    case "system":
+      return <ComputerDesktopIcon className="size-4 text-text-dimmed" />;
+    case "dark":
+      // Moon glyph reads small at its natural size, so nudge it up inside a
+      // size-4 box to line up with the other icons.
+      return (
+        <span className="grid size-4 place-items-center">
+          <MoonIcon className="size-3 text-text-dimmed" />
+        </span>
+      );
+    case "light":
+      return <SunIcon className="size-4 text-text-dimmed" />;
+  }
+}
+
 export const meta: MetaFunction = () => {
   return [
     {
@@ -42,10 +92,8 @@ function createSchema(
       .string({ required_error: "You must enter a name" })
       .min(2, "Your name must be at least 2 characters long")
       .max(50),
-    email: z
-      .string()
-      .email()
-      .superRefine((email, ctx) => {
+    email: emailSchema.pipe(
+      z.string().superRefine((email, ctx) => {
         if (constraints.isEmailUnique === undefined) {
           //client-side validation skips this
           ctx.addIssue({
@@ -65,16 +113,45 @@ function createSchema(
             });
           });
         }
-      }),
+      })
+    ),
     marketingEmails: z.preprocess((value) => value === "on", z.boolean()),
   });
 }
 
+export async function loader({ request }: LoaderFunctionArgs) {
+  await requireUserId(request);
+  const showThemeSwitcher = await flag({ key: "hasThemeSwitcher", defaultValue: true });
+  return json({ showThemeSwitcher });
+}
+
 export const action: ActionFunction = async ({ request }) => {
   const userId = await requireUserId(request);
 
   const formData = await request.formData();
 
+  if (formData.get("action") === "update-theme") {
+    const showThemeSwitcher = await flag({ key: "hasThemeSwitcher", defaultValue: true });
+    if (!showThemeSwitcher) {
+      return json({ error: "Not available" }, { status: 404 });
+    }
+    const user = await requireUser(request);
+    const theme = normalizeThemePreference(formData.get("theme"));
+    await updateThemePreference({ user, theme });
+    return json({ success: true });
+  }
+
+  if (formData.get("action") === "update-contrast") {
+    const showThemeSwitcher = await flag({ key: "hasThemeSwitcher", defaultValue: true });
+    if (!showThemeSwitcher) {
+      return json({ error: "Not available" }, { status: 404 });
+    }
+    const user = await requireUser(request);
+    const contrast = normalizeThemeContrast(formData.get("contrast"));
+    await updateContrastPreference({ user, contrast });
+    return json({ success: true });
+  }
+
   const formSchema = createSchema({
     isEmailUnique: async (email) => {
       const existingUser = await prisma.user.findFirst({
@@ -121,7 +198,20 @@ export const action: ActionFunction = async ({ request }) => {
 
 export default function Page() {
   const user = useUser();
+  const { showThemeSwitcher } = useLoaderData<typeof loader>();
   const lastSubmission = useActionData();
+  const themeFetcher = useFetcher();
+  const contrastFetcher = useFetcher();
+  const pendingTheme = themeFetcher.formData?.get("theme");
+  const pendingContrast = contrastFetcher.formData?.get("contrast");
+  const contrast =
+    typeof pendingContrast === "string"
+      ? normalizeThemeContrast(pendingContrast)
+      : normalizeThemeContrast(user.dashboardPreferences.contrast);
+  const theme: ThemePreference =
+    typeof pendingTheme === "string"
+      ? normalizeThemePreference(pendingTheme)
+      : normalizeThemePreference(user.dashboardPreferences.theme);
 
   const [form, { name, email, marketingEmails }] = useForm({
     id: "account",
@@ -177,6 +267,7 @@ export default function Page() {
                 <div className="flex w-56 flex-none flex-col gap-1">
                   <Input
                     {...getInputProps(email, { type: "text" })}
+                    maxLength={MAX_EMAIL_LENGTH}
                     placeholder="Your email"
                     defaultValue={user?.email ?? ""}
                   />
@@ -206,6 +297,69 @@ export default function Page() {
               </Button>
             </div>
           </Form>
+          {showThemeSwitcher && (
+            <>
+              <div className="mb-3 mt-8 w-full border-b border-grid-dimmed pb-3">
+                <Header2>Appearance</Header2>
+              </div>
+              <div className="flex w-full items-center justify-between gap-4">
+                <Label>Interface theme</Label>
+                <Select<ThemePreference, ThemePreference>
+                  value={theme}
+                  setValue={(value) =>
+                    themeFetcher.submit(
+                      { action: "update-theme", theme: value },
+                      { method: "post" }
+                    )
+                  }
+                  variant="secondary/small"
+                  dropdownIcon
+                  items={["classic", "system", "dark", "light"]}
+                  text={(value) => (
+                    <span className="flex items-center gap-1.5">
+                      {themeIcon(value)}
+                      {themeLabel(value)}
+                    </span>
+                  )}
+                  className="w-44"
+                >
+                  {(items) =>
+                    items.map((item) => (
+                      <SelectItem key={item} value={item} icon={themeIcon(item)}>
+                        {themeLabel(item)}
+                      </SelectItem>
+                    ))
+                  }
+                </Select>
+              </div>
+              {theme !== "classic" && (
+                <div className="mt-4 flex w-full items-center justify-between gap-4">
+                  <Label>Contrast</Label>
+                  <Slider
+                    variant="settings"
+                    className="w-44"
+                    min={0}
+                    max={100}
+                    step={5}
+                    defaultValue={[contrast]}
+                    onValueChange={(values) => {
+                      // Live preview before the preference persists
+                      document.documentElement.style.setProperty(
+                        "--theme-contrast",
+                        String((values[0] ?? 0) / 100)
+                      );
+                    }}
+                    onValueCommit={(values) =>
+                      contrastFetcher.submit(
+                        { action: "update-contrast", contrast: String(values[0] ?? 0) },
+                        { method: "post" }
+                      )
+                    }
+                  />
+                </div>
+              )}
+            </>
+          )}
         </MainHorizontallyCenteredContainer>
       </PageBody>
     </PageContainer>
diff --git a/apps/webapp/app/routes/confirm-basic-details.tsx b/apps/webapp/app/routes/confirm-basic-details.tsx
index 9187823a734..4e370913240 100644
--- a/apps/webapp/app/routes/confirm-basic-details.tsx
+++ b/apps/webapp/app/routes/confirm-basic-details.tsx
@@ -27,6 +27,7 @@ import { useUser } from "~/hooks/useUser";
 import { redirectWithSuccessMessage } from "~/models/message.server";
 import { updateUser } from "~/models/user.server";
 import { requireUserId } from "~/services/session.server";
+import { emailSchema, MAX_EMAIL_LENGTH } from "~/utils/emailValidation";
 import { rootPath } from "~/utils/pathBuilder";
 import { getVercelInstallParams } from "~/v3/vercel";
 
@@ -72,10 +73,8 @@ function createSchema(
   return z
     .object({
       name: z.string().min(3, "Your name must be at least 3 characters").max(50),
-      email: z
-        .string()
-        .email()
-        .superRefine((email, ctx) => {
+      email: emailSchema.pipe(
+        z.string().superRefine((email, ctx) => {
           if (constraints.isEmailUnique === undefined) {
             ctx.addIssue({
               code: z.ZodIssueCode.custom,
@@ -93,8 +92,9 @@ function createSchema(
               });
             });
           }
-        }),
-      confirmEmail: z.string(),
+        })
+      ),
+      confirmEmail: emailSchema,
       referralSource: z.string().optional(),
       referralSourceOther: z.string().optional(),
       role: z.string().optional(),
@@ -290,6 +290,7 @@ export default function Page() {
                 </Label>
                 <Input
                   {...getInputProps(email, { type: "email" })}
+                  maxLength={MAX_EMAIL_LENGTH}
                   defaultValue={enteredEmail}
                   onChange={(e) => {
                     setEnteredEmail(e.target.value);
@@ -306,6 +307,7 @@ export default function Page() {
                   <Label htmlFor={confirmEmail.id}>Confirm email</Label>
                   <Input
                     {...getInputProps(confirmEmail, { type: "email" })}
+                    maxLength={MAX_EMAIL_LENGTH}
                     placeholder="Your email, again"
                     icon={EnvelopeIcon}
                     spellCheck={false}
diff --git a/apps/webapp/app/routes/invites.tsx b/apps/webapp/app/routes/invites.tsx
index aa3b7809ca7..68522cd14d9 100644
--- a/apps/webapp/app/routes/invites.tsx
+++ b/apps/webapp/app/routes/invites.tsx
@@ -141,7 +141,7 @@ export default function Page() {
           <div>
             <FormTitle
               LeadingIcon={<EnvelopeIcon className="size-6 text-cyan-500" />}
-              className="mb-0 text-sky-500"
+              className="mb-0 text-sky-500 system:text-text-bright"
               title={simplur`You have ${invites.length} new invitation[|s]`}
             />
             <FormError>{form.errors}</FormError>
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
index 1842edf347c..161f4281107 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.github.tsx
@@ -34,7 +34,7 @@ import { Label } from "~/components/primitives/Label";
 import { Paragraph } from "~/components/primitives/Paragraph";
 import { PermissionLink } from "~/components/primitives/PermissionLink";
 import { Select, SelectItem } from "~/components/primitives/Select";
-import { SpinnerWhite } from "~/components/primitives/Spinner";
+import { Spinner } from "~/components/primitives/Spinner";
 import { Switch } from "~/components/primitives/Switch";
 import { TextLink } from "~/components/primitives/TextLink";
 import { InfoIconTooltip } from "~/components/primitives/Tooltip";
@@ -596,7 +596,7 @@ export function ConnectGitHubRepoModal({
                     name="action"
                     value="connect-repo"
                     variant="primary/medium"
-                    LeadingIcon={isConnectRepositoryLoading ? SpinnerWhite : undefined}
+                    LeadingIcon={isConnectRepositoryLoading ? Spinner : undefined}
                     leadingIconClassName="text-white"
                     disabled={isConnectRepositoryLoading}
                   >
@@ -907,7 +907,7 @@ export function ConnectedGitHubRepoForm({
                     ? undefined
                     : "You don't have permission to manage the GitHub integration"
                 }
-                LeadingIcon={isGitSettingsLoading ? SpinnerWhite : undefined}
+                LeadingIcon={isGitSettingsLoading ? Spinner : undefined}
               >
                 Save
               </Button>
@@ -955,7 +955,7 @@ export function GitHubSettingsPanel({
   if (fetcher.state === "loading" && !data) {
     return (
       <div className="flex items-center gap-2 text-text-dimmed">
-        <SpinnerWhite className="size-4" />
+        <Spinner color="blue" className="size-4" />
         <span className="text-sm">Loading GitHub settings...</span>
       </div>
     );
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx
index 9ab388718bc..e65515c1c4f 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.$runParam.spans.$spanParam/route.tsx
@@ -1,3 +1,4 @@
+import { GlobeLinesIcon } from "~/assets/icons/GlobeLinesIcon";
 import {
   ArrowPathIcon,
   BookOpenIcon,
@@ -8,7 +9,6 @@ import {
   CloudArrowDownIcon,
   EnvelopeIcon,
   ExclamationTriangleIcon,
-  GlobeAltIcon,
   KeyIcon,
   QueueListIcon,
   SignalIcon,
@@ -429,7 +429,9 @@ function RunBody({
           <Header2
             className={cn(
               "overflow-x-hidden",
-              run.isAgentRun ? "text-agents" : run.isScheduled ? "text-schedules" : "text-blue-500"
+              run.isAgentRun ? "text-agents" : run.isScheduled ? "text-schedules" : "text-blue-500",
+              // System themes: monochrome title, the task icon keeps the color
+              "system:text-text-bright"
             )}
           >
             <span className="truncate">
@@ -720,7 +722,7 @@ function RunBody({
                               </div>
                               <div>
                                 <div className="mb-1 flex items-center gap-1">
-                                  <GlobeAltIcon className="size-4 text-blue-500" />
+                                  <GlobeLinesIcon className="size-4 text-blue-500" />
                                   <Header3>Scope</Header3>
                                 </div>
                                 <div className="flex flex-col gap-0.5 text-sm text-text-dimmed">
@@ -1462,7 +1464,7 @@ function RunError({ error }: { error: TaskRunError }) {
           <Header3 className="text-rose-500">{name}</Header3>
           {enhancedError.message && (
             <Callout variant="error">
-              <pre className="text-wrap font-sans text-sm font-normal text-rose-200 [word-break:break-word]">
+              <pre className="text-wrap font-sans text-sm font-normal text-rose-500 dark:text-rose-200 [word-break:break-word]">
                 {enhancedError.message}
               </pre>
             </Callout>
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
index 7a5f61a48dc..ee84e52bfb7 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.vercel.tsx
@@ -23,7 +23,7 @@ import { Label } from "~/components/primitives/Label";
 import { Paragraph } from "~/components/primitives/Paragraph";
 import { PermissionLink } from "~/components/primitives/PermissionLink";
 import { Select, SelectItem } from "~/components/primitives/Select";
-import { SpinnerWhite } from "~/components/primitives/Spinner";
+import { Spinner } from "~/components/primitives/Spinner";
 import {
   redirectBackWithErrorMessage,
   redirectWithErrorMessage,
@@ -562,7 +562,7 @@ function VercelConnectionPrompt({
                   }
                   LeadingIcon={
                     isLoadingProjects
-                      ? () => <SpinnerWhite className="size-4" />
+                      ? () => <Spinner color="blue" className="size-4" />
                       : () => <VercelLogo className="-mx-1 size-4" />
                   }
                 >
@@ -993,7 +993,7 @@ function ConnectedVercelProjectForm({
                         LeadingIcon={
                           navigation.formData?.get("action") === "disable-auto-assign" &&
                           (navigation.state === "submitting" || navigation.state === "loading")
-                            ? SpinnerWhite
+                            ? Spinner
                             : undefined
                         }
                       >
@@ -1022,7 +1022,7 @@ function ConnectedVercelProjectForm({
                     ? undefined
                     : "You don't have permission to manage the Vercel integration"
                 }
-                LeadingIcon={isConfigLoading ? SpinnerWhite : undefined}
+                LeadingIcon={isConfigLoading ? Spinner : undefined}
                 onClick={(event) => {
                   if (shouldPromptClearOnSave) {
                     event.preventDefault();
@@ -1125,7 +1125,7 @@ function VercelSettingsPanel({
           <ExclamationTriangleIcon className="h-5 w-5 shrink-0 text-rose-500" />
           <div>
             <p className="font-medium text-rose-400">Failed to load Vercel settings</p>
-            <p className="mt-1 text-sm text-rose-300">
+            <p className="mt-1 text-sm text-rose-500 dark:text-rose-300">
               There was an error loading the Vercel integration settings. Please refresh the page to
               try again.
             </p>
@@ -1138,7 +1138,7 @@ function VercelSettingsPanel({
   if (fetcher.state === "loading" && !data) {
     return (
       <div className="flex items-center gap-2 text-text-dimmed">
-        <SpinnerWhite className="size-4" />
+        <Spinner color="blue" className="size-4" />
         <span className="text-sm">Loading Vercel settings...</span>
       </div>
     );
diff --git a/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx b/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx
index 2c107c35b13..7bb6c1478e4 100644
--- a/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx
+++ b/apps/webapp/app/routes/resources.orgs.$organizationSlug.select-plan.tsx
@@ -777,7 +777,7 @@ export function TierEnterprise() {
           <Feedback
             defaultValue="enterprise"
             button={
-              <div className="flex h-10 w-full cursor-pointer items-center justify-center rounded border border-border-bright bg-tertiary px-8 text-base font-medium transition hover:border-border-brighter hover:bg-surface-control">
+              <div className="flex h-10 w-full cursor-pointer items-center justify-center rounded border border-border-bright/50 bg-secondary px-8 text-base font-medium shadow-xs transition hover:bg-background-raised dark:border-border-bright dark:hover:border-border-brighter">
                 <span className="text-center text-text-bright">Contact us</span>
               </div>
             }
diff --git a/apps/webapp/app/services/billingAlertsDefaults.server.ts b/apps/webapp/app/services/billingAlertsDefaults.server.ts
new file mode 100644
index 00000000000..14db67bf4e7
--- /dev/null
+++ b/apps/webapp/app/services/billingAlertsDefaults.server.ts
@@ -0,0 +1,17 @@
+import type { UpdateBillingAlertsRequest } from "@trigger.dev/platform";
+import { ABSOLUTE_ALERT_BASE_CENTS } from "~/components/billing/billingAlertsFormat";
+
+/** Default absolute alert thresholds in dollars. */
+const DEFAULT_ALERT_THRESHOLD_DOLLARS = [5, 100, 500, 1000, 2500];
+
+/**
+ * Alerts fire at `usage / amount >= level`; amount = 100 cents makes levels
+ * absolute dollar thresholds. Empty emails fall back to org admins.
+ */
+export function buildDefaultBillingAlerts(): UpdateBillingAlertsRequest {
+  return {
+    amount: ABSOLUTE_ALERT_BASE_CENTS,
+    emails: [],
+    alertLevels: [...DEFAULT_ALERT_THRESHOLD_DOLLARS],
+  };
+}
diff --git a/apps/webapp/app/services/dashboardPreferences.server.ts b/apps/webapp/app/services/dashboardPreferences.server.ts
index a8b9149eff5..b25796b002a 100644
--- a/apps/webapp/app/services/dashboardPreferences.server.ts
+++ b/apps/webapp/app/services/dashboardPreferences.server.ts
@@ -25,8 +25,14 @@ export type SideMenuPreferences = z.infer<typeof SideMenuPreferences>;
 import { type SideMenuSectionId } from "~/components/navigation/sideMenuTypes";
 export type { SideMenuSectionId };
 
+import { ThemePreference } from "~/utils/themePreference";
+export { normalizeThemePreference, type ThemePreference } from "~/utils/themePreference";
+
 const DashboardPreferences = z.object({
   version: z.literal("1"),
+  theme: ThemePreference.optional(),
+  /** Interface contrast for the System themes, 0-100. */
+  contrast: z.number().int().min(0).max(100).optional(),
   currentProjectId: z.string().optional(),
   projects: z.record(
     z.string(),
@@ -103,6 +109,67 @@ export async function updateCurrentProjectEnvironmentId({
   });
 }
 
+export async function updateThemePreference({
+  user,
+  theme,
+}: {
+  user: UserFromSession;
+  theme: ThemePreference;
+}) {
+  if (user.isImpersonating) {
+    return;
+  }
+
+  if (user.dashboardPreferences.theme === theme) {
+    return;
+  }
+
+  // Narrow jsonb_set write: a full-blob update from the session snapshot can
+  // race with other preference writes and drop unrelated fields.
+  return prisma.$executeRaw`
+    UPDATE "User"
+    SET "dashboardPreferences" = jsonb_set(
+      COALESCE(
+        "dashboardPreferences",
+        '{"version":"1","projects":{}}'::jsonb
+      ),
+      '{theme}',
+      to_jsonb(${theme}::text)
+    )
+    WHERE id = ${user.id}
+  `;
+}
+
+export async function updateContrastPreference({
+  user,
+  contrast,
+}: {
+  user: UserFromSession;
+  contrast: number;
+}) {
+  if (user.isImpersonating) {
+    return;
+  }
+
+  if (user.dashboardPreferences.contrast === contrast) {
+    return;
+  }
+
+  // Narrow jsonb_set write: see updateThemePreference.
+  return prisma.$executeRaw`
+    UPDATE "User"
+    SET "dashboardPreferences" = jsonb_set(
+      COALESCE(
+        "dashboardPreferences",
+        '{"version":"1","projects":{}}'::jsonb
+      ),
+      '{contrast}',
+      to_jsonb(${contrast}::int)
+    )
+    WHERE id = ${user.id}
+  `;
+}
+
 export async function clearCurrentProject({ user }: { user: UserFromSession }) {
   if (user.isImpersonating) {
     return;
diff --git a/apps/webapp/app/services/realtime/envChangeRouter.server.ts b/apps/webapp/app/services/realtime/envChangeRouter.server.ts
index 95e25b7d0c0..e183bf636a3 100644
--- a/apps/webapp/app/services/realtime/envChangeRouter.server.ts
+++ b/apps/webapp/app/services/realtime/envChangeRouter.server.ts
@@ -51,6 +51,13 @@ export type EnvChangeRouterOptions = {
   /** Observability: a buffered record was evicted. `cap` evictions mean the env churns more
    * runs inside the window than the buffer holds (the replay guarantee is degrading). */
   onReplayEviction?: (reason: "cap" | "window") => void;
+  /** Observability: per-batch emission fan-out. `deliveries` = total (feed,run) rows matched and
+   * resolved to feeds this batch. It is an upper bound on the per-feed wire serializations, since
+   * the client working-set diff drops already-seen rows before encoding. `distinctRuns` = distinct
+   * (columnSig,runId) among them (the serialize-once-per-batch floor). `deliveries / distinctRuns`
+   * is the average number of feeds a changed run is delivered to; a shared-serialization step would
+   * save at most `deliveries - distinctRuns` encodings. */
+  onEmissionFanout?: (stats: { distinctRuns: number; deliveries: number; feeds: number }) => void;
   /** Read-your-writes gate over the replica: delays wake-path hydrates until the replica
    * should have applied the change (record.updatedAtMs + lag + margin), and re-hydrates
    * rows the tripwire still finds stale. Omit to hydrate immediately (legacy behavior). */
@@ -609,6 +616,8 @@ export class EnvChangeRouter {
 
     // 4. Assemble each feed's matched rows (post-filtering tag feeds against the
     //    authoritative hydrated row) and resolve its pending wait.
+    let deliveries = 0;
+    const distinctRunKeys = new Set<string>();
     for (const [feed, runIds] of matchedRunIdsByFeed) {
       if (!feed.resolve) {
         continue; // stopped waiting while we hydrated; its next poll/backstop covers it
@@ -631,10 +640,22 @@ export class EnvChangeRouter {
 
       if (rows.length > 0) {
         feed.resolve({ reason: "notify", rows });
+        deliveries += rows.length;
+        for (const matched of rows) {
+          distinctRunKeys.add(`${feed.columnSig}${matched.row.id}`);
+        }
       }
       // No surviving rows (e.g. a partial-record candidate that didn't actually match):
       // leave the feed waiting; nothing relevant changed for it.
     }
+
+    if (deliveries > 0) {
+      this.options.onEmissionFanout?.({
+        distinctRuns: distinctRunKeys.size,
+        deliveries,
+        feeds: matchedRunIdsByFeed.size,
+      });
+    }
   }
 
   /** Runs whose hydrated row is provably behind its record's watermark (stale content),
diff --git a/apps/webapp/app/services/realtime/nativeRealtimeClientInstance.server.ts b/apps/webapp/app/services/realtime/nativeRealtimeClientInstance.server.ts
index 3f29f3faa47..77a9a02e5fc 100644
--- a/apps/webapp/app/services/realtime/nativeRealtimeClientInstance.server.ts
+++ b/apps/webapp/app/services/realtime/nativeRealtimeClientInstance.server.ts
@@ -71,6 +71,16 @@ function initializeNativeRealtimeClient(): NativeRealtimeClient {
     unit: "rows",
   });
 
+  const emissionFeedDeliveries = meter.createCounter("realtime_native.emission_feed_deliveries", {
+    description:
+      "Matched (feed,run) rows resolved to feeds per batch, summed. Upper bound on per-feed wire serializations, since the client working-set diff drops already-seen rows before encoding. Divide by realtime_native.emission_distinct_runs for average feeds-per-run fan-out.",
+  });
+
+  const emissionDistinctRuns = meter.createCounter("realtime_native.emission_distinct_runs", {
+    description:
+      "Distinct (columnSig,run) among the deliveries per batch, summed. The serialize-once-per-batch floor: a shared-serialization step would encode at most this many rows, saving at most (feed_deliveries minus distinct_runs) encodings.",
+  });
+
   const backstops = meter.createCounter("realtime_native.backstops", {
     description:
       "Backstop full resolves by outcome. 'empty' is normal idle behavior; sustained 'delivered' means the notify/replay path missed changes — alert on it.",
@@ -166,6 +176,10 @@ function initializeNativeRealtimeClient(): NativeRealtimeClient {
     unsubscribeLingerMs: env.REALTIME_BACKEND_NATIVE_UNSUBSCRIBE_LINGER_MS,
     onReplay: (result) => replays.add(1, { result }),
     onReplayEviction: (reason) => replayEvictions.add(1, { reason }),
+    onEmissionFanout: ({ distinctRuns, deliveries }) => {
+      emissionFeedDeliveries.add(deliveries);
+      emissionDistinctRuns.add(distinctRuns);
+    },
     replicaLag: lagEstimator
       ? {
           getLagMs: () => lagEstimator.getLagMs(),
diff --git a/apps/webapp/app/services/upsertBranch.server.ts b/apps/webapp/app/services/upsertBranch.server.ts
index fa18101b476..3364f3f560a 100644
--- a/apps/webapp/app/services/upsertBranch.server.ts
+++ b/apps/webapp/app/services/upsertBranch.server.ts
@@ -1,4 +1,8 @@
-import { type PrismaClient, type PrismaClientOrTransaction } from "@trigger.dev/database";
+import {
+  type Prisma,
+  type PrismaClient,
+  type PrismaClientOrTransaction,
+} from "@trigger.dev/database";
 import slug from "slug";
 import { prisma } from "~/db.server";
 import { createApiKeyForEnv, createPkApiKeyForEnv } from "~/models/api-key.server";
@@ -141,7 +145,31 @@ export class UpsertBranchService {
       const branchSlug = `${slug(`${parentEnvironment.slug}-${sanitizedBranchName}`)}`;
       const apiKey = createApiKeyForEnv(parentEnvironment.type);
       const pkApiKey = createPkApiKeyForEnv(parentEnvironment.type);
-      const shortcode = branchSlug;
+      const isDevelopmentBranch = parentEnvironment.type === "DEVELOPMENT";
+      // Dev branches can share a slug across members, so their identity is scoped by
+      // orgMemberId. Shortcodes remain project-scoped and use the parent's unique
+      // shortcode to distinguish otherwise identical branch slugs.
+      const shortcode = isDevelopmentBranch
+        ? `${branchSlug}-${parentEnvironment.shortcode}`
+        : branchSlug;
+      let branchWhere: Prisma.RuntimeEnvironmentWhereUniqueInput;
+      if (isDevelopmentBranch) {
+        invariant(parentEnvironment.orgMemberId, "Development branches require an org member");
+        branchWhere = {
+          projectId_slug_orgMemberId: {
+            projectId: parentEnvironment.project.id,
+            slug: branchSlug,
+            orgMemberId: parentEnvironment.orgMemberId,
+          },
+        };
+      } else {
+        branchWhere = {
+          projectId_shortcode: {
+            projectId: parentEnvironment.project.id,
+            shortcode,
+          },
+        };
+      }
       const billingPause = await getInitialEnvPauseStateForBillingLimit(
         parentEnvironment.organization.id,
         parentEnvironment.type
@@ -149,12 +177,7 @@ export class UpsertBranchService {
 
       const now = new Date();
       const branch = await this.#prismaClient.runtimeEnvironment.upsert({
-        where: {
-          projectId_shortcode: {
-            projectId: parentEnvironment.project.id,
-            shortcode: shortcode,
-          },
-        },
+        where: branchWhere,
         create: {
           slug: branchSlug,
           apiKey,
diff --git a/apps/webapp/app/tailwind.css b/apps/webapp/app/tailwind.css
index 2bc91d77323..f1acc4e3eb6 100644
--- a/apps/webapp/app/tailwind.css
+++ b/apps/webapp/app/tailwind.css
@@ -158,6 +158,7 @@
   --color-surface-control: var(--color-charcoal-600);
   --color-surface-control-hover: var(--color-charcoal-550);
   --color-surface-control-active: var(--color-charcoal-500);
+  --color-input-bg: var(--color-charcoal-750);
 
   /* Borders, from subtlest to most visible */
   --color-grid-dimmed: var(--color-charcoal-750);
@@ -223,6 +224,84 @@
   --color-callout-pricing-text: var(--color-indigo-300);
 }
 
+/*
+  Theme overrides. A theme re-maps ONLY the semantic tokens above, never the raw
+  palette values. That invariant is what lets a future [data-contrast] overlay
+  re-map semantic tokens on top of whichever theme is active.
+*/
+
+/*
+  System preference unified accents (dark+light); Classic keeps the original
+  set. One shared value per accent token, >=3:1 against both dark cards and
+  white. Accents whose Classic default already clears both modes (blue-500,
+  indigo-500, pink-500, purple-500, red-500, violet-500, fuchsia-500,
+  rose-600) are not repeated here. Text-sized tokens (text-link, callout
+  text) stay per-mode: no color reaches 4.5:1 on both #1a1b1f and #ffffff.
+  Dark derives everything else (monochrome surfaces etc.) from Classic.
+*/
+:is([data-theme="dark"], [data-theme="light"]) {
+  /* Status */
+  --color-success: var(--color-mint-600);
+  --color-warning: var(--color-amber-600);
+  /* Env set: pink dev and green prod as in Classic, preview moves to blue
+     (yellow's unified mid-tone reads muddy brown). Staging stays warm orange
+     and is the one per-mode env color - see the light block. */
+  --color-prod: var(--color-mint-600);
+  --color-preview: var(--color-blue-500);
+
+  /* Icons */
+  --color-schedules: var(--color-yellow-700);
+  /* Matches the preview env color */
+  --color-previewBranches: var(--color-blue-500);
+  --color-metrics: var(--color-green-600);
+  --color-regions: var(--color-green-600);
+  --color-aiMetrics: var(--color-green-600);
+  --color-bulkActions: var(--color-emerald-600);
+  --color-concurrency: var(--color-amber-600);
+  --color-errors: var(--color-amber-600);
+  --color-apiKeys: var(--color-amber-600);
+
+  /* Queue charts read blue here; Classic keeps the queues purple */
+  --color-queues-chart: var(--color-blue-500);
+  --color-queues-chart-ref: var(--color-charcoal-500);
+
+  /* Callout accents (callout text/bg tints stay per-mode) */
+  --color-callout-docs: var(--color-blue-500);
+  --color-callout-pending: var(--color-blue-500);
+  --color-callout-pricing: var(--color-indigo-500);
+
+  /* Amber run statuses: three distinct steps, Classic's dark-to-light order
+     kept (waiting-for-deploy < pending-version < paused) */
+  --color-run-waiting-for-deploy: var(--color-amber-700);
+  --color-run-pending-version: #c76508;
+  --color-run-paused: var(--color-amber-600);
+  /* Nudged under 3:1's ceiling on white; stays lighter than system-failure */
+  --color-run-timed-out: #ed5f74;
+}
+
+/* System themes drop decorative icon accents to monochrome; Classic keeps the
+   colored icons. side-menu-active-icon is set in SideMenuItem for the active
+   nav item; system-mono-icon marks section-header icons (e.g. the limits page). */
+:is([data-theme="dark"], [data-theme="light"]) :is(.side-menu-active-icon, .system-mono-icon) {
+  color: var(--color-text-bright);
+}
+
+/* System themes: status/env labels follow the surrounding text color, only the
+   icon keeps its tint. Classic colors both. Set in EnvironmentLabel and the
+   status combo components. */
+:is([data-theme="dark"], [data-theme="light"]) .system-mono-label {
+  color: inherit;
+}
+
+/* Tinted status chips respond to the contrast control: a ring in the chip's
+   own text color fades in as contrast rises, so the soft tint keeps its
+   footprint but the chip gains definition. Transparent at contrast 0;
+   Classic never sets the variable. Marker set by the chip components. */
+:is([data-theme="dark"], [data-theme="light"]) .contrast-chip {
+  box-shadow: inset 0 0 0 1px
+    color-mix(in srgb, currentColor calc(var(--theme-contrast, 0) * 70%), transparent);
+}
+
 /*
   Code syntax palette - the trigger-dark highlight theme, shared by the shiki
   theme (streamdown) and the prism theme (CodeBlock). Consumed from JS via
@@ -290,6 +369,14 @@
   --color-editor-scrollbar-thumb-active: #3c4b62;
 }
 
+/* Queue chart series colors - queues purple in Classic, overridden to blue in
+   the System themes; the grey reference series lightens per mode there.
+   Consumed from JS via var(), so declared static. */
+@theme static {
+  --color-queues-chart: var(--color-queues);
+  --color-queues-chart-ref: #4d525b;
+}
+
 /*
   Run-status chart colors. In-between shades are intentional - statuses within
   a family (blues, roses, charcoals) are evenly spaced so chart series stay
@@ -333,8 +420,17 @@
 @custom-variant lg-height (@media (max-height: 750px));
 @custom-variant md-height (@media (max-height: 600px));
 
-/* dark: follows the app theme (data-theme on <html>), not the OS preference */
-@custom-variant dark (&:where([data-theme="dark"], [data-theme="dark"] *));
+/* dark: follows the app theme (data-theme on <html>), not the OS preference.
+   Classic and Dark are both dark-mode themes, so the variant matches both. */
+@custom-variant dark (&:where([data-theme="dark"], [data-theme="classic"], [data-theme="dark"] *, [data-theme="classic"] *));
+
+/* system: matches the System preference themes (Dark and Light) but never
+   Classic - for restyles that must leave Classic untouched. */
+@custom-variant system (&:where([data-theme="dark"], [data-theme="light"], [data-theme="dark"] *, [data-theme="light"] *));
+
+/* light: the Light theme only - for values that are fine on every dark theme
+   but illegible on white. Classic is never matched. */
+@custom-variant light (&:where([data-theme="light"], [data-theme="light"] *));
 
 @utility focus-custom {
   &:focus-visible {
@@ -489,7 +585,8 @@
     --chart-5: 27 87% 67%;
   }
 
-  [data-theme="dark"] {
+  /* Classic and Dark share these HSL chart vars - they were the app-wide dark values. */
+  :is([data-theme="dark"], [data-theme="classic"]) {
     --chart-1: 220 70% 50%;
     --chart-2: 160 60% 45%;
     --chart-3: 30 80% 55%;
@@ -497,6 +594,16 @@
     --chart-5: 340 75% 55%;
   }
 
+  /* System preference unified chart set (dark+light): Classic's hues, with
+     chart-2/3 darkened to clear 3:1 on white. Classic keeps the set above. */
+  :is([data-theme="dark"], [data-theme="light"]) {
+    --chart-1: 220 70% 50%;
+    --chart-2: 160 60% 40%;
+    --chart-3: 30 80% 47%;
+    --chart-4: 280 65% 60%;
+    --chart-5: 340 75% 55%;
+  }
+
   /* Override react-grid-layout placeholder color (default is red) */
   .react-grid-item.react-grid-placeholder {
     background: rgb(99 102 241) !important; /* indigo-500 */
@@ -639,3 +746,236 @@
     @apply leading-relaxed;
   }
 }
+
+/*
+  Light theme. Overrides the themable variables only; raw palettes stay put.
+  Code/editor values come from the trigger.light VS Code theme.
+*/
+[data-theme="light"] {
+  --color-secondary: #ffffff;
+  --color-input-bg: #ffffff;
+
+  /* shadcn vars consumed by charts/streamdown (tooltip cursor fill etc.) */
+  --background: #ffffff;
+  --foreground: #1a1b1f;
+  --muted: #eceef1;
+  --muted-foreground: #5f6570;
+  --border: #e2e4e9;
+  --sidebar: #f6f7f8;
+  --primary-foreground: #ffffff;
+
+  /* Text */
+  --color-primary: var(--color-apple-600);
+  --color-tertiary: #eef0f3;
+  --color-text-link: var(--color-lavender-600);
+  --color-text-faint: var(--color-charcoal-400);
+  --color-text-dimmed: var(--color-charcoal-500);
+  --color-text-bright: var(--color-charcoal-800);
+
+  /* Surfaces */
+  --color-background-deep: #f1f2f4;
+  --color-background-dimmed: #fbfbfc;
+  --color-background-bright: #ffffff;
+  --color-background-hover: #f2f3f5;
+  --color-background-raised: #e9eaee;
+  --color-surface-control: #dcdee3;
+  --color-surface-control-hover: #cfd2d9;
+  --color-surface-control-active: #b8bcc6;
+
+  /* Borders */
+  --color-grid-dimmed: #eceef1;
+  --color-grid-bright: #e2e4e9;
+  --color-border-bright: #d2d5db;
+  --color-border-brighter: #b9bdc7;
+  --color-border-brightest: #9ba1ad;
+
+  /* Status/env/icon accents live in the unified dark+light block above;
+     dev keeps its Classic pink-500, which passes on white too. */
+
+  /* Staging is the one per-mode env color: warm orange has no clean unified
+     mid-tone, so dark keeps Classic's bright orange-400 and light deepens it */
+  --color-staging: var(--color-orange-600);
+
+  /* Grey chart reference series, light enough not to dominate on white */
+  --color-queues-chart-ref: #c3c7cf;
+
+  /* Neutral run statuses: soft light grays for sparkbars and charts */
+  --color-run-pending: #ccd0d6;
+  --color-run-delayed: #d3d6db;
+  --color-run-waiting-to-resume: #c5c9d0;
+  --color-run-canceled: #d8dbdf;
+  --color-run-expired: #dee0e4;
+
+  /* Monochrome icon gray - per-mode, not part of the unified accent set */
+  --color-customDashboards: var(--color-charcoal-500);
+
+  /* Callout text/bg - deep tints instead of the dark theme's pastels; text
+     can't unify across modes (see the unified accents block) */
+  --color-callout-warning-text: var(--color-yellow-800);
+  --color-callout-error-text: var(--color-rose-700);
+  --color-callout-success-text: var(--color-green-800);
+  --color-callout-docs-text: var(--color-blue-800);
+  --color-callout-pending-bg: var(--color-blue-100);
+  --color-callout-pending-text: var(--color-blue-800);
+  --color-callout-pricing-bg: var(--color-indigo-100);
+  --color-callout-pricing-text: var(--color-indigo-800);
+
+  /* Code syntax - trigger.light */
+  --color-code-background: #ffffff;
+  --color-code-foreground: #333333;
+  --color-code-line-number: #a8a8ad;
+  --color-code-plain: #2e2e4b;
+  --color-code-muted: #333333;
+  --color-code-comment: #767a81;
+  --color-code-keyword: #b114d3;
+  --color-code-storage: #b114d3;
+  --color-code-type: #b114d3;
+  --color-code-function: #6532f5;
+  --color-code-variable: #404040;
+  --color-code-constant: #1e1e1e;
+  --color-code-language: #b114d3;
+  --color-code-object-key: #222222;
+  --color-code-string: #262626;
+  --color-code-template-punctuation: #0879e2;
+  --color-code-number: #262626;
+  --color-code-builtin: #3080e0;
+  --color-code-attribute: #222222;
+  --color-code-escape: #222222;
+  --color-code-regexp: #dc3545;
+  --color-code-regexp-constant: #5f6570;
+  --color-code-invalid: #dc3545;
+  --color-code-deleted: #dc3545;
+  --color-code-jsx-text: #2e2e4b;
+
+  /* CodeMirror - trigger.light */
+  --color-editor-background: #ffffff;
+  --color-editor-foreground: #2e2e4b;
+  --color-editor-keyword: #b114d3;
+  --color-editor-name: #197c3c;
+  --color-editor-function: #6532f5;
+  --color-editor-constant: #3080e0;
+  --color-editor-type: #2980b9;
+  --color-editor-operator: #333333;
+  --color-editor-comment: #767a81;
+  --color-editor-heading: #2c3e50;
+  --color-editor-string: #262626;
+  --color-editor-invalid: #dc3545;
+  --color-editor-panel-background: #f4f4f6;
+  --color-editor-highlight-background: #f8f8fa;
+  --color-editor-tooltip-background: #ffffff;
+  --color-editor-selection: #d9dce3;
+  --color-editor-cursor: #2e2e4b;
+  --color-editor-search-match: #0879e226;
+  --color-editor-search-match-outline: #0879e2;
+  --color-editor-search-match-selected: #0879e240;
+  --color-editor-selection-match: #e8e8ed;
+  --color-editor-matching-bracket: rgba(240, 241, 244, 0.9);
+  --color-editor-matching-bracket-outline: rgba(160, 166, 180, 0.5);
+  --color-editor-fold-placeholder: #555555;
+  --color-editor-scrollbar-track-active: #e8e9ec;
+  --color-editor-scrollbar-thumb: #c9ccd4;
+  --color-editor-scrollbar-thumb-active: #aeb3be;
+}
+
+/* Streamdown's muted surface has no semantic token (charcoal-775); theme it here */
+[data-theme="light"] .streamdown-container {
+  --muted: #eceef1;
+}
+
+/* The timeline label shadow is a Classic legibility aid; the System themes
+   drop it entirely */
+:is([data-theme="dark"], [data-theme="light"]) .text-shadow-custom {
+  text-shadow: none;
+}
+
+/* Neutral timeline points: invert to a light dot with a gray ring */
+[data-theme="light"] .timeline-point.bg-surface-control-active {
+  border-color: var(--color-surface-control-active);
+  background-color: var(--color-background-bright);
+}
+
+/* Run timeline bars: no fade gradient on light */
+[data-theme="light"] .timeline-span {
+  background-image: none;
+}
+/* On saturated bars the duration label keeps the dark-theme treatment,
+   but only when the bar is wide enough to contain the label — on narrow
+   bars the sticky label overflows onto the page background, where the
+   default dark-on-light text is correct. */
+[data-theme="light"] .timeline-span.bg-success,
+[data-theme="light"] .timeline-span.bg-error,
+[data-theme="light"] .timeline-span.bg-blue-500 {
+  container-type: inline-size;
+}
+@container (min-width: 3.5rem) {
+  [data-theme="light"] .timeline-span.bg-success .text-shadow-custom,
+  [data-theme="light"] .timeline-span.bg-error .text-shadow-custom,
+  [data-theme="light"] .timeline-span.bg-blue-500 .text-shadow-custom {
+    color: #ffffff;
+  }
+}
+
+/* The table row-hover menu wraps the always-visible "Suggest a region" button
+   in a ring container; on light that ring doubles up with the button's own
+   border, so drop it here. */
+[data-theme="light"] .suggest-region-cell > div > div {
+  box-shadow: none;
+}
+
+/*
+  Interface contrast (System themes only). --theme-contrast is 0..1, set on
+  <html> from the dashboard preference. It pulls the whole monochrome scale
+  apart: text mixes toward the mode's foreground, backgrounds toward its
+  depth, borders step up. Accents are untouched. srgb mixing keeps contrast 0
+  byte-identical to the base values, and Classic never reads the variable.
+  These blocks must stay below the [data-theme="light"] theme block so they
+  win the cascade.
+*/
+[data-theme="dark"] {
+  /* Text brightens toward white */
+  --color-text-bright: color-mix(in srgb, var(--color-charcoal-200), #fff calc(var(--theme-contrast, 0) * 100%));
+  --color-text-dimmed: color-mix(in srgb, var(--color-charcoal-400), #fff calc(var(--theme-contrast, 0) * 60%));
+  --color-text-faint: color-mix(in srgb, var(--color-charcoal-500), #fff calc(var(--theme-contrast, 0) * 45%));
+
+  /* Backgrounds deepen toward black, keeping their relative order */
+  --color-background-deep: color-mix(in srgb, var(--color-charcoal-900), #000 calc(var(--theme-contrast, 0) * 60%));
+  --color-background-dimmed: color-mix(in srgb, var(--color-charcoal-850), #000 calc(var(--theme-contrast, 0) * 55%));
+  --color-background-bright: color-mix(in srgb, var(--color-charcoal-800), #000 calc(var(--theme-contrast, 0) * 45%));
+  --color-background-hover: color-mix(in srgb, var(--color-charcoal-750), #000 calc(var(--theme-contrast, 0) * 35%));
+  --color-background-raised: color-mix(in srgb, var(--color-charcoal-700), #000 calc(var(--theme-contrast, 0) * 25%));
+  --color-input-bg: color-mix(in srgb, var(--color-charcoal-750), #000 calc(var(--theme-contrast, 0) * 35%));
+
+  /* Controls and borders step up toward white */
+  --color-surface-control: color-mix(in srgb, var(--color-charcoal-600), #fff calc(var(--theme-contrast, 0) * 12%));
+  --color-surface-control-hover: color-mix(in srgb, var(--color-charcoal-550), #fff calc(var(--theme-contrast, 0) * 14%));
+  --color-surface-control-active: color-mix(in srgb, var(--color-charcoal-500), #fff calc(var(--theme-contrast, 0) * 16%));
+  --color-grid-dimmed: color-mix(in srgb, var(--color-charcoal-750), #fff calc(var(--theme-contrast, 0) * 18%));
+  --color-grid-bright: color-mix(in srgb, var(--color-charcoal-700), #fff calc(var(--theme-contrast, 0) * 20%));
+  --color-border-bright: color-mix(in srgb, var(--color-charcoal-600), #fff calc(var(--theme-contrast, 0) * 24%));
+  --color-border-brighter: color-mix(in srgb, var(--color-charcoal-550), #fff calc(var(--theme-contrast, 0) * 27%));
+  --color-border-brightest: color-mix(in srgb, var(--color-charcoal-500), #fff calc(var(--theme-contrast, 0) * 30%));
+}
+
+[data-theme="light"] {
+  /* Text deepens toward black */
+  --color-text-bright: color-mix(in srgb, #1a1b1f, #000 calc(var(--theme-contrast, 0) * 100%));
+  --color-text-dimmed: color-mix(in srgb, var(--color-charcoal-500), #000 calc(var(--theme-contrast, 0) * 85%));
+  --color-text-faint: color-mix(in srgb, var(--color-charcoal-400), #000 calc(var(--theme-contrast, 0) * 70%));
+
+  /* On white the foregrounds carry the contrast: cards stay white while the
+     page-behind surfaces darken a touch so panels separate */
+  --color-background-deep: color-mix(in srgb, #f1f2f4, #000 calc(var(--theme-contrast, 0) * 10%));
+  --color-background-hover: color-mix(in srgb, #f2f3f5, #000 calc(var(--theme-contrast, 0) * 8%));
+  --color-background-raised: color-mix(in srgb, #e9eaee, #000 calc(var(--theme-contrast, 0) * 10%));
+
+  /* Controls and borders push hard toward black - this is where light-mode
+     contrast is actually visible */
+  --color-surface-control: color-mix(in srgb, #dcdee3, #000 calc(var(--theme-contrast, 0) * 25%));
+  --color-surface-control-hover: color-mix(in srgb, #cfd2d9, #000 calc(var(--theme-contrast, 0) * 28%));
+  --color-surface-control-active: color-mix(in srgb, #b8bcc6, #000 calc(var(--theme-contrast, 0) * 32%));
+  --color-grid-dimmed: color-mix(in srgb, #eceef1, #000 calc(var(--theme-contrast, 0) * 28%));
+  --color-grid-bright: color-mix(in srgb, #e2e4e9, #000 calc(var(--theme-contrast, 0) * 32%));
+  --color-border-bright: color-mix(in srgb, #d2d5db, #000 calc(var(--theme-contrast, 0) * 38%));
+  --color-border-brighter: color-mix(in srgb, #b9bdc7, #000 calc(var(--theme-contrast, 0) * 42%));
+  --color-border-brightest: color-mix(in srgb, #9ba1ad, #000 calc(var(--theme-contrast, 0) * 46%));
+}
diff --git a/apps/webapp/app/utils/emailValidation.ts b/apps/webapp/app/utils/emailValidation.ts
new file mode 100644
index 00000000000..2c4d3952db9
--- /dev/null
+++ b/apps/webapp/app/utils/emailValidation.ts
@@ -0,0 +1,8 @@
+import { z } from "zod";
+
+export const MAX_EMAIL_LENGTH = 254;
+
+export const emailSchema = z
+  .string()
+  .email()
+  .max(MAX_EMAIL_LENGTH, `Email must be ${MAX_EMAIL_LENGTH} characters or fewer`);
diff --git a/apps/webapp/app/utils/themePreference.ts b/apps/webapp/app/utils/themePreference.ts
new file mode 100644
index 00000000000..7fc3fcf4cf2
--- /dev/null
+++ b/apps/webapp/app/utils/themePreference.ts
@@ -0,0 +1,20 @@
+import { z } from "zod";
+
+// Shared between server (dashboard preferences) and client (theme UI, system
+// theme sync) - must stay free of server-only imports.
+export const ThemePreference = z.enum(["classic", "system", "dark", "light"]);
+export type ThemePreference = z.infer<typeof ThemePreference>;
+
+/** Coerce any stored/legacy value into a valid preference. Missing or unknown
+ * values fall back to `classic` (the default dark theme). */
+export function normalizeThemePreference(value: unknown): ThemePreference {
+  const result = ThemePreference.safeParse(value);
+  return result.success ? result.data : "classic";
+}
+
+/** Interface contrast for the System themes, 0 (default) to 100 (max). */
+export function normalizeThemeContrast(value: unknown): number {
+  const num = typeof value === "string" ? Number(value) : value;
+  if (typeof num !== "number" || !Number.isFinite(num)) return 0;
+  return Math.min(100, Math.max(0, Math.round(num)));
+}
diff --git a/apps/webapp/app/v3/featureFlags.ts b/apps/webapp/app/v3/featureFlags.ts
index eefb5d665ef..1b7694b220b 100644
--- a/apps/webapp/app/v3/featureFlags.ts
+++ b/apps/webapp/app/v3/featureFlags.ts
@@ -10,6 +10,7 @@ export const FEATURE_FLAG = {
   hasComputeAccess: "hasComputeAccess",
   hasPrivateConnections: "hasPrivateConnections",
   hasSso: "hasSso",
+  hasThemeSwitcher: "hasThemeSwitcher",
   mollifierEnabled: "mollifierEnabled",
   workerQueueScheduledSplitEnabled: "workerQueueScheduledSplitEnabled",
   realtimeBackend: "realtimeBackend",
@@ -37,6 +38,8 @@ export const FeatureFlagCatalog = {
   [FEATURE_FLAG.hasComputeAccess]: z.coerce.boolean(),
   [FEATURE_FLAG.hasPrivateConnections]: z.coerce.boolean(),
   [FEATURE_FLAG.hasSso]: z.coerce.boolean(),
+  // Gates the Interface theme setting in /account. Off by default.
+  [FEATURE_FLAG.hasThemeSwitcher]: z.coerce.boolean(),
   [FEATURE_FLAG.mollifierEnabled]: z.coerce.boolean(),
   [FEATURE_FLAG.workerQueueScheduledSplitEnabled]: z.coerce.boolean(),
   // Which backend serves the realtime run feed. Controllable
diff --git a/apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts b/apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts
index 23d20e108fb..ba4741a5ecc 100644
--- a/apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts
+++ b/apps/webapp/app/v3/services/worker/workerGroupTokenService.server.ts
@@ -62,12 +62,17 @@ if (workloadCreatedAtGateEnabled && !workloadTokenCutoff) {
 
 type WorkloadGateAction = "start" | "complete" | "continue" | "snapshots_since";
 
-const workloadAuthGateCounter = new Counter({
-  name: "workload_auth_gate_total",
-  help: "Deployment token authorization outcomes on worker actions",
-  labelNames: ["outcome", "action"] as const,
-  registers: [metricsRegister],
-});
+// singleton: module-scope registration double-registers under dev HMR
+const workloadAuthGateCounter = singleton(
+  "workloadAuthGateCounter",
+  () =>
+    new Counter({
+      name: "workload_auth_gate_total",
+      help: "Deployment token authorization outcomes on worker actions",
+      labelNames: ["outcome", "action"] as const,
+      registers: [metricsRegister],
+    })
+);
 
 function createAuthenticatedWorkerInstanceCache() {
   return createCache({
diff --git a/apps/webapp/test/billingAlertsDefaults.test.ts b/apps/webapp/test/billingAlertsDefaults.test.ts
new file mode 100644
index 00000000000..6e655e38fea
--- /dev/null
+++ b/apps/webapp/test/billingAlertsDefaults.test.ts
@@ -0,0 +1,26 @@
+import { describe, expect, it } from "vitest";
+import { buildDefaultBillingAlerts } from "~/services/billingAlertsDefaults.server";
+import { ABSOLUTE_ALERT_BASE_CENTS } from "~/components/billing/billingAlertsFormat";
+
+describe("buildDefaultBillingAlerts", () => {
+  it("uses the absolute dollar base so alert levels read as dollar thresholds", () => {
+    expect(buildDefaultBillingAlerts().amount).toBe(ABSOLUTE_ALERT_BASE_CENTS);
+    expect(buildDefaultBillingAlerts().amount).toBe(100);
+  });
+
+  it("starts with no recipients so the platform falls back to org members", () => {
+    expect(buildDefaultBillingAlerts().emails).toEqual([]);
+  });
+
+  it("seeds the default dollar alert thresholds", () => {
+    expect(buildDefaultBillingAlerts().alertLevels).toEqual([5, 100, 500, 1000, 2500]);
+  });
+
+  it("returns a fresh alertLevels array each call (no shared mutable state)", () => {
+    const first = buildDefaultBillingAlerts();
+    const second = buildDefaultBillingAlerts();
+    expect(first.alertLevels).not.toBe(second.alertLevels);
+    first.alertLevels.push(9999);
+    expect(second.alertLevels).toEqual([5, 100, 500, 1000, 2500]);
+  });
+});
diff --git a/apps/webapp/test/billingAlertsFormat.test.ts b/apps/webapp/test/billingAlertsFormat.test.ts
index 7ef84770d7b..98a61ca8b86 100644
--- a/apps/webapp/test/billingAlertsFormat.test.ts
+++ b/apps/webapp/test/billingAlertsFormat.test.ts
@@ -90,6 +90,19 @@ describe("billingAlertsFormat", () => {
     ).toBe(10_000);
   });
 
+  it("previews saved percentage alerts against the current limit after it changes", () => {
+    // Percentage alerts saved against a $30 custom limit, limit later raised to $300.
+    const alerts = { amount: 30, emails: [], alertLevels: [0.75, 1.0] };
+
+    expect(getAlertPreviewLimitCents(alerts, 30_000, 10_000)).toBe(30_000);
+    expect(
+      previewDollarAmountForPercent(100, getAlertPreviewLimitCents(alerts, 30_000, 10_000))
+    ).toBe(300);
+    expect(
+      previewDollarAmountForPercent(75, getAlertPreviewLimitCents(alerts, 30_000, 10_000))
+    ).toBe(225);
+  });
+
   it("normalizes legacy API alerts with dollar amount field and whole percents", () => {
     expect(
       normalizeBillingAlertsFromApi(
@@ -150,6 +163,22 @@ describe("billingAlertsFormat", () => {
     );
   });
 
+  it("keeps seeded absolute defaults absolute when the plan limit is exactly $100", () => {
+    const normalized = normalizeBillingAlertsFromApi(
+      {
+        amount: 100,
+        emails: [],
+        alertLevels: [5, 100, 500, 1000, 2500],
+      },
+      { planLimitCents: 10_000, effectiveLimitCents: 10_000 }
+    );
+
+    expect(normalized.amount).toBe(1);
+    expect(storedAlertsToThresholds(normalized, "none", 10_000, 10_000)).toEqual([
+      5, 100, 500, 1000, 2500,
+    ]);
+  });
+
   it("normalizes cents-based alerts with whole-number levels when amount matches limit", () => {
     const normalized = normalizeBillingAlertsFromApi(
       {
@@ -173,14 +202,14 @@ describe("billingAlertsFormat", () => {
     expect(
       normalizeBillingAlertsFromApi(
         {
-          amount: 100,
+          amount: 300,
           emails: [],
           alertLevels: [10, 50, 80],
         },
-        { planLimitCents: 10_000, effectiveLimitCents: 10_000 }
+        { planLimitCents: 30_000, effectiveLimitCents: 30_000 }
       )
     ).toEqual({
-      amount: 100,
+      amount: 300,
       emails: [],
       alertLevels: [10, 50, 80],
     });
diff --git a/apps/webapp/test/billingLimitsRoute.test.ts b/apps/webapp/test/billingLimitsRoute.test.ts
index d85a48ffb24..66f1ac5a7b5 100644
--- a/apps/webapp/test/billingLimitsRoute.test.ts
+++ b/apps/webapp/test/billingLimitsRoute.test.ts
@@ -266,6 +266,27 @@ describe("isBillingLimitFormDirty", () => {
     gracePeriodMs: 86_400_000,
   };
 
+  it("is not dirty when no mode is selected, regardless of other inputs", () => {
+    expect(
+      isBillingLimitFormDirty({
+        billingLimit: unconfiguredLimit,
+        mode: "",
+        customAmount: "999.00",
+        cancelInProgressRuns: true,
+      })
+    ).toBe(false);
+
+    // Even a configured limit stays clean while the form has no selection.
+    expect(
+      isBillingLimitFormDirty({
+        billingLimit: configuredPlanLimit,
+        mode: "",
+        customAmount: "50.00",
+        cancelInProgressRuns: true,
+      })
+    ).toBe(false);
+  });
+
   it("is dirty when billing limit has never been saved", () => {
     expect(
       isBillingLimitFormDirty({
@@ -277,6 +298,26 @@ describe("isBillingLimitFormDirty", () => {
     ).toBe(true);
   });
 
+  it("is dirty when an unconfigured limit picks a real mode (initial save)", () => {
+    expect(
+      isBillingLimitFormDirty({
+        billingLimit: unconfiguredLimit,
+        mode: "plan",
+        customAmount: "",
+        cancelInProgressRuns: false,
+      })
+    ).toBe(true);
+
+    expect(
+      isBillingLimitFormDirty({
+        billingLimit: unconfiguredLimit,
+        mode: "custom",
+        customAmount: "100.00",
+        cancelInProgressRuns: false,
+      })
+    ).toBe(true);
+  });
+
   it("is clean when configured values match saved state", () => {
     expect(
       isBillingLimitFormDirty({
diff --git a/apps/webapp/test/devBranchServices.test.ts b/apps/webapp/test/devBranchServices.test.ts
index 06c06f7c7e8..55cf4fcbbc3 100644
--- a/apps/webapp/test/devBranchServices.test.ts
+++ b/apps/webapp/test/devBranchServices.test.ts
@@ -4,7 +4,11 @@ import slug from "slug";
 import { describe, expect, vi } from "vitest";
 import { ArchiveBranchService } from "~/services/archiveBranch.server";
 import { UpsertBranchService } from "~/services/upsertBranch.server";
-import { createTestOrgProjectWithMember, uniqueId } from "./fixtures/environmentVariablesFixtures";
+import {
+  createTestOrgProjectWithMember,
+  createTestUser,
+  uniqueId,
+} from "./fixtures/environmentVariablesFixtures";
 
 vi.setConfig({ testTimeout: 60_000 });
 
@@ -77,6 +81,62 @@ describe("UpsertBranchService — DEVELOPMENT parent", () => {
     }
   );
 
+  postgresTest("allows different members to use the same branch name", async ({ prisma }) => {
+    const {
+      organization,
+      project,
+      user: firstUser,
+      orgMember: firstMember,
+    } = await createTestOrgProjectWithMember(prisma);
+    const secondUser = await createTestUser(prisma);
+    const secondMember = await prisma.orgMember.create({
+      data: {
+        organizationId: organization.id,
+        userId: secondUser.id,
+        role: "MEMBER",
+      },
+    });
+
+    const [firstRoot, secondRoot] = await Promise.all([
+      createDevRoot(prisma, project.id, organization.id, firstMember.id),
+      createDevRoot(prisma, project.id, organization.id, secondMember.id),
+    ]);
+
+    const options = {
+      projectId: project.id,
+      env: "development" as const,
+      branchName: "shared-name",
+    };
+    const [firstResult, secondResult] = await Promise.all([
+      new UpsertBranchService(prisma).call(
+        { type: "userMembership", userId: firstUser.id },
+        options
+      ),
+      new UpsertBranchService(prisma).call(
+        { type: "userMembership", userId: secondUser.id },
+        options
+      ),
+    ]);
+
+    expect(firstResult.success && secondResult.success).toBe(true);
+    if (!firstResult.success || !secondResult.success) return;
+    expect(firstResult.branch.id).not.toBe(secondResult.branch.id);
+    expect(firstResult.branch.slug).toBe(secondResult.branch.slug);
+    expect(firstResult.branch.shortcode).toBe(`dev-shared-name-${firstRoot.shortcode}`);
+    expect(secondResult.branch.shortcode).toBe(`dev-shared-name-${secondRoot.shortcode}`);
+    expect(firstResult.branch.orgMemberId).toBe(firstMember.id);
+    expect(secondResult.branch.orgMemberId).toBe(secondMember.id);
+
+    const firstRetry = await new UpsertBranchService(prisma).call(
+      { type: "userMembership", userId: firstUser.id },
+      options
+    );
+    expect(firstRetry.success).toBe(true);
+    if (!firstRetry.success) return;
+    expect(firstRetry.alreadyExisted).toBe(true);
+    expect(firstRetry.branch.id).toBe(firstResult.branch.id);
+  });
+
   postgresTest(
     "rejects an invalid branch name without touching the database",
     async ({ prisma }) => {
diff --git a/apps/webapp/test/themePreference.test.ts b/apps/webapp/test/themePreference.test.ts
new file mode 100644
index 00000000000..d8f109476ed
--- /dev/null
+++ b/apps/webapp/test/themePreference.test.ts
@@ -0,0 +1,43 @@
+import { describe, expect, it } from "vitest";
+import { getDashboardPreferences } from "~/services/dashboardPreferences.server";
+import { normalizeThemePreference, type ThemePreference } from "~/utils/themePreference";
+
+const VALID_THEMES: ThemePreference[] = ["classic", "system", "dark", "light"];
+
+describe("normalizeThemePreference", () => {
+  it("returns each valid value unchanged", () => {
+    for (const theme of VALID_THEMES) {
+      expect(normalizeThemePreference(theme)).toBe(theme);
+    }
+  });
+
+  it("falls back to classic for legacy/unknown values", () => {
+    expect(normalizeThemePreference("solarized")).toBe("classic");
+    expect(normalizeThemePreference("")).toBe("classic");
+    expect(normalizeThemePreference(42)).toBe("classic");
+    expect(normalizeThemePreference(null)).toBe("classic");
+  });
+
+  it("falls back to classic for undefined", () => {
+    expect(normalizeThemePreference(undefined)).toBe("classic");
+  });
+});
+
+describe("DashboardPreferences theme schema", () => {
+  it("accepts all four theme values", () => {
+    for (const theme of VALID_THEMES) {
+      const result = getDashboardPreferences({ version: "1", projects: {}, theme });
+      expect(result.theme).toBe(theme);
+    }
+  });
+
+  it("accepts preferences without a theme", () => {
+    const result = getDashboardPreferences({ version: "1", projects: {} });
+    expect(result.theme).toBeUndefined();
+  });
+
+  it("rejects an invalid theme by falling back to defaults", () => {
+    const result = getDashboardPreferences({ version: "1", projects: {}, theme: "neon" });
+    expect(result.theme).toBeUndefined();
+  });
+});
diff --git a/apps/webapp/test/waitpointPresenter.connectedRunsBounded.test.ts b/apps/webapp/test/waitpointPresenter.connectedRunsBounded.test.ts
index 9e2b0bcafb6..ba50d312fd6 100644
--- a/apps/webapp/test/waitpointPresenter.connectedRunsBounded.test.ts
+++ b/apps/webapp/test/waitpointPresenter.connectedRunsBounded.test.ts
@@ -64,6 +64,7 @@ vi.mock("~/presenters/v3/NextRunListPresenter.server", () => ({
 
 import { heteroRunOpsPostgresTest } from "@internal/testcontainers";
 import { PostgresRunStore, RoutingRunStore } from "@internal/run-store";
+import { generateRunOpsId } from "@trigger.dev/core/v3/isomorphic";
 import type { PrismaClient } from "@trigger.dev/database";
 import type { RunOpsPrismaClient } from "@internal/run-ops-database";
 import {
@@ -156,6 +157,7 @@ async function seedRun(
 ) {
   return (prisma as PrismaClient).taskRun.create({
     data: {
+      id: `run_${generateRunOpsId()}`,
       friendlyId,
       taskIdentifier: "my-task",
       status: "PENDING",
diff --git a/apps/webapp/test/waitpointPresenter.danglingConnectedRuns.test.ts b/apps/webapp/test/waitpointPresenter.danglingConnectedRuns.test.ts
index db10bdff620..26c6c6125e5 100644
--- a/apps/webapp/test/waitpointPresenter.danglingConnectedRuns.test.ts
+++ b/apps/webapp/test/waitpointPresenter.danglingConnectedRuns.test.ts
@@ -58,6 +58,7 @@ vi.mock("~/presenters/v3/NextRunListPresenter.server", () => ({
 
 import { heteroRunOpsPostgresTest } from "@internal/testcontainers";
 import { PostgresRunStore, RoutingRunStore } from "@internal/run-store";
+import { generateRunOpsId } from "@trigger.dev/core/v3/isomorphic";
 import type { PrismaClient } from "@trigger.dev/database";
 import type { RunOpsPrismaClient } from "@internal/run-ops-database";
 import {
@@ -141,6 +142,7 @@ async function seedWaitpoint(prisma: RunOpsPrismaClient, ctx: SeedContext, frien
 async function seedRun(prisma: RunOpsPrismaClient, ctx: SeedContext, friendlyId: string) {
   return (prisma as unknown as PrismaClient).taskRun.create({
     data: {
+      id: `run_${generateRunOpsId()}`,
       friendlyId,
       taskIdentifier: "my-task",
       status: "PENDING",
diff --git a/apps/webapp/test/waitpointPresenter.dedicatedConnectedRuns.readthrough.test.ts b/apps/webapp/test/waitpointPresenter.dedicatedConnectedRuns.readthrough.test.ts
index 7b1838d4729..990ad8f9796 100644
--- a/apps/webapp/test/waitpointPresenter.dedicatedConnectedRuns.readthrough.test.ts
+++ b/apps/webapp/test/waitpointPresenter.dedicatedConnectedRuns.readthrough.test.ts
@@ -59,6 +59,7 @@ vi.mock("~/presenters/v3/NextRunListPresenter.server", () => ({
 
 import { heteroRunOpsPostgresTest } from "@internal/testcontainers";
 import { PostgresRunStore, RoutingRunStore } from "@internal/run-store";
+import { generateRunOpsId } from "@trigger.dev/core/v3/isomorphic";
 import type { PrismaClient } from "@trigger.dev/database";
 import type { RunOpsPrismaClient } from "@internal/run-ops-database";
 import { WaitpointPresenter } from "~/presenters/v3/WaitpointPresenter.server";
@@ -147,10 +148,12 @@ async function seedWaitpoint(
 async function seedRun(
   prisma: PrismaClient | RunOpsPrismaClient,
   ctx: SeedContext,
-  friendlyId: string
+  friendlyId: string,
+  id?: string
 ) {
   return (prisma as PrismaClient).taskRun.create({
     data: {
+      ...(id ? { id } : {}),
       friendlyId,
       taskIdentifier: "my-task",
       status: "PENDING",
@@ -216,7 +219,7 @@ describe("WaitpointPresenter against the REAL dedicated run-ops client", () => {
       const waitpoint = await seedWaitpoint(prisma14, ctx, "waitpoint_crossdb");
 
       // The connected run + join live only on the NEW dedicated DB (co-resident with the run).
-      const run = await seedRun(prisma17, ctx, "run_crossnew");
+      const run = await seedRun(prisma17, ctx, "run_crossnew", `run_${generateRunOpsId()}`);
       await prisma17.waitpointRunConnection.create({
         data: { taskRunId: run.id, waitpointId: waitpoint.id },
       });
diff --git a/apps/webapp/test/waitpointPresenter.splitConnectedRuns.test.ts b/apps/webapp/test/waitpointPresenter.splitConnectedRuns.test.ts
index c6523ac3d47..351a7cb7fa7 100644
--- a/apps/webapp/test/waitpointPresenter.splitConnectedRuns.test.ts
+++ b/apps/webapp/test/waitpointPresenter.splitConnectedRuns.test.ts
@@ -62,6 +62,7 @@ vi.mock("~/presenters/v3/NextRunListPresenter.server", () => ({
 
 import { heteroRunOpsPostgresTest } from "@internal/testcontainers";
 import { PostgresRunStore, RoutingRunStore } from "@internal/run-store";
+import { generateRunOpsId } from "@trigger.dev/core/v3/isomorphic";
 import type { PrismaClient } from "@trigger.dev/database";
 import type { RunOpsPrismaClient } from "@internal/run-ops-database";
 import {
@@ -128,10 +129,12 @@ async function seedParents(prisma: PrismaClient, slug: string): Promise<SeedCont
 async function seedRun(
   prisma: PrismaClient | RunOpsPrismaClient,
   ctx: SeedContext,
-  friendlyId: string
+  friendlyId: string,
+  id?: string
 ) {
   return (prisma as PrismaClient).taskRun.create({
     data: {
+      ...(id ? { id } : {}),
       friendlyId,
       taskIdentifier: "my-task",
       status: "PENDING",
@@ -175,7 +178,7 @@ describe("WaitpointPresenter — connected runs SPLIT across both physical DBs",
       // 2 connected runs resident + joined on NEW (below the limit on its own).
       const NEW_RUN_FRIENDLY_IDS = ["run_split_new0", "run_split_new1"];
       for (const friendlyId of NEW_RUN_FRIENDLY_IDS) {
-        const run = await seedRun(prisma17, ctx, friendlyId);
+        const run = await seedRun(prisma17, ctx, friendlyId, `run_${generateRunOpsId()}`);
         await prisma17.waitpointRunConnection.create({
           data: { taskRunId: run.id, waitpointId: waitpoint.id },
         });
diff --git a/docker/scripts/entrypoint.sh b/docker/scripts/entrypoint.sh
index 1871755f985..1e5c7c7cab0 100755
--- a/docker/scripts/entrypoint.sh
+++ b/docker/scripts/entrypoint.sh
@@ -15,7 +15,9 @@ fi
 
 # Run-ops split: migrate the dedicated NEW run-ops database only when it is configured. Single-DB
 # installs never set the URL, so this is a no-op there.
+{ set +x; } 2>/dev/null
 if [ -n "$RUN_OPS_DATABASE_URL" ]; then
+  set -x
   if [ "$SKIP_RUN_OPS_MIGRATIONS" != "1" ]; then
     echo "Running run-ops migrations"
     pnpm --filter @internal/run-ops-database db:migrate:deploy
@@ -24,13 +26,16 @@ if [ -n "$RUN_OPS_DATABASE_URL" ]; then
     echo "SKIP_RUN_OPS_MIGRATIONS=1, skipping run-ops migrations."
   fi
 else
+  set -x
   echo "RUN_OPS_DATABASE_URL not set, skipping run-ops migrations."
 fi
 
 # Run-ops split: keep the legacy runs DB's schema current by applying the full @trigger.dev/database
 # migrations to it too, pointed at its direct (non-pooled) URL. Only runs when that URL is configured;
 # installs that never set it skip this entirely.
+{ set +x; } 2>/dev/null
 if [ -n "$RUN_OPS_LEGACY_DIRECT_URL" ]; then
+  set -x
   if [ "$SKIP_RUN_OPS_LEGACY_MIGRATIONS" != "1" ]; then
     echo "Running legacy run-ops migrations"
     # Subshell with tracing off so `set -x` does not print the DSN (with credentials) to the logs.
@@ -40,6 +45,7 @@ if [ -n "$RUN_OPS_LEGACY_DIRECT_URL" ]; then
     echo "SKIP_RUN_OPS_LEGACY_MIGRATIONS=1, skipping legacy run-ops migrations."
   fi
 else
+  set -x
   echo "RUN_OPS_LEGACY_DIRECT_URL not set, skipping legacy run-ops migrations."
 fi
 
@@ -51,6 +57,7 @@ else
   echo "SKIP_DASHBOARD_AGENT_MIGRATIONS=1, skipping dashboard agent migrations."
 fi
 
+{ set +x; } 2>/dev/null
 if [ -n "$CLICKHOUSE_URL" ] && [ "$SKIP_CLICKHOUSE_MIGRATIONS" != "1" ]; then
   # Run ClickHouse migrations
   echo "Running ClickHouse migrations..."
@@ -76,6 +83,7 @@ elif [ "$SKIP_CLICKHOUSE_MIGRATIONS" = "1" ]; then
 else
   echo "CLICKHOUSE_URL not set, skipping ClickHouse migrations."
 fi
+set -x
 
 # Copy over required prisma files
 cp internal-packages/database/prisma/schema.prisma apps/webapp/prisma/
diff --git a/docs/snippets/node-versions.mdx b/docs/snippets/node-versions.mdx
index 76bc386f810..d11f50f3fc9 100644
--- a/docs/snippets/node-versions.mdx
+++ b/docs/snippets/node-versions.mdx
@@ -1,13 +1,9 @@
 Trigger.dev runs your tasks on specific Node.js versions:
 
-### v3
-
-- Node.js `21.7.3`
-
-### v4
-
 - Node.js `21.7.3` (default)
 - Node.js `22.16.0` (`node-22`)
+- Node.js `24.18.0` (`node-24`)
+- Node.js `26.4.0` (`node-26`)
 - Bun `1.3.3` (`bun`)
 
 You can change the runtime by setting the `runtime` field in your `trigger.config.ts` file.
@@ -16,8 +12,8 @@ You can change the runtime by setting the `runtime` field in your `trigger.confi
 import { defineConfig } from "@trigger.dev/sdk";
 
 export default defineConfig({
-  // "node", "node-22" or "bun"
-  runtime: "node-22",
+  // "node", "node-22", "node-24", "node-26" or "bun"
+  runtime: "node-24",
   project: "<your-project-ref>",
 });
 ```
diff --git a/hosting/k8s/helm/Chart.yaml b/hosting/k8s/helm/Chart.yaml
index 899346acfd3..e40b51845c3 100644
--- a/hosting/k8s/helm/Chart.yaml
+++ b/hosting/k8s/helm/Chart.yaml
@@ -2,8 +2,8 @@ apiVersion: v2
 name: trigger
 description: The official Trigger.dev Helm chart
 type: application
-version: 4.5.6
-appVersion: v4.5.6
+version: 4.5.7
+appVersion: v4.5.7
 home: https://trigger.dev
 sources:
   - https://github.com/triggerdotdev/trigger.dev
diff --git a/internal-packages/llm-model-catalog/src/defaultPrices.ts b/internal-packages/llm-model-catalog/src/defaultPrices.ts
index 982b6b2ec15..fb347c2bef6 100644
--- a/internal-packages/llm-model-catalog/src/defaultPrices.ts
+++ b/internal-packages/llm-model-catalog/src/defaultPrices.ts
@@ -6,3106 +6,3091 @@ import type { DefaultModelDefinition } from "./types.js";
 
 export const defaultModelPrices: DefaultModelDefinition[] = [
   {
-    modelName: "gpt-4o",
-    matchPattern: "(?i)^(openai/)?(gpt-4o)$",
-    startDate: "2024-05-13T23:15:07.670Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000025,
-          input_cached_tokens: 0.00000125,
-          input_cache_read: 0.00000125,
-          output: 0.00001,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4o-2024-05-13",
-    matchPattern: "(?i)^(openai/)?(gpt-4o-2024-05-13)$",
-    startDate: "2024-05-13T23:15:07.670Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000005,
-          output: 0.000015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-1106-preview",
-    matchPattern: "(?i)^(openai/)?(gpt-4-1106-preview)$",
-    startDate: "2024-04-23T10:37:17.092Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00001,
-          output: 0.00003,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-turbo-vision",
-    matchPattern: "(?i)^(openai/)?(gpt-4(-\\d{4})?-vision-preview)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00001,
-          output: 0.00003,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-32k",
-    matchPattern: "(?i)^(openai/)?(gpt-4-32k)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00006,
-          output: 0.00012,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-32k-0613",
-    matchPattern: "(?i)^(openai/)?(gpt-4-32k-0613)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00006,
-          output: 0.00012,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-3.5-turbo-1106",
-    matchPattern: "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-1106)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000001,
-          output: 0.000002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-3.5-turbo-0613",
-    matchPattern: "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-0613)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000015,
-          output: 0.000002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-0613",
-    matchPattern: "(?i)^(openai/)?(gpt-4-0613)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00003,
-          output: 0.00006,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-3.5-turbo-instruct",
-    matchPattern: "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-instruct)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000015,
-          output: 0.000002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-ada-001",
-    matchPattern: "(?i)^(text-ada-001)$",
-    startDate: "2024-01-24T18:18:50.861Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 0.000004,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-babbage-001",
-    matchPattern: "(?i)^(text-babbage-001)$",
-    startDate: "2024-01-24T18:18:50.861Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-curie-001",
-    matchPattern: "(?i)^(text-curie-001)$",
-    startDate: "2024-01-24T18:18:50.861Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 0.00002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-davinci-001",
-    matchPattern: "(?i)^(text-davinci-001)$",
-    startDate: "2024-01-24T18:18:50.861Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 0.00002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-davinci-002",
-    matchPattern: "(?i)^(text-davinci-002)$",
-    startDate: "2024-01-24T18:18:50.861Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 0.00002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-davinci-003",
-    matchPattern: "(?i)^(text-davinci-003)$",
-    startDate: "2024-01-24T18:18:50.861Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 0.00002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-embedding-ada-002-v2",
-    matchPattern: "(?i)^(text-embedding-ada-002-v2)$",
-    startDate: "2024-01-24T18:18:50.861Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 1e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-embedding-ada-002",
-    matchPattern: "(?i)^(text-embedding-ada-002)$",
-    startDate: "2024-01-24T18:18:50.861Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 1e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-3.5-turbo-16k-0613",
-    matchPattern: "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-16k-0613)$",
-    startDate: "2024-02-03T17:29:57.350Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          output: 0.000004,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-3.5-turbo-0301",
-    matchPattern: "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-0301)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000002,
-          output: 0.000002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-32k-0314",
-    matchPattern: "(?i)^(openai/)?(gpt-4-32k-0314)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00006,
-          output: 0.00012,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-0314",
-    matchPattern: "(?i)^(openai/)?(gpt-4-0314)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00003,
-          output: 0.00006,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4",
-    matchPattern: "(?i)^(openai/)?(gpt-4)$",
-    startDate: "2024-01-24T10:19:21.693Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00003,
-          output: 0.00006,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-instant-1.2",
-    matchPattern: "(?i)^(anthropic/)?(claude-instant-1.2)$",
-    startDate: "2024-01-30T15:44:13.447Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00000163,
-          output: 0.00000551,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-2.0",
-    matchPattern: "(?i)^(anthropic/)?(claude-2.0)$",
-    startDate: "2024-01-30T15:44:13.447Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000008,
-          output: 0.000024,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-2.1",
-    matchPattern: "(?i)^(anthropic/)?(claude-2.1)$",
-    startDate: "2024-01-30T15:44:13.447Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000008,
-          output: 0.000024,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-1.3",
-    matchPattern: "(?i)^(anthropic/)?(claude-1.3)$",
-    startDate: "2024-01-30T15:44:13.447Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000008,
-          output: 0.000024,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-1.2",
-    matchPattern: "(?i)^(anthropic/)?(claude-1.2)$",
-    startDate: "2024-01-30T15:44:13.447Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000008,
-          output: 0.000024,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-1.1",
-    matchPattern: "(?i)^(anthropic/)?(claude-1.1)$",
-    startDate: "2024-01-30T15:44:13.447Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000008,
-          output: 0.000024,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-instant-1",
-    matchPattern: "(?i)^(anthropic/)?(claude-instant-1)$",
-    startDate: "2024-01-30T15:44:13.447Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00000163,
-          output: 0.00000551,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "babbage-002",
-    matchPattern: "(?i)^(babbage-002)$",
-    startDate: "2024-01-26T17:35:21.129Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 4e-7,
-          output: 0.0000016,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "davinci-002",
-    matchPattern: "(?i)^(davinci-002)$",
-    startDate: "2024-01-26T17:35:21.129Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000006,
-          output: 0.000012,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-embedding-3-small",
-    matchPattern: "(?i)^(text-embedding-3-small)$",
-    startDate: "2024-01-26T17:35:21.129Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 2e-8,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-embedding-3-large",
-    matchPattern: "(?i)^(text-embedding-3-large)$",
-    startDate: "2024-01-26T17:35:21.129Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 1.3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-3.5-turbo-0125",
-    matchPattern: "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-0125)$",
-    startDate: "2024-01-26T17:35:21.129Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 5e-7,
-          output: 0.0000015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-3.5-turbo",
-    matchPattern: "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo)$",
-    startDate: "2024-02-13T12:00:37.424Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 5e-7,
-          output: 0.0000015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-0125-preview",
-    matchPattern: "(?i)^(openai/)?(gpt-4-0125-preview)$",
-    startDate: "2024-01-26T17:35:21.129Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00001,
-          output: 0.00003,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "ft:gpt-3.5-turbo-1106",
-    matchPattern: "(?i)^(ft:)(gpt-3.5-turbo-1106:)(.+)(:)(.*)(:)(.+)$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          output: 0.000006,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "ft:gpt-3.5-turbo-0613",
-    matchPattern: "(?i)^(ft:)(gpt-3.5-turbo-0613:)(.+)(:)(.*)(:)(.+)$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000012,
-          output: 0.000016,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "ft:davinci-002",
-    matchPattern: "(?i)^(ft:)(davinci-002:)(.+)(:)(.*)(:)(.+)$$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000012,
-          output: 0.000012,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "ft:babbage-002",
-    matchPattern: "(?i)^(ft:)(babbage-002:)(.+)(:)(.*)(:)(.+)$$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000016,
-          output: 0.0000016,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "chat-bison",
-    matchPattern: "(?i)^(chat-bison)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "codechat-bison-32k",
-    matchPattern: "(?i)^(codechat-bison-32k)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "codechat-bison",
-    matchPattern: "(?i)^(codechat-bison)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-bison-32k",
-    matchPattern: "(?i)^(text-bison-32k)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "chat-bison-32k",
-    matchPattern: "(?i)^(chat-bison-32k)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-unicorn",
-    matchPattern: "(?i)^(text-unicorn)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000025,
-          output: 0.0000075,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "text-bison",
-    matchPattern: "(?i)^(text-bison)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "textembedding-gecko",
-    matchPattern: "(?i)^(textembedding-gecko)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 1e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "textembedding-gecko-multilingual",
-    matchPattern: "(?i)^(textembedding-gecko-multilingual)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          total: 1e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "code-gecko",
-    matchPattern: "(?i)^(code-gecko)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "code-bison",
-    matchPattern: "(?i)^(code-bison)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "code-bison-32k",
-    matchPattern: "(?i)^(code-bison-32k)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-01-31T13:25:02.141Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-3.5-turbo-16k",
-    matchPattern: "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-16k)$",
-    startDate: "2024-02-13T12:00:37.424Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 5e-7,
-          output: 0.0000015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-turbo-preview",
-    matchPattern: "(?i)^(openai/)?(gpt-4-turbo-preview)$",
-    startDate: "2024-02-15T21:21:50.947Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00001,
-          output: 0.00003,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-3-opus-20240229",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-3-opus-20240229|anthropic\\.claude-3-opus-20240229-v1:0|claude-3-opus@20240229)$",
-    startDate: "2024-03-07T17:55:38.139Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000015,
-          output: 0.000075,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-3-sonnet-20240229",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-3-sonnet-20240229|anthropic\\.claude-3-sonnet-20240229-v1:0|claude-3-sonnet@20240229)$",
-    startDate: "2024-03-07T17:55:38.139Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          input_tokens: 0.000003,
-          output: 0.000015,
-          output_tokens: 0.000015,
-          cache_creation_input_tokens: 0.00000375,
-          input_cache_creation: 0.00000375,
-          input_cache_creation_5m: 0.00000375,
-          input_cache_creation_1h: 0.000006,
-          cache_read_input_tokens: 3e-7,
-          input_cache_read: 3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-3-haiku-20240307",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-3-haiku-20240307|anthropic\\.claude-3-haiku-20240307-v1:0|claude-3-haiku@20240307)$",
-    startDate: "2024-03-14T09:41:18.736Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 0.00000125,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-1.0-pro-latest",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-1.0-pro-latest)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-04-11T10:27:46.517Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          output: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-1.0-pro",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-1.0-pro)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-04-11T10:27:46.517Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 1.25e-7,
-          output: 3.75e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-1.0-pro-001",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-1.0-pro-001)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-04-11T10:27:46.517Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 1.25e-7,
-          output: 3.75e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-pro",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-pro)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-04-11T10:27:46.517Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 1.25e-7,
-          output: 3.75e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-1.5-pro-latest",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-1.5-pro-latest)(@[a-zA-Z0-9]+)?$",
-    startDate: "2024-04-11T10:27:46.517Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000025,
-          output: 0.0000075,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-turbo-2024-04-09",
-    matchPattern: "(?i)^(openai/)?(gpt-4-turbo-2024-04-09)$",
-    startDate: "2024-04-23T10:37:17.092Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00001,
-          output: 0.00003,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-turbo",
-    matchPattern: "(?i)^(openai/)?(gpt-4-turbo)$",
-    startDate: "2024-04-11T21:13:44.989Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00001,
-          output: 0.00003,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4-preview",
-    matchPattern: "(?i)^(openai/)?(gpt-4-preview)$",
-    startDate: "2024-04-23T10:37:17.092Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00001,
-          output: 0.00003,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-3-5-sonnet-20240620",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-3-5-sonnet-20240620|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-3-5-sonnet-20240620-v1:0|claude-3-5-sonnet@20240620)$",
-    startDate: "2024-06-25T11:47:24.475Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          input_tokens: 0.000003,
-          output: 0.000015,
-          output_tokens: 0.000015,
-          cache_creation_input_tokens: 0.00000375,
-          input_cache_creation: 0.00000375,
-          input_cache_creation_5m: 0.00000375,
-          input_cache_creation_1h: 0.000006,
-          cache_read_input_tokens: 3e-7,
-          input_cache_read: 3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4o-mini",
-    matchPattern: "(?i)^(openai/)?(gpt-4o-mini)$",
-    startDate: "2024-07-18T17:56:09.591Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 1.5e-7,
-          output: 6e-7,
-          input_cached_tokens: 7.5e-8,
-          input_cache_read: 7.5e-8,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4o-mini-2024-07-18",
-    matchPattern: "(?i)^(openai/)?(gpt-4o-mini-2024-07-18)$",
-    startDate: "2024-07-18T17:56:09.591Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 1.5e-7,
-          input_cached_tokens: 7.5e-8,
-          input_cache_read: 7.5e-8,
-          output: 6e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4o-2024-08-06",
-    matchPattern: "(?i)^(openai/)?(gpt-4o-2024-08-06)$",
-    startDate: "2024-08-07T11:54:31.298Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000025,
-          input_cached_tokens: 0.00000125,
-          input_cache_read: 0.00000125,
-          output: 0.00001,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o1-preview",
-    matchPattern: "(?i)^(openai/)?(o1-preview)$",
-    startDate: "2024-09-13T10:01:35.373Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000015,
-          input_cached_tokens: 0.0000075,
-          input_cache_read: 0.0000075,
-          output: 0.00006,
-          output_reasoning_tokens: 0.00006,
-          output_reasoning: 0.00006,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o1-preview-2024-09-12",
-    matchPattern: "(?i)^(openai/)?(o1-preview-2024-09-12)$",
-    startDate: "2024-09-13T10:01:35.373Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000015,
-          input_cached_tokens: 0.0000075,
-          input_cache_read: 0.0000075,
-          output: 0.00006,
-          output_reasoning_tokens: 0.00006,
-          output_reasoning: 0.00006,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o1-mini",
-    matchPattern: "(?i)^(openai/)?(o1-mini)$",
-    startDate: "2024-09-13T10:01:35.373Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000011,
-          input_cached_tokens: 5.5e-7,
-          input_cache_read: 5.5e-7,
-          output: 0.0000044,
-          output_reasoning_tokens: 0.0000044,
-          output_reasoning: 0.0000044,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o1-mini-2024-09-12",
-    matchPattern: "(?i)^(openai/)?(o1-mini-2024-09-12)$",
-    startDate: "2024-09-13T10:01:35.373Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000011,
-          input_cached_tokens: 5.5e-7,
-          input_cache_read: 5.5e-7,
-          output: 0.0000044,
-          output_reasoning_tokens: 0.0000044,
-          output_reasoning: 0.0000044,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-3.5-sonnet-20241022",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-3-5-sonnet-20241022|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-3-5-sonnet-20241022-v2:0|claude-3-5-sonnet-V2@20241022)$",
-    startDate: "2024-10-22T18:48:01.676Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          input_tokens: 0.000003,
-          output: 0.000015,
-          output_tokens: 0.000015,
-          cache_creation_input_tokens: 0.00000375,
-          input_cache_creation: 0.00000375,
-          input_cache_creation_5m: 0.00000375,
-          input_cache_creation_1h: 0.000006,
-          cache_read_input_tokens: 3e-7,
-          input_cache_read: 3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-3.5-sonnet-latest",
-    matchPattern: "(?i)^(anthropic/)?(claude-3-5-sonnet-latest)$",
-    startDate: "2024-10-22T18:48:01.676Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          input_tokens: 0.000003,
-          output: 0.000015,
-          output_tokens: 0.000015,
-          cache_creation_input_tokens: 0.00000375,
-          input_cache_creation: 0.00000375,
-          input_cache_creation_5m: 0.00000375,
-          input_cache_creation_1h: 0.000006,
-          cache_read_input_tokens: 3e-7,
-          input_cache_read: 3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-3-5-haiku-20241022",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-3-5-haiku-20241022|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-3-5-haiku-20241022-v1:0|claude-3-5-haiku-V1@20241022)$",
-    startDate: "2024-11-05T10:30:50.566Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 8e-7,
-          input_tokens: 8e-7,
-          output: 0.000004,
-          output_tokens: 0.000004,
-          cache_creation_input_tokens: 0.000001,
-          input_cache_creation: 0.000001,
-          input_cache_creation_5m: 0.000001,
-          input_cache_creation_1h: 0.0000016,
-          cache_read_input_tokens: 8e-8,
-          input_cache_read: 8e-8,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-3.5-haiku-latest",
-    matchPattern: "(?i)^(anthropic/)?(claude-3-5-haiku-latest)$",
-    startDate: "2024-11-05T10:30:50.566Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 8e-7,
-          input_tokens: 8e-7,
-          output: 0.000004,
-          output_tokens: 0.000004,
-          cache_creation_input_tokens: 0.000001,
-          input_cache_creation: 0.000001,
-          input_cache_creation_5m: 0.000001,
-          input_cache_creation_1h: 0.0000016,
-          cache_read_input_tokens: 8e-8,
-          input_cache_read: 8e-8,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "chatgpt-4o-latest",
-    matchPattern: "(?i)^(chatgpt-4o-latest)$",
-    startDate: "2024-11-25T12:47:17.504Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000005,
-          output: 0.000015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4o-2024-11-20",
-    matchPattern: "(?i)^(openai/)?(gpt-4o-2024-11-20)$",
-    startDate: "2024-12-03T10:06:12.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000025,
-          input_cached_tokens: 0.00000125,
-          input_cache_read: 0.00000125,
-          output: 0.00001,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4o-audio-preview",
-    matchPattern: "(?i)^(openai/)?(gpt-4o-audio-preview)$",
-    startDate: "2024-12-03T10:19:56.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input_text_tokens: 0.0000025,
-          output_text_tokens: 0.00001,
-          input_audio_tokens: 0.0001,
-          input_audio: 0.0001,
-          output_audio_tokens: 0.0002,
-          output_audio: 0.0002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4o-audio-preview-2024-10-01",
-    matchPattern: "(?i)^(openai/)?(gpt-4o-audio-preview-2024-10-01)$",
-    startDate: "2024-12-03T10:19:56.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input_text_tokens: 0.0000025,
-          output_text_tokens: 0.00001,
-          input_audio_tokens: 0.0001,
-          input_audio: 0.0001,
-          output_audio_tokens: 0.0002,
-          output_audio: 0.0002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4o-realtime-preview",
-    matchPattern: "(?i)^(openai/)?(gpt-4o-realtime-preview)$",
-    startDate: "2024-12-03T10:19:56.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input_text_tokens: 0.000005,
-          input_cached_text_tokens: 0.0000025,
-          output_text_tokens: 0.00002,
-          input_audio_tokens: 0.0001,
-          input_audio: 0.0001,
-          input_cached_audio_tokens: 0.00002,
-          output_audio_tokens: 0.0002,
-          output_audio: 0.0002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4o-realtime-preview-2024-10-01",
-    matchPattern: "(?i)^(openai/)?(gpt-4o-realtime-preview-2024-10-01)$",
-    startDate: "2024-12-03T10:19:56.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input_text_tokens: 0.000005,
-          input_cached_text_tokens: 0.0000025,
-          output_text_tokens: 0.00002,
-          input_audio_tokens: 0.0001,
-          input_audio: 0.0001,
-          input_cached_audio_tokens: 0.00002,
-          output_audio_tokens: 0.0002,
-          output_audio: 0.0002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o1",
-    matchPattern: "(?i)^(openai/)?(o1)$",
-    startDate: "2025-01-17T00:01:35.373Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000015,
-          input_cached_tokens: 0.0000075,
-          input_cache_read: 0.0000075,
-          output: 0.00006,
-          output_reasoning_tokens: 0.00006,
-          output_reasoning: 0.00006,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o1-2024-12-17",
-    matchPattern: "(?i)^(openai/)?(o1-2024-12-17)$",
-    startDate: "2025-01-17T00:01:35.373Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000015,
-          input_cached_tokens: 0.0000075,
-          input_cache_read: 0.0000075,
-          output: 0.00006,
-          output_reasoning_tokens: 0.00006,
-          output_reasoning: 0.00006,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o3-mini",
-    matchPattern: "(?i)^(openai/)?(o3-mini)$",
-    startDate: "2025-01-31T20:41:35.373Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000011,
-          input_cached_tokens: 5.5e-7,
-          input_cache_read: 5.5e-7,
-          output: 0.0000044,
-          output_reasoning_tokens: 0.0000044,
-          output_reasoning: 0.0000044,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o3-mini-2025-01-31",
-    matchPattern: "(?i)^(openai/)?(o3-mini-2025-01-31)$",
-    startDate: "2025-01-31T20:41:35.373Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000011,
-          input_cached_tokens: 5.5e-7,
-          input_cache_read: 5.5e-7,
-          output: 0.0000044,
-          output_reasoning_tokens: 0.0000044,
-          output_reasoning: 0.0000044,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-2.0-flash-001",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-2.0-flash-001)(@[a-zA-Z0-9]+)?$",
-    startDate: "2025-02-06T11:11:35.241Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 1e-7,
-          output: 4e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-2.0-flash-lite-preview-02-05",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-2.0-flash-lite-preview-02-05)(@[a-zA-Z0-9]+)?$",
-    startDate: "2025-02-06T11:11:35.241Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 7.5e-8,
-          output: 3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-3.7-sonnet-20250219",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-3.7-sonnet-20250219|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-3.7-sonnet-20250219-v1:0|claude-3-7-sonnet-V1@20250219)$",
-    startDate: "2025-02-25T09:35:39.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          input_tokens: 0.000003,
-          output: 0.000015,
-          output_tokens: 0.000015,
-          cache_creation_input_tokens: 0.00000375,
-          input_cache_creation: 0.00000375,
-          input_cache_creation_5m: 0.00000375,
-          input_cache_creation_1h: 0.000006,
-          cache_read_input_tokens: 3e-7,
-          input_cache_read: 3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-3.7-sonnet-latest",
-    matchPattern: "(?i)^(anthropic/)?(claude-3-7-sonnet-latest)$",
-    startDate: "2025-02-25T09:35:39.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          input_tokens: 0.000003,
-          output: 0.000015,
-          output_tokens: 0.000015,
-          cache_creation_input_tokens: 0.00000375,
-          input_cache_creation: 0.00000375,
-          input_cache_creation_5m: 0.00000375,
-          input_cache_creation_1h: 0.000006,
-          cache_read_input_tokens: 3e-7,
-          input_cache_read: 3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4.5-preview",
-    matchPattern: "(?i)^(openai/)?(gpt-4.5-preview)$",
-    startDate: "2025-02-27T21:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000075,
-          input_cached_tokens: 0.0000375,
-          input_cached_text_tokens: 0.0000375,
-          input_cache_read: 0.0000375,
-          output: 0.00015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4.5-preview-2025-02-27",
-    matchPattern: "(?i)^(openai/)?(gpt-4.5-preview-2025-02-27)$",
-    startDate: "2025-02-27T21:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000075,
-          input_cached_tokens: 0.0000375,
-          input_cached_text_tokens: 0.0000375,
-          input_cache_read: 0.0000375,
-          output: 0.00015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4.1",
-    matchPattern: "(?i)^(openai/)?(gpt-4.1)$",
-    startDate: "2025-04-15T10:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000002,
-          input_cached_tokens: 5e-7,
-          input_cached_text_tokens: 5e-7,
-          input_cache_read: 5e-7,
-          output: 0.000008,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4.1-2025-04-14",
-    matchPattern: "(?i)^(openai/)?(gpt-4.1-2025-04-14)$",
-    startDate: "2025-04-15T10:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000002,
-          input_cached_tokens: 5e-7,
-          input_cached_text_tokens: 5e-7,
-          input_cache_read: 5e-7,
-          output: 0.000008,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4.1-mini-2025-04-14",
-    matchPattern: "(?i)^(openai/)?(gpt-4.1-mini-2025-04-14)$",
-    startDate: "2025-04-15T10:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 4e-7,
-          input_cached_tokens: 1e-7,
-          input_cached_text_tokens: 1e-7,
-          input_cache_read: 1e-7,
-          output: 0.0000016,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4.1-nano-2025-04-14",
-    matchPattern: "(?i)^(openai/)?(gpt-4.1-nano-2025-04-14)$",
-    startDate: "2025-04-15T10:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 1e-7,
-          input_cached_tokens: 2.5e-8,
-          input_cached_text_tokens: 2.5e-8,
-          input_cache_read: 2.5e-8,
-          output: 4e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o3",
-    matchPattern: "(?i)^(openai/)?(o3)$",
-    startDate: "2025-04-16T23:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000002,
-          input_cached_tokens: 5e-7,
-          input_cache_read: 5e-7,
-          output: 0.000008,
-          output_reasoning_tokens: 0.000008,
-          output_reasoning: 0.000008,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o3-2025-04-16",
-    matchPattern: "(?i)^(openai/)?(o3-2025-04-16)$",
-    startDate: "2025-04-16T23:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000002,
-          input_cached_tokens: 5e-7,
-          input_cache_read: 5e-7,
-          output: 0.000008,
-          output_reasoning_tokens: 0.000008,
-          output_reasoning: 0.000008,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o4-mini",
-    matchPattern: "(?i)^(o4-mini)$",
-    startDate: "2025-04-16T23:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000011,
-          input_cached_tokens: 2.75e-7,
-          input_cache_read: 2.75e-7,
-          output: 0.0000044,
-          output_reasoning_tokens: 0.0000044,
-          output_reasoning: 0.0000044,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o4-mini-2025-04-16",
-    matchPattern: "(?i)^(o4-mini-2025-04-16)$",
-    startDate: "2025-04-16T23:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000011,
-          input_cached_tokens: 2.75e-7,
-          input_cache_read: 2.75e-7,
-          output: 0.0000044,
-          output_reasoning_tokens: 0.0000044,
-          output_reasoning: 0.0000044,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-2.0-flash",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-2.0-flash)(@[a-zA-Z0-9]+)?$",
-    startDate: "2025-04-22T10:11:35.241Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 1e-7,
-          output: 4e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-2.0-flash-lite-preview",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-2.0-flash-lite-preview)(@[a-zA-Z0-9]+)?$",
-    startDate: "2025-04-22T10:11:35.241Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 7.5e-8,
-          output: 3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4.1-nano",
-    matchPattern: "(?i)^(openai/)?(gpt-4.1-nano)$",
-    startDate: "2025-04-22T10:11:35.241Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 1e-7,
-          input_cached_tokens: 2.5e-8,
-          input_cached_text_tokens: 2.5e-8,
-          input_cache_read: 2.5e-8,
-          output: 4e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-4.1-mini",
-    matchPattern: "(?i)^(openai/)?(gpt-4.1-mini)$",
-    startDate: "2025-04-22T10:11:35.241Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 4e-7,
-          input_cached_tokens: 1e-7,
-          input_cached_text_tokens: 1e-7,
-          input_cache_read: 1e-7,
-          output: 0.0000016,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-sonnet-4-5-20250929",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-sonnet-4-5(-20250929)?|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-sonnet-4-5(-20250929)?-v1(:0)?|claude-sonnet-4-5-V1(@20250929)?|claude-sonnet-4-5(@20250929)?)$",
-    startDate: "2025-09-29T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          input_tokens: 0.000003,
-          output: 0.000015,
-          output_tokens: 0.000015,
-          cache_creation_input_tokens: 0.00000375,
-          input_cache_creation: 0.00000375,
-          input_cache_creation_5m: 0.00000375,
-          input_cache_creation_1h: 0.000006,
-          cache_read_input_tokens: 3e-7,
-          input_cache_read: 3e-7,
-        },
-      },
-      {
-        name: "Large Context",
-        isDefault: false,
-        priority: 1,
-        conditions: [
+    "modelName": "gpt-4o",
+    "matchPattern": "(?i)^(openai/)?(gpt-4o)$",
+    "startDate": "2024-05-13T23:15:07.670Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000025,
+          "input_cached_tokens": 0.00000125,
+          "input_cache_read": 0.00000125,
+          "output": 0.00001
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4o-2024-05-13",
+    "matchPattern": "(?i)^(openai/)?(gpt-4o-2024-05-13)$",
+    "startDate": "2024-05-13T23:15:07.670Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000005,
+          "output": 0.000015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-1106-preview",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-1106-preview)$",
+    "startDate": "2024-04-23T10:37:17.092Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00001,
+          "output": 0.00003
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-turbo-vision",
+    "matchPattern": "(?i)^(openai/)?(gpt-4(-\\d{4})?-vision-preview)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00001,
+          "output": 0.00003
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-32k",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-32k)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00006,
+          "output": 0.00012
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-32k-0613",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-32k-0613)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00006,
+          "output": 0.00012
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-3.5-turbo-1106",
+    "matchPattern": "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-1106)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000001,
+          "output": 0.000002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-3.5-turbo-0613",
+    "matchPattern": "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-0613)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000015,
+          "output": 0.000002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-0613",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-0613)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00003,
+          "output": 0.00006
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-3.5-turbo-instruct",
+    "matchPattern": "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-instruct)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000015,
+          "output": 0.000002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-ada-001",
+    "matchPattern": "(?i)^(text-ada-001)$",
+    "startDate": "2024-01-24T18:18:50.861Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 0.000004
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-babbage-001",
+    "matchPattern": "(?i)^(text-babbage-001)$",
+    "startDate": "2024-01-24T18:18:50.861Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-curie-001",
+    "matchPattern": "(?i)^(text-curie-001)$",
+    "startDate": "2024-01-24T18:18:50.861Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 0.00002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-davinci-001",
+    "matchPattern": "(?i)^(text-davinci-001)$",
+    "startDate": "2024-01-24T18:18:50.861Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 0.00002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-davinci-002",
+    "matchPattern": "(?i)^(text-davinci-002)$",
+    "startDate": "2024-01-24T18:18:50.861Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 0.00002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-davinci-003",
+    "matchPattern": "(?i)^(text-davinci-003)$",
+    "startDate": "2024-01-24T18:18:50.861Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 0.00002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-embedding-ada-002-v2",
+    "matchPattern": "(?i)^(text-embedding-ada-002-v2)$",
+    "startDate": "2024-01-24T18:18:50.861Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 1e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-embedding-ada-002",
+    "matchPattern": "(?i)^(text-embedding-ada-002)$",
+    "startDate": "2024-01-24T18:18:50.861Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 1e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-3.5-turbo-16k-0613",
+    "matchPattern": "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-16k-0613)$",
+    "startDate": "2024-02-03T17:29:57.350Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "output": 0.000004
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-3.5-turbo-0301",
+    "matchPattern": "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-0301)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000002,
+          "output": 0.000002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-32k-0314",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-32k-0314)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00006,
+          "output": 0.00012
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-0314",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-0314)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00003,
+          "output": 0.00006
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4",
+    "matchPattern": "(?i)^(openai/)?(gpt-4)$",
+    "startDate": "2024-01-24T10:19:21.693Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00003,
+          "output": 0.00006
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-instant-1.2",
+    "matchPattern": "(?i)^(anthropic/)?(claude-instant-1.2)$",
+    "startDate": "2024-01-30T15:44:13.447Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00000163,
+          "output": 0.00000551
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-2.0",
+    "matchPattern": "(?i)^(anthropic/)?(claude-2.0)$",
+    "startDate": "2024-01-30T15:44:13.447Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000008,
+          "output": 0.000024
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-2.1",
+    "matchPattern": "(?i)^(anthropic/)?(claude-2.1)$",
+    "startDate": "2024-01-30T15:44:13.447Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000008,
+          "output": 0.000024
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-1.3",
+    "matchPattern": "(?i)^(anthropic/)?(claude-1.3)$",
+    "startDate": "2024-01-30T15:44:13.447Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000008,
+          "output": 0.000024
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-1.2",
+    "matchPattern": "(?i)^(anthropic/)?(claude-1.2)$",
+    "startDate": "2024-01-30T15:44:13.447Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000008,
+          "output": 0.000024
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-1.1",
+    "matchPattern": "(?i)^(anthropic/)?(claude-1.1)$",
+    "startDate": "2024-01-30T15:44:13.447Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000008,
+          "output": 0.000024
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-instant-1",
+    "matchPattern": "(?i)^(anthropic/)?(claude-instant-1)$",
+    "startDate": "2024-01-30T15:44:13.447Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00000163,
+          "output": 0.00000551
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "babbage-002",
+    "matchPattern": "(?i)^(babbage-002)$",
+    "startDate": "2024-01-26T17:35:21.129Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 4e-7,
+          "output": 0.0000016
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "davinci-002",
+    "matchPattern": "(?i)^(davinci-002)$",
+    "startDate": "2024-01-26T17:35:21.129Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000006,
+          "output": 0.000012
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-embedding-3-small",
+    "matchPattern": "(?i)^(text-embedding-3-small)$",
+    "startDate": "2024-01-26T17:35:21.129Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 2e-8
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-embedding-3-large",
+    "matchPattern": "(?i)^(text-embedding-3-large)$",
+    "startDate": "2024-01-26T17:35:21.129Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 1.3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-3.5-turbo-0125",
+    "matchPattern": "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-0125)$",
+    "startDate": "2024-01-26T17:35:21.129Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 5e-7,
+          "output": 0.0000015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-3.5-turbo",
+    "matchPattern": "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo)$",
+    "startDate": "2024-02-13T12:00:37.424Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 5e-7,
+          "output": 0.0000015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-0125-preview",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-0125-preview)$",
+    "startDate": "2024-01-26T17:35:21.129Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00001,
+          "output": 0.00003
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "ft:gpt-3.5-turbo-1106",
+    "matchPattern": "(?i)^(ft:)(gpt-3.5-turbo-1106:)(.+)(:)(.*)(:)(.+)$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "output": 0.000006
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "ft:gpt-3.5-turbo-0613",
+    "matchPattern": "(?i)^(ft:)(gpt-3.5-turbo-0613:)(.+)(:)(.*)(:)(.+)$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000012,
+          "output": 0.000016
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "ft:davinci-002",
+    "matchPattern": "(?i)^(ft:)(davinci-002:)(.+)(:)(.*)(:)(.+)$$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000012,
+          "output": 0.000012
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "ft:babbage-002",
+    "matchPattern": "(?i)^(ft:)(babbage-002:)(.+)(:)(.*)(:)(.+)$$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000016,
+          "output": 0.0000016
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "chat-bison",
+    "matchPattern": "(?i)^(chat-bison)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "codechat-bison-32k",
+    "matchPattern": "(?i)^(codechat-bison-32k)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "codechat-bison",
+    "matchPattern": "(?i)^(codechat-bison)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-bison-32k",
+    "matchPattern": "(?i)^(text-bison-32k)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "chat-bison-32k",
+    "matchPattern": "(?i)^(chat-bison-32k)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-unicorn",
+    "matchPattern": "(?i)^(text-unicorn)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000025,
+          "output": 0.0000075
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "text-bison",
+    "matchPattern": "(?i)^(text-bison)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "textembedding-gecko",
+    "matchPattern": "(?i)^(textembedding-gecko)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 1e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "textembedding-gecko-multilingual",
+    "matchPattern": "(?i)^(textembedding-gecko-multilingual)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "total": 1e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "code-gecko",
+    "matchPattern": "(?i)^(code-gecko)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "code-bison",
+    "matchPattern": "(?i)^(code-bison)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "code-bison-32k",
+    "matchPattern": "(?i)^(code-bison-32k)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-01-31T13:25:02.141Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-3.5-turbo-16k",
+    "matchPattern": "(?i)^(openai/)?(gpt-)(35|3.5)(-turbo-16k)$",
+    "startDate": "2024-02-13T12:00:37.424Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 5e-7,
+          "output": 0.0000015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-turbo-preview",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-turbo-preview)$",
+    "startDate": "2024-02-15T21:21:50.947Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00001,
+          "output": 0.00003
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-3-opus-20240229",
+    "matchPattern": "(?i)^(anthropic/)?(claude-3-opus-20240229|anthropic\\.claude-3-opus-20240229-v1:0|claude-3-opus@20240229)$",
+    "startDate": "2024-03-07T17:55:38.139Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000015,
+          "output": 0.000075
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-3-sonnet-20240229",
+    "matchPattern": "(?i)^(anthropic/)?(claude-3-sonnet-20240229|anthropic\\.claude-3-sonnet-20240229-v1:0|claude-3-sonnet@20240229)$",
+    "startDate": "2024-03-07T17:55:38.139Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "input_tokens": 0.000003,
+          "output": 0.000015,
+          "output_tokens": 0.000015,
+          "cache_creation_input_tokens": 0.00000375,
+          "input_cache_creation": 0.00000375,
+          "input_cache_creation_5m": 0.00000375,
+          "input_cache_creation_1h": 0.000006,
+          "cache_read_input_tokens": 3e-7,
+          "input_cache_read": 3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-3-haiku-20240307",
+    "matchPattern": "(?i)^(anthropic/)?(claude-3-haiku-20240307|anthropic\\.claude-3-haiku-20240307-v1:0|claude-3-haiku@20240307)$",
+    "startDate": "2024-03-14T09:41:18.736Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 0.00000125
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-1.0-pro-latest",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-1.0-pro-latest)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-04-11T10:27:46.517Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "output": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-1.0-pro",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-1.0-pro)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-04-11T10:27:46.517Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 1.25e-7,
+          "output": 3.75e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-1.0-pro-001",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-1.0-pro-001)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-04-11T10:27:46.517Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 1.25e-7,
+          "output": 3.75e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-pro",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-pro)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-04-11T10:27:46.517Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 1.25e-7,
+          "output": 3.75e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-1.5-pro-latest",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-1.5-pro-latest)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2024-04-11T10:27:46.517Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000025,
+          "output": 0.0000075
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-turbo-2024-04-09",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-turbo-2024-04-09)$",
+    "startDate": "2024-04-23T10:37:17.092Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00001,
+          "output": 0.00003
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-turbo",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-turbo)$",
+    "startDate": "2024-04-11T21:13:44.989Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00001,
+          "output": 0.00003
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4-preview",
+    "matchPattern": "(?i)^(openai/)?(gpt-4-preview)$",
+    "startDate": "2024-04-23T10:37:17.092Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00001,
+          "output": 0.00003
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-3-5-sonnet-20240620",
+    "matchPattern": "(?i)^(anthropic/)?(claude-3-5-sonnet-20240620|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-3-5-sonnet-20240620-v1:0|claude-3-5-sonnet@20240620)$",
+    "startDate": "2024-06-25T11:47:24.475Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "input_tokens": 0.000003,
+          "output": 0.000015,
+          "output_tokens": 0.000015,
+          "cache_creation_input_tokens": 0.00000375,
+          "input_cache_creation": 0.00000375,
+          "input_cache_creation_5m": 0.00000375,
+          "input_cache_creation_1h": 0.000006,
+          "cache_read_input_tokens": 3e-7,
+          "input_cache_read": 3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4o-mini",
+    "matchPattern": "(?i)^(openai/)?(gpt-4o-mini)$",
+    "startDate": "2024-07-18T17:56:09.591Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 1.5e-7,
+          "output": 6e-7,
+          "input_cached_tokens": 7.5e-8,
+          "input_cache_read": 7.5e-8
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4o-mini-2024-07-18",
+    "matchPattern": "(?i)^(openai/)?(gpt-4o-mini-2024-07-18)$",
+    "startDate": "2024-07-18T17:56:09.591Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 1.5e-7,
+          "input_cached_tokens": 7.5e-8,
+          "input_cache_read": 7.5e-8,
+          "output": 6e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4o-2024-08-06",
+    "matchPattern": "(?i)^(openai/)?(gpt-4o-2024-08-06)$",
+    "startDate": "2024-08-07T11:54:31.298Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000025,
+          "input_cached_tokens": 0.00000125,
+          "input_cache_read": 0.00000125,
+          "output": 0.00001
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o1-preview",
+    "matchPattern": "(?i)^(openai/)?(o1-preview)$",
+    "startDate": "2024-09-13T10:01:35.373Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000015,
+          "input_cached_tokens": 0.0000075,
+          "input_cache_read": 0.0000075,
+          "output": 0.00006,
+          "output_reasoning_tokens": 0.00006,
+          "output_reasoning": 0.00006
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o1-preview-2024-09-12",
+    "matchPattern": "(?i)^(openai/)?(o1-preview-2024-09-12)$",
+    "startDate": "2024-09-13T10:01:35.373Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000015,
+          "input_cached_tokens": 0.0000075,
+          "input_cache_read": 0.0000075,
+          "output": 0.00006,
+          "output_reasoning_tokens": 0.00006,
+          "output_reasoning": 0.00006
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o1-mini",
+    "matchPattern": "(?i)^(openai/)?(o1-mini)$",
+    "startDate": "2024-09-13T10:01:35.373Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000011,
+          "input_cached_tokens": 5.5e-7,
+          "input_cache_read": 5.5e-7,
+          "output": 0.0000044,
+          "output_reasoning_tokens": 0.0000044,
+          "output_reasoning": 0.0000044
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o1-mini-2024-09-12",
+    "matchPattern": "(?i)^(openai/)?(o1-mini-2024-09-12)$",
+    "startDate": "2024-09-13T10:01:35.373Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000011,
+          "input_cached_tokens": 5.5e-7,
+          "input_cache_read": 5.5e-7,
+          "output": 0.0000044,
+          "output_reasoning_tokens": 0.0000044,
+          "output_reasoning": 0.0000044
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-3.5-sonnet-20241022",
+    "matchPattern": "(?i)^(anthropic/)?(claude-3-5-sonnet-20241022|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-3-5-sonnet-20241022-v2:0|claude-3-5-sonnet-V2@20241022)$",
+    "startDate": "2024-10-22T18:48:01.676Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "input_tokens": 0.000003,
+          "output": 0.000015,
+          "output_tokens": 0.000015,
+          "cache_creation_input_tokens": 0.00000375,
+          "input_cache_creation": 0.00000375,
+          "input_cache_creation_5m": 0.00000375,
+          "input_cache_creation_1h": 0.000006,
+          "cache_read_input_tokens": 3e-7,
+          "input_cache_read": 3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-3.5-sonnet-latest",
+    "matchPattern": "(?i)^(anthropic/)?(claude-3-5-sonnet-latest)$",
+    "startDate": "2024-10-22T18:48:01.676Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "input_tokens": 0.000003,
+          "output": 0.000015,
+          "output_tokens": 0.000015,
+          "cache_creation_input_tokens": 0.00000375,
+          "input_cache_creation": 0.00000375,
+          "input_cache_creation_5m": 0.00000375,
+          "input_cache_creation_1h": 0.000006,
+          "cache_read_input_tokens": 3e-7,
+          "input_cache_read": 3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-3-5-haiku-20241022",
+    "matchPattern": "(?i)^(anthropic/)?(claude-3-5-haiku-20241022|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-3-5-haiku-20241022-v1:0|claude-3-5-haiku-V1@20241022)$",
+    "startDate": "2024-11-05T10:30:50.566Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 8e-7,
+          "input_tokens": 8e-7,
+          "output": 0.000004,
+          "output_tokens": 0.000004,
+          "cache_creation_input_tokens": 0.000001,
+          "input_cache_creation": 0.000001,
+          "input_cache_creation_5m": 0.000001,
+          "input_cache_creation_1h": 0.0000016,
+          "cache_read_input_tokens": 8e-8,
+          "input_cache_read": 8e-8
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-3.5-haiku-latest",
+    "matchPattern": "(?i)^(anthropic/)?(claude-3-5-haiku-latest)$",
+    "startDate": "2024-11-05T10:30:50.566Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 8e-7,
+          "input_tokens": 8e-7,
+          "output": 0.000004,
+          "output_tokens": 0.000004,
+          "cache_creation_input_tokens": 0.000001,
+          "input_cache_creation": 0.000001,
+          "input_cache_creation_5m": 0.000001,
+          "input_cache_creation_1h": 0.0000016,
+          "cache_read_input_tokens": 8e-8,
+          "input_cache_read": 8e-8
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "chatgpt-4o-latest",
+    "matchPattern": "(?i)^(chatgpt-4o-latest)$",
+    "startDate": "2024-11-25T12:47:17.504Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000005,
+          "output": 0.000015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4o-2024-11-20",
+    "matchPattern": "(?i)^(openai/)?(gpt-4o-2024-11-20)$",
+    "startDate": "2024-12-03T10:06:12.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000025,
+          "input_cached_tokens": 0.00000125,
+          "input_cache_read": 0.00000125,
+          "output": 0.00001
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4o-audio-preview",
+    "matchPattern": "(?i)^(openai/)?(gpt-4o-audio-preview)$",
+    "startDate": "2024-12-03T10:19:56.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input_text_tokens": 0.0000025,
+          "output_text_tokens": 0.00001,
+          "input_audio_tokens": 0.0001,
+          "input_audio": 0.0001,
+          "output_audio_tokens": 0.0002,
+          "output_audio": 0.0002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4o-audio-preview-2024-10-01",
+    "matchPattern": "(?i)^(openai/)?(gpt-4o-audio-preview-2024-10-01)$",
+    "startDate": "2024-12-03T10:19:56.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input_text_tokens": 0.0000025,
+          "output_text_tokens": 0.00001,
+          "input_audio_tokens": 0.0001,
+          "input_audio": 0.0001,
+          "output_audio_tokens": 0.0002,
+          "output_audio": 0.0002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4o-realtime-preview",
+    "matchPattern": "(?i)^(openai/)?(gpt-4o-realtime-preview)$",
+    "startDate": "2024-12-03T10:19:56.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input_text_tokens": 0.000005,
+          "input_cached_text_tokens": 0.0000025,
+          "output_text_tokens": 0.00002,
+          "input_audio_tokens": 0.0001,
+          "input_audio": 0.0001,
+          "input_cached_audio_tokens": 0.00002,
+          "output_audio_tokens": 0.0002,
+          "output_audio": 0.0002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4o-realtime-preview-2024-10-01",
+    "matchPattern": "(?i)^(openai/)?(gpt-4o-realtime-preview-2024-10-01)$",
+    "startDate": "2024-12-03T10:19:56.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input_text_tokens": 0.000005,
+          "input_cached_text_tokens": 0.0000025,
+          "output_text_tokens": 0.00002,
+          "input_audio_tokens": 0.0001,
+          "input_audio": 0.0001,
+          "input_cached_audio_tokens": 0.00002,
+          "output_audio_tokens": 0.0002,
+          "output_audio": 0.0002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o1",
+    "matchPattern": "(?i)^(openai/)?(o1)$",
+    "startDate": "2025-01-17T00:01:35.373Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000015,
+          "input_cached_tokens": 0.0000075,
+          "input_cache_read": 0.0000075,
+          "output": 0.00006,
+          "output_reasoning_tokens": 0.00006,
+          "output_reasoning": 0.00006
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o1-2024-12-17",
+    "matchPattern": "(?i)^(openai/)?(o1-2024-12-17)$",
+    "startDate": "2025-01-17T00:01:35.373Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000015,
+          "input_cached_tokens": 0.0000075,
+          "input_cache_read": 0.0000075,
+          "output": 0.00006,
+          "output_reasoning_tokens": 0.00006,
+          "output_reasoning": 0.00006
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o3-mini",
+    "matchPattern": "(?i)^(openai/)?(o3-mini)$",
+    "startDate": "2025-01-31T20:41:35.373Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000011,
+          "input_cached_tokens": 5.5e-7,
+          "input_cache_read": 5.5e-7,
+          "output": 0.0000044,
+          "output_reasoning_tokens": 0.0000044,
+          "output_reasoning": 0.0000044
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o3-mini-2025-01-31",
+    "matchPattern": "(?i)^(openai/)?(o3-mini-2025-01-31)$",
+    "startDate": "2025-01-31T20:41:35.373Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000011,
+          "input_cached_tokens": 5.5e-7,
+          "input_cache_read": 5.5e-7,
+          "output": 0.0000044,
+          "output_reasoning_tokens": 0.0000044,
+          "output_reasoning": 0.0000044
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-2.0-flash-001",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-2.0-flash-001)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2025-02-06T11:11:35.241Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 1e-7,
+          "output": 4e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-2.0-flash-lite-preview-02-05",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-2.0-flash-lite-preview-02-05)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2025-02-06T11:11:35.241Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 7.5e-8,
+          "output": 3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-3.7-sonnet-20250219",
+    "matchPattern": "(?i)^(anthropic/)?(claude-3.7-sonnet-20250219|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-3.7-sonnet-20250219-v1:0|claude-3-7-sonnet-V1@20250219)$",
+    "startDate": "2025-02-25T09:35:39.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "input_tokens": 0.000003,
+          "output": 0.000015,
+          "output_tokens": 0.000015,
+          "cache_creation_input_tokens": 0.00000375,
+          "input_cache_creation": 0.00000375,
+          "input_cache_creation_5m": 0.00000375,
+          "input_cache_creation_1h": 0.000006,
+          "cache_read_input_tokens": 3e-7,
+          "input_cache_read": 3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-3.7-sonnet-latest",
+    "matchPattern": "(?i)^(anthropic/)?(claude-3-7-sonnet-latest)$",
+    "startDate": "2025-02-25T09:35:39.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "input_tokens": 0.000003,
+          "output": 0.000015,
+          "output_tokens": 0.000015,
+          "cache_creation_input_tokens": 0.00000375,
+          "input_cache_creation": 0.00000375,
+          "input_cache_creation_5m": 0.00000375,
+          "input_cache_creation_1h": 0.000006,
+          "cache_read_input_tokens": 3e-7,
+          "input_cache_read": 3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4.5-preview",
+    "matchPattern": "(?i)^(openai/)?(gpt-4.5-preview)$",
+    "startDate": "2025-02-27T21:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000075,
+          "input_cached_tokens": 0.0000375,
+          "input_cached_text_tokens": 0.0000375,
+          "input_cache_read": 0.0000375,
+          "output": 0.00015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4.5-preview-2025-02-27",
+    "matchPattern": "(?i)^(openai/)?(gpt-4.5-preview-2025-02-27)$",
+    "startDate": "2025-02-27T21:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000075,
+          "input_cached_tokens": 0.0000375,
+          "input_cached_text_tokens": 0.0000375,
+          "input_cache_read": 0.0000375,
+          "output": 0.00015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4.1",
+    "matchPattern": "(?i)^(openai/)?(gpt-4.1)$",
+    "startDate": "2025-04-15T10:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000002,
+          "input_cached_tokens": 5e-7,
+          "input_cached_text_tokens": 5e-7,
+          "input_cache_read": 5e-7,
+          "output": 0.000008
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4.1-2025-04-14",
+    "matchPattern": "(?i)^(openai/)?(gpt-4.1-2025-04-14)$",
+    "startDate": "2025-04-15T10:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000002,
+          "input_cached_tokens": 5e-7,
+          "input_cached_text_tokens": 5e-7,
+          "input_cache_read": 5e-7,
+          "output": 0.000008
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4.1-mini-2025-04-14",
+    "matchPattern": "(?i)^(openai/)?(gpt-4.1-mini-2025-04-14)$",
+    "startDate": "2025-04-15T10:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 4e-7,
+          "input_cached_tokens": 1e-7,
+          "input_cached_text_tokens": 1e-7,
+          "input_cache_read": 1e-7,
+          "output": 0.0000016
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4.1-nano-2025-04-14",
+    "matchPattern": "(?i)^(openai/)?(gpt-4.1-nano-2025-04-14)$",
+    "startDate": "2025-04-15T10:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 1e-7,
+          "input_cached_tokens": 2.5e-8,
+          "input_cached_text_tokens": 2.5e-8,
+          "input_cache_read": 2.5e-8,
+          "output": 4e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o3",
+    "matchPattern": "(?i)^(openai/)?(o3)$",
+    "startDate": "2025-04-16T23:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000002,
+          "input_cached_tokens": 5e-7,
+          "input_cache_read": 5e-7,
+          "output": 0.000008,
+          "output_reasoning_tokens": 0.000008,
+          "output_reasoning": 0.000008
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o3-2025-04-16",
+    "matchPattern": "(?i)^(openai/)?(o3-2025-04-16)$",
+    "startDate": "2025-04-16T23:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000002,
+          "input_cached_tokens": 5e-7,
+          "input_cache_read": 5e-7,
+          "output": 0.000008,
+          "output_reasoning_tokens": 0.000008,
+          "output_reasoning": 0.000008
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o4-mini",
+    "matchPattern": "(?i)^(o4-mini)$",
+    "startDate": "2025-04-16T23:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000011,
+          "input_cached_tokens": 2.75e-7,
+          "input_cache_read": 2.75e-7,
+          "output": 0.0000044,
+          "output_reasoning_tokens": 0.0000044,
+          "output_reasoning": 0.0000044
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o4-mini-2025-04-16",
+    "matchPattern": "(?i)^(o4-mini-2025-04-16)$",
+    "startDate": "2025-04-16T23:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000011,
+          "input_cached_tokens": 2.75e-7,
+          "input_cache_read": 2.75e-7,
+          "output": 0.0000044,
+          "output_reasoning_tokens": 0.0000044,
+          "output_reasoning": 0.0000044
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-2.0-flash",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-2.0-flash)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2025-04-22T10:11:35.241Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 1e-7,
+          "output": 4e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-2.0-flash-lite-preview",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-2.0-flash-lite-preview)(@[a-zA-Z0-9]+)?$",
+    "startDate": "2025-04-22T10:11:35.241Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 7.5e-8,
+          "output": 3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4.1-nano",
+    "matchPattern": "(?i)^(openai/)?(gpt-4.1-nano)$",
+    "startDate": "2025-04-22T10:11:35.241Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 1e-7,
+          "input_cached_tokens": 2.5e-8,
+          "input_cached_text_tokens": 2.5e-8,
+          "input_cache_read": 2.5e-8,
+          "output": 4e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-4.1-mini",
+    "matchPattern": "(?i)^(openai/)?(gpt-4.1-mini)$",
+    "startDate": "2025-04-22T10:11:35.241Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 4e-7,
+          "input_cached_tokens": 1e-7,
+          "input_cached_text_tokens": 1e-7,
+          "input_cache_read": 1e-7,
+          "output": 0.0000016
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-sonnet-4-5-20250929",
+    "matchPattern": "(?i)^(anthropic/)?(claude-sonnet-4-5(-20250929)?|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-sonnet-4-5(-20250929)?-v1(:0)?|claude-sonnet-4-5-V1(@20250929)?|claude-sonnet-4-5(@20250929)?)$",
+    "startDate": "2025-09-29T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "input_tokens": 0.000003,
+          "output": 0.000015,
+          "output_tokens": 0.000015,
+          "cache_creation_input_tokens": 0.00000375,
+          "input_cache_creation": 0.00000375,
+          "input_cache_creation_5m": 0.00000375,
+          "input_cache_creation_1h": 0.000006,
+          "cache_read_input_tokens": 3e-7,
+          "input_cache_read": 3e-7
+        }
+      },
+      {
+        "name": "Large Context",
+        "isDefault": false,
+        "priority": 1,
+        "conditions": [
           {
-            usageDetailPattern: "input",
-            operator: "gt",
-            value: 200000,
-          },
+            "usageDetailPattern": "input",
+            "operator": "gt",
+            "value": 200000
+          }
         ],
-        prices: {
-          input: 0.000006,
-          input_tokens: 0.000006,
-          output: 0.0000225,
-          output_tokens: 0.0000225,
-          cache_creation_input_tokens: 0.0000075,
-          input_cache_creation: 0.0000075,
-          input_cache_creation_5m: 0.0000075,
-          input_cache_creation_1h: 0.000012,
-          cache_read_input_tokens: 6e-7,
-          input_cache_read: 6e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-sonnet-4-20250514",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-sonnet-4(-20250514)?|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-sonnet-4(-20250514)?-v1(:0)?|claude-sonnet-4-V1(@20250514)?|claude-sonnet-4(@20250514)?)$",
-    startDate: "2025-05-22T17:09:02.131Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          input_tokens: 0.000003,
-          output: 0.000015,
-          output_tokens: 0.000015,
-          cache_creation_input_tokens: 0.00000375,
-          input_cache_creation: 0.00000375,
-          input_cache_creation_5m: 0.00000375,
-          input_cache_creation_1h: 0.000006,
-          cache_read_input_tokens: 3e-7,
-          input_cache_read: 3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-sonnet-4-latest",
-    matchPattern: "(?i)^(anthropic/)?(claude-sonnet-4-latest)$",
-    startDate: "2025-05-22T17:09:02.131Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          input_tokens: 0.000003,
-          output: 0.000015,
-          output_tokens: 0.000015,
-          cache_creation_input_tokens: 0.00000375,
-          input_cache_creation: 0.00000375,
-          input_cache_creation_5m: 0.00000375,
-          input_cache_creation_1h: 0.000006,
-          cache_read_input_tokens: 3e-7,
-          input_cache_read: 3e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-opus-4-20250514",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-opus-4(-20250514)?|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-opus-4(-20250514)?-v1(:0)?|claude-opus-4(@20250514)?)$",
-    startDate: "2025-05-22T17:09:02.131Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000015,
-          input_tokens: 0.000015,
-          output: 0.000075,
-          output_tokens: 0.000075,
-          cache_creation_input_tokens: 0.00001875,
-          input_cache_creation: 0.00001875,
-          input_cache_creation_5m: 0.00001875,
-          input_cache_creation_1h: 0.00003,
-          cache_read_input_tokens: 0.0000015,
-          input_cache_read: 0.0000015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o3-pro",
-    matchPattern: "(?i)^(openai/)?(o3-pro)$",
-    startDate: "2025-06-10T22:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00002,
-          output: 0.00008,
-          output_reasoning_tokens: 0.00008,
-          output_reasoning: 0.00008,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o3-pro-2025-06-10",
-    matchPattern: "(?i)^(openai/)?(o3-pro-2025-06-10)$",
-    startDate: "2025-06-10T22:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00002,
-          output: 0.00008,
-          output_reasoning_tokens: 0.00008,
-          output_reasoning: 0.00008,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o1-pro",
-    matchPattern: "(?i)^(openai/)?(o1-pro)$",
-    startDate: "2025-06-10T22:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00015,
-          output: 0.0006,
-          output_reasoning_tokens: 0.0006,
-          output_reasoning: 0.0006,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "o1-pro-2025-03-19",
-    matchPattern: "(?i)^(openai/)?(o1-pro-2025-03-19)$",
-    startDate: "2025-06-10T22:26:54.132Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00015,
-          output: 0.0006,
-          output_reasoning_tokens: 0.0006,
-          output_reasoning: 0.0006,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-2.5-flash",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-2.5-flash)$",
-    startDate: "2025-07-03T13:44:06.964Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 3e-7,
-          input_text: 3e-7,
-          input_modality_1: 3e-7,
-          prompt_token_count: 3e-7,
-          promptTokenCount: 3e-7,
-          input_cached_tokens: 3e-8,
-          cached_content_token_count: 3e-8,
-          output: 0.0000025,
-          output_text: 0.0000025,
-          output_modality_1: 0.0000025,
-          candidates_token_count: 0.0000025,
-          candidatesTokenCount: 0.0000025,
-          thoughtsTokenCount: 0.0000025,
-          thoughts_token_count: 0.0000025,
-          output_reasoning: 0.0000025,
-          input_audio_tokens: 0.000001,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-2.5-flash-lite",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-2.5-flash-lite)$",
-    startDate: "2025-07-03T13:44:06.964Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 1e-7,
-          input_text: 1e-7,
-          input_modality_1: 1e-7,
-          prompt_token_count: 1e-7,
-          promptTokenCount: 1e-7,
-          input_cached_tokens: 2.5e-8,
-          cached_content_token_count: 2.5e-8,
-          output: 4e-7,
-          output_text: 4e-7,
-          output_modality_1: 4e-7,
-          candidates_token_count: 4e-7,
-          candidatesTokenCount: 4e-7,
-          thoughtsTokenCount: 4e-7,
-          thoughts_token_count: 4e-7,
-          output_reasoning: 4e-7,
-          input_audio_tokens: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-opus-4-1-20250805",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-opus-4-1(-20250805)?|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-opus-4-1(-20250805)?-v1(:0)?|claude-opus-4-1(@20250805)?)$",
-    startDate: "2025-08-05T15:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000015,
-          input_tokens: 0.000015,
-          output: 0.000075,
-          output_tokens: 0.000075,
-          cache_creation_input_tokens: 0.00001875,
-          input_cache_creation: 0.00001875,
-          input_cache_creation_5m: 0.00001875,
-          input_cache_creation_1h: 0.00003,
-          cache_read_input_tokens: 0.0000015,
-          input_cache_read: 0.0000015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5",
-    matchPattern: "(?i)^(openai/)?(gpt-5)$",
-    startDate: "2025-08-07T16:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00000125,
-          input_cached_tokens: 1.25e-7,
-          output: 0.00001,
-          input_cache_read: 1.25e-7,
-          output_reasoning_tokens: 0.00001,
-          output_reasoning: 0.00001,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5-2025-08-07",
-    matchPattern: "(?i)^(openai/)?(gpt-5-2025-08-07)$",
-    startDate: "2025-08-11T08:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00000125,
-          input_cached_tokens: 1.25e-7,
-          output: 0.00001,
-          input_cache_read: 1.25e-7,
-          output_reasoning_tokens: 0.00001,
-          output_reasoning: 0.00001,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5-mini",
-    matchPattern: "(?i)^(openai/)?(gpt-5-mini)$",
-    startDate: "2025-08-07T16:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          input_cached_tokens: 2.5e-8,
-          output: 0.000002,
-          input_cache_read: 2.5e-8,
-          output_reasoning_tokens: 0.000002,
-          output_reasoning: 0.000002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5-mini-2025-08-07",
-    matchPattern: "(?i)^(openai/)?(gpt-5-mini-2025-08-07)$",
-    startDate: "2025-08-11T08:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          input_cached_tokens: 2.5e-8,
-          output: 0.000002,
-          input_cache_read: 2.5e-8,
-          output_reasoning_tokens: 0.000002,
-          output_reasoning: 0.000002,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5-nano",
-    matchPattern: "(?i)^(openai/)?(gpt-5-nano)$",
-    startDate: "2025-08-07T16:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 5e-8,
-          input_cached_tokens: 5e-9,
-          output: 4e-7,
-          input_cache_read: 5e-9,
-          output_reasoning_tokens: 4e-7,
-          output_reasoning: 4e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5-nano-2025-08-07",
-    matchPattern: "(?i)^(openai/)?(gpt-5-nano-2025-08-07)$",
-    startDate: "2025-08-11T08:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 5e-8,
-          input_cached_tokens: 5e-9,
-          output: 4e-7,
-          input_cache_read: 5e-9,
-          output_reasoning_tokens: 4e-7,
-          output_reasoning: 4e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5-chat-latest",
-    matchPattern: "(?i)^(openai/)?(gpt-5-chat-latest)$",
-    startDate: "2025-08-07T16:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00000125,
-          input_cached_tokens: 1.25e-7,
-          output: 0.00001,
-          input_cache_read: 1.25e-7,
-          output_reasoning_tokens: 0.00001,
-          output_reasoning: 0.00001,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5-pro",
-    matchPattern: "(?i)^(openai/)?(gpt-5-pro)$",
-    startDate: "2025-10-07T08:03:54.727Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000015,
-          output: 0.00012,
-          output_reasoning_tokens: 0.00012,
-          output_reasoning: 0.00012,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5-pro-2025-10-06",
-    matchPattern: "(?i)^(openai/)?(gpt-5-pro-2025-10-06)$",
-    startDate: "2025-10-07T08:03:54.727Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000015,
-          output: 0.00012,
-          output_reasoning_tokens: 0.00012,
-          output_reasoning: 0.00012,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-haiku-4-5-20251001",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-haiku-4-5-20251001|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-haiku-4-5-20251001-v1:0|claude-4-5-haiku@20251001)$",
-    startDate: "2025-10-16T08:20:44.558Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000001,
-          input_tokens: 0.000001,
-          output: 0.000005,
-          output_tokens: 0.000005,
-          cache_creation_input_tokens: 0.00000125,
-          input_cache_creation: 0.00000125,
-          input_cache_creation_5m: 0.00000125,
-          input_cache_creation_1h: 0.000002,
-          cache_read_input_tokens: 1e-7,
-          input_cache_read: 1e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.1",
-    matchPattern: "(?i)^(openai/)?(gpt-5.1)$",
-    startDate: "2025-11-14T08:57:23.481Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00000125,
-          input_cached_tokens: 1.25e-7,
-          output: 0.00001,
-          input_cache_read: 1.25e-7,
-          output_reasoning_tokens: 0.00001,
-          output_reasoning: 0.00001,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.1-2025-11-13",
-    matchPattern: "(?i)^(openai/)?(gpt-5.1-2025-11-13)$",
-    startDate: "2025-11-14T08:57:23.481Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00000125,
-          input_cached_tokens: 1.25e-7,
-          output: 0.00001,
-          input_cache_read: 1.25e-7,
-          output_reasoning_tokens: 0.00001,
-          output_reasoning: 0.00001,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-opus-4-5-20251101",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-opus-4-5(-20251101)?|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-opus-4-5(-20251101)?-v1(:0)?|claude-opus-4-5(@20251101)?)$",
-    startDate: "2025-11-24T20:53:27.571Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000005,
-          input_tokens: 0.000005,
-          output: 0.000025,
-          output_tokens: 0.000025,
-          cache_creation_input_tokens: 0.00000625,
-          input_cache_creation: 0.00000625,
-          input_cache_creation_5m: 0.00000625,
-          input_cache_creation_1h: 0.00001,
-          cache_read_input_tokens: 5e-7,
-          input_cache_read: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-sonnet-4-6",
-    matchPattern:
-      "(?i)^(anthropic\\/)?(claude-sonnet-4-6|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-sonnet-4-6(-v1(:0)?)?|claude-sonnet-4-6)$",
-    startDate: "2026-02-18T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000003,
-          input_tokens: 0.000003,
-          output: 0.000015,
-          output_tokens: 0.000015,
-          cache_creation_input_tokens: 0.00000375,
-          input_cache_creation: 0.00000375,
-          input_cache_creation_5m: 0.00000375,
-          input_cache_creation_1h: 0.000006,
-          cache_read_input_tokens: 3e-7,
-          input_cache_read: 3e-7,
-        },
-      },
-      {
-        name: "Large Context",
-        isDefault: false,
-        priority: 1,
-        conditions: [
+        "prices": {
+          "input": 0.000006,
+          "input_tokens": 0.000006,
+          "output": 0.0000225,
+          "output_tokens": 0.0000225,
+          "cache_creation_input_tokens": 0.0000075,
+          "input_cache_creation": 0.0000075,
+          "input_cache_creation_5m": 0.0000075,
+          "input_cache_creation_1h": 0.000012,
+          "cache_read_input_tokens": 6e-7,
+          "input_cache_read": 6e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-sonnet-4-20250514",
+    "matchPattern": "(?i)^(anthropic/)?(claude-sonnet-4(-20250514)?|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-sonnet-4(-20250514)?-v1(:0)?|claude-sonnet-4-V1(@20250514)?|claude-sonnet-4(@20250514)?)$",
+    "startDate": "2025-05-22T17:09:02.131Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "input_tokens": 0.000003,
+          "output": 0.000015,
+          "output_tokens": 0.000015,
+          "cache_creation_input_tokens": 0.00000375,
+          "input_cache_creation": 0.00000375,
+          "input_cache_creation_5m": 0.00000375,
+          "input_cache_creation_1h": 0.000006,
+          "cache_read_input_tokens": 3e-7,
+          "input_cache_read": 3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-sonnet-4-latest",
+    "matchPattern": "(?i)^(anthropic/)?(claude-sonnet-4-latest)$",
+    "startDate": "2025-05-22T17:09:02.131Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "input_tokens": 0.000003,
+          "output": 0.000015,
+          "output_tokens": 0.000015,
+          "cache_creation_input_tokens": 0.00000375,
+          "input_cache_creation": 0.00000375,
+          "input_cache_creation_5m": 0.00000375,
+          "input_cache_creation_1h": 0.000006,
+          "cache_read_input_tokens": 3e-7,
+          "input_cache_read": 3e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-opus-4-20250514",
+    "matchPattern": "(?i)^(anthropic/)?(claude-opus-4(-20250514)?|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-opus-4(-20250514)?-v1(:0)?|claude-opus-4(@20250514)?)$",
+    "startDate": "2025-05-22T17:09:02.131Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000015,
+          "input_tokens": 0.000015,
+          "output": 0.000075,
+          "output_tokens": 0.000075,
+          "cache_creation_input_tokens": 0.00001875,
+          "input_cache_creation": 0.00001875,
+          "input_cache_creation_5m": 0.00001875,
+          "input_cache_creation_1h": 0.00003,
+          "cache_read_input_tokens": 0.0000015,
+          "input_cache_read": 0.0000015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o3-pro",
+    "matchPattern": "(?i)^(openai/)?(o3-pro)$",
+    "startDate": "2025-06-10T22:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00002,
+          "output": 0.00008,
+          "output_reasoning_tokens": 0.00008,
+          "output_reasoning": 0.00008
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o3-pro-2025-06-10",
+    "matchPattern": "(?i)^(openai/)?(o3-pro-2025-06-10)$",
+    "startDate": "2025-06-10T22:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00002,
+          "output": 0.00008,
+          "output_reasoning_tokens": 0.00008,
+          "output_reasoning": 0.00008
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o1-pro",
+    "matchPattern": "(?i)^(openai/)?(o1-pro)$",
+    "startDate": "2025-06-10T22:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00015,
+          "output": 0.0006,
+          "output_reasoning_tokens": 0.0006,
+          "output_reasoning": 0.0006
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "o1-pro-2025-03-19",
+    "matchPattern": "(?i)^(openai/)?(o1-pro-2025-03-19)$",
+    "startDate": "2025-06-10T22:26:54.132Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00015,
+          "output": 0.0006,
+          "output_reasoning_tokens": 0.0006,
+          "output_reasoning": 0.0006
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-2.5-flash",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-2.5-flash)$",
+    "startDate": "2025-07-03T13:44:06.964Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 3e-7,
+          "input_text": 3e-7,
+          "input_modality_1": 3e-7,
+          "prompt_token_count": 3e-7,
+          "promptTokenCount": 3e-7,
+          "input_cached_tokens": 3e-8,
+          "cached_content_token_count": 3e-8,
+          "output": 0.0000025,
+          "output_text": 0.0000025,
+          "output_modality_1": 0.0000025,
+          "candidates_token_count": 0.0000025,
+          "candidatesTokenCount": 0.0000025,
+          "thoughtsTokenCount": 0.0000025,
+          "thoughts_token_count": 0.0000025,
+          "output_reasoning": 0.0000025,
+          "input_audio_tokens": 0.000001
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-2.5-flash-lite",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-2.5-flash-lite)$",
+    "startDate": "2025-07-03T13:44:06.964Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 1e-7,
+          "input_text": 1e-7,
+          "input_modality_1": 1e-7,
+          "prompt_token_count": 1e-7,
+          "promptTokenCount": 1e-7,
+          "input_cached_tokens": 2.5e-8,
+          "cached_content_token_count": 2.5e-8,
+          "output": 4e-7,
+          "output_text": 4e-7,
+          "output_modality_1": 4e-7,
+          "candidates_token_count": 4e-7,
+          "candidatesTokenCount": 4e-7,
+          "thoughtsTokenCount": 4e-7,
+          "thoughts_token_count": 4e-7,
+          "output_reasoning": 4e-7,
+          "input_audio_tokens": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-opus-4-1-20250805",
+    "matchPattern": "(?i)^(anthropic/)?(claude-opus-4-1(-20250805)?|(eu\\.|us\\.|apac\\.)?anthropic\\.claude-opus-4-1(-20250805)?-v1(:0)?|claude-opus-4-1(@20250805)?)$",
+    "startDate": "2025-08-05T15:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000015,
+          "input_tokens": 0.000015,
+          "output": 0.000075,
+          "output_tokens": 0.000075,
+          "cache_creation_input_tokens": 0.00001875,
+          "input_cache_creation": 0.00001875,
+          "input_cache_creation_5m": 0.00001875,
+          "input_cache_creation_1h": 0.00003,
+          "cache_read_input_tokens": 0.0000015,
+          "input_cache_read": 0.0000015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5",
+    "matchPattern": "(?i)^(openai/)?(gpt-5)$",
+    "startDate": "2025-08-07T16:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00000125,
+          "input_cached_tokens": 1.25e-7,
+          "output": 0.00001,
+          "input_cache_read": 1.25e-7,
+          "output_reasoning_tokens": 0.00001,
+          "output_reasoning": 0.00001
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5-2025-08-07",
+    "matchPattern": "(?i)^(openai/)?(gpt-5-2025-08-07)$",
+    "startDate": "2025-08-11T08:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00000125,
+          "input_cached_tokens": 1.25e-7,
+          "output": 0.00001,
+          "input_cache_read": 1.25e-7,
+          "output_reasoning_tokens": 0.00001,
+          "output_reasoning": 0.00001
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5-mini",
+    "matchPattern": "(?i)^(openai/)?(gpt-5-mini)$",
+    "startDate": "2025-08-07T16:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "input_cached_tokens": 2.5e-8,
+          "output": 0.000002,
+          "input_cache_read": 2.5e-8,
+          "output_reasoning_tokens": 0.000002,
+          "output_reasoning": 0.000002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5-mini-2025-08-07",
+    "matchPattern": "(?i)^(openai/)?(gpt-5-mini-2025-08-07)$",
+    "startDate": "2025-08-11T08:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "input_cached_tokens": 2.5e-8,
+          "output": 0.000002,
+          "input_cache_read": 2.5e-8,
+          "output_reasoning_tokens": 0.000002,
+          "output_reasoning": 0.000002
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5-nano",
+    "matchPattern": "(?i)^(openai/)?(gpt-5-nano)$",
+    "startDate": "2025-08-07T16:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 5e-8,
+          "input_cached_tokens": 5e-9,
+          "output": 4e-7,
+          "input_cache_read": 5e-9,
+          "output_reasoning_tokens": 4e-7,
+          "output_reasoning": 4e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5-nano-2025-08-07",
+    "matchPattern": "(?i)^(openai/)?(gpt-5-nano-2025-08-07)$",
+    "startDate": "2025-08-11T08:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 5e-8,
+          "input_cached_tokens": 5e-9,
+          "output": 4e-7,
+          "input_cache_read": 5e-9,
+          "output_reasoning_tokens": 4e-7,
+          "output_reasoning": 4e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5-chat-latest",
+    "matchPattern": "(?i)^(openai/)?(gpt-5-chat-latest)$",
+    "startDate": "2025-08-07T16:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00000125,
+          "input_cached_tokens": 1.25e-7,
+          "output": 0.00001,
+          "input_cache_read": 1.25e-7,
+          "output_reasoning_tokens": 0.00001,
+          "output_reasoning": 0.00001
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5-pro",
+    "matchPattern": "(?i)^(openai/)?(gpt-5-pro)$",
+    "startDate": "2025-10-07T08:03:54.727Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000015,
+          "output": 0.00012,
+          "output_reasoning_tokens": 0.00012,
+          "output_reasoning": 0.00012
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5-pro-2025-10-06",
+    "matchPattern": "(?i)^(openai/)?(gpt-5-pro-2025-10-06)$",
+    "startDate": "2025-10-07T08:03:54.727Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000015,
+          "output": 0.00012,
+          "output_reasoning_tokens": 0.00012,
+          "output_reasoning": 0.00012
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-haiku-4-5-20251001",
+    "matchPattern": "(?i)^(anthropic/)?(claude-haiku-4-5-20251001|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-haiku-4-5-20251001-v1:0|claude-4-5-haiku@20251001)$",
+    "startDate": "2025-10-16T08:20:44.558Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000001,
+          "input_tokens": 0.000001,
+          "output": 0.000005,
+          "output_tokens": 0.000005,
+          "cache_creation_input_tokens": 0.00000125,
+          "input_cache_creation": 0.00000125,
+          "input_cache_creation_5m": 0.00000125,
+          "input_cache_creation_1h": 0.000002,
+          "cache_read_input_tokens": 1e-7,
+          "input_cache_read": 1e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.1",
+    "matchPattern": "(?i)^(openai/)?(gpt-5.1)$",
+    "startDate": "2025-11-14T08:57:23.481Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00000125,
+          "input_cached_tokens": 1.25e-7,
+          "output": 0.00001,
+          "input_cache_read": 1.25e-7,
+          "output_reasoning_tokens": 0.00001,
+          "output_reasoning": 0.00001
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.1-2025-11-13",
+    "matchPattern": "(?i)^(openai/)?(gpt-5.1-2025-11-13)$",
+    "startDate": "2025-11-14T08:57:23.481Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00000125,
+          "input_cached_tokens": 1.25e-7,
+          "output": 0.00001,
+          "input_cache_read": 1.25e-7,
+          "output_reasoning_tokens": 0.00001,
+          "output_reasoning": 0.00001
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-opus-4-5-20251101",
+    "matchPattern": "(?i)^(anthropic/)?(claude-opus-4-5(-20251101)?|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-opus-4-5(-20251101)?-v1(:0)?|claude-opus-4-5(@20251101)?)$",
+    "startDate": "2025-11-24T20:53:27.571Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000005,
+          "input_tokens": 0.000005,
+          "output": 0.000025,
+          "output_tokens": 0.000025,
+          "cache_creation_input_tokens": 0.00000625,
+          "input_cache_creation": 0.00000625,
+          "input_cache_creation_5m": 0.00000625,
+          "input_cache_creation_1h": 0.00001,
+          "cache_read_input_tokens": 5e-7,
+          "input_cache_read": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-sonnet-4-6",
+    "matchPattern": "(?i)^(anthropic\\/)?(claude-sonnet-4-6|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-sonnet-4-6(-v1(:0)?)?|claude-sonnet-4-6)$",
+    "startDate": "2026-02-18T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000003,
+          "input_tokens": 0.000003,
+          "output": 0.000015,
+          "output_tokens": 0.000015,
+          "cache_creation_input_tokens": 0.00000375,
+          "input_cache_creation": 0.00000375,
+          "input_cache_creation_5m": 0.00000375,
+          "input_cache_creation_1h": 0.000006,
+          "cache_read_input_tokens": 3e-7,
+          "input_cache_read": 3e-7
+        }
+      },
+      {
+        "name": "Large Context",
+        "isDefault": false,
+        "priority": 1,
+        "conditions": [
           {
-            usageDetailPattern: "input",
-            operator: "gt",
-            value: 200000,
-          },
+            "usageDetailPattern": "input",
+            "operator": "gt",
+            "value": 200000
+          }
         ],
-        prices: {
-          input: 0.000006,
-          input_tokens: 0.000006,
-          output: 0.0000225,
-          output_tokens: 0.0000225,
-          cache_creation_input_tokens: 0.0000075,
-          input_cache_creation: 0.0000075,
-          input_cache_creation_5m: 0.0000075,
-          input_cache_creation_1h: 0.000012,
-          cache_read_input_tokens: 6e-7,
-          input_cache_read: 6e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "claude-opus-4-6",
-    matchPattern:
-      "(?i)^(anthropic/)?(claude-opus-4-6|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-opus-4-6-v1(:0)?|claude-opus-4-6)$",
-    startDate: "2026-02-09T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000005,
-          input_tokens: 0.000005,
-          output: 0.000025,
-          output_tokens: 0.000025,
-          cache_creation_input_tokens: 0.00000625,
-          input_cache_creation: 0.00000625,
-          input_cache_creation_5m: 0.00000625,
-          input_cache_creation_1h: 0.00001,
-          cache_read_input_tokens: 5e-7,
-          input_cache_read: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-2.5-pro",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-2.5-pro)$",
-    startDate: "2025-11-26T13:27:53.545Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00000125,
-          input_text: 0.00000125,
-          input_modality_1: 0.00000125,
-          prompt_token_count: 0.00000125,
-          promptTokenCount: 0.00000125,
-          input_cached_tokens: 1.25e-7,
-          cached_content_token_count: 1.25e-7,
-          output: 0.00001,
-          output_text: 0.00001,
-          output_modality_1: 0.00001,
-          candidates_token_count: 0.00001,
-          candidatesTokenCount: 0.00001,
-          thoughtsTokenCount: 0.00001,
-          thoughts_token_count: 0.00001,
-          output_reasoning: 0.00001,
-        },
-      },
-      {
-        name: "Large Context",
-        isDefault: false,
-        priority: 1,
-        conditions: [
+        "prices": {
+          "input": 0.000006,
+          "input_tokens": 0.000006,
+          "output": 0.0000225,
+          "output_tokens": 0.0000225,
+          "cache_creation_input_tokens": 0.0000075,
+          "input_cache_creation": 0.0000075,
+          "input_cache_creation_5m": 0.0000075,
+          "input_cache_creation_1h": 0.000012,
+          "cache_read_input_tokens": 6e-7,
+          "input_cache_read": 6e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "claude-opus-4-6",
+    "matchPattern": "(?i)^(anthropic/)?(claude-opus-4-6|(eu\\.|us\\.|apac\\.|global\\.)?anthropic\\.claude-opus-4-6-v1(:0)?|claude-opus-4-6)$",
+    "startDate": "2026-02-09T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000005,
+          "input_tokens": 0.000005,
+          "output": 0.000025,
+          "output_tokens": 0.000025,
+          "cache_creation_input_tokens": 0.00000625,
+          "input_cache_creation": 0.00000625,
+          "input_cache_creation_5m": 0.00000625,
+          "input_cache_creation_1h": 0.00001,
+          "cache_read_input_tokens": 5e-7,
+          "input_cache_read": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-2.5-pro",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-2.5-pro)$",
+    "startDate": "2025-11-26T13:27:53.545Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00000125,
+          "input_text": 0.00000125,
+          "input_modality_1": 0.00000125,
+          "prompt_token_count": 0.00000125,
+          "promptTokenCount": 0.00000125,
+          "input_cached_tokens": 1.25e-7,
+          "cached_content_token_count": 1.25e-7,
+          "output": 0.00001,
+          "output_text": 0.00001,
+          "output_modality_1": 0.00001,
+          "candidates_token_count": 0.00001,
+          "candidatesTokenCount": 0.00001,
+          "thoughtsTokenCount": 0.00001,
+          "thoughts_token_count": 0.00001,
+          "output_reasoning": 0.00001
+        }
+      },
+      {
+        "name": "Large Context",
+        "isDefault": false,
+        "priority": 1,
+        "conditions": [
           {
-            usageDetailPattern: "(input|prompt|cached)",
-            operator: "gt",
-            value: 200000,
-          },
+            "usageDetailPattern": "(input|prompt|cached)",
+            "operator": "gt",
+            "value": 200000
+          }
         ],
-        prices: {
-          input: 0.0000025,
-          input_text: 0.0000025,
-          input_modality_1: 0.0000025,
-          prompt_token_count: 0.0000025,
-          promptTokenCount: 0.0000025,
-          input_cached_tokens: 2.5e-7,
-          cached_content_token_count: 2.5e-7,
-          output: 0.000015,
-          output_text: 0.000015,
-          output_modality_1: 0.000015,
-          candidates_token_count: 0.000015,
-          candidatesTokenCount: 0.000015,
-          thoughtsTokenCount: 0.000015,
-          thoughts_token_count: 0.000015,
-          output_reasoning: 0.000015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-3-pro-preview",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-3-pro-preview)$",
-    startDate: "2025-11-26T13:27:53.545Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000002,
-          input_text: 0.000002,
-          input_modality_1: 0.000002,
-          prompt_token_count: 0.000002,
-          promptTokenCount: 0.000002,
-          input_cached_tokens: 2e-7,
-          cached_content_token_count: 2e-7,
-          output: 0.000012,
-          output_text: 0.000012,
-          output_modality_1: 0.000012,
-          candidates_token_count: 0.000012,
-          candidatesTokenCount: 0.000012,
-          thoughtsTokenCount: 0.000012,
-          thoughts_token_count: 0.000012,
-          output_reasoning: 0.000012,
-        },
-      },
-      {
-        name: "Large Context",
-        isDefault: false,
-        priority: 1,
-        conditions: [
+        "prices": {
+          "input": 0.0000025,
+          "input_text": 0.0000025,
+          "input_modality_1": 0.0000025,
+          "prompt_token_count": 0.0000025,
+          "promptTokenCount": 0.0000025,
+          "input_cached_tokens": 2.5e-7,
+          "cached_content_token_count": 2.5e-7,
+          "output": 0.000015,
+          "output_text": 0.000015,
+          "output_modality_1": 0.000015,
+          "candidates_token_count": 0.000015,
+          "candidatesTokenCount": 0.000015,
+          "thoughtsTokenCount": 0.000015,
+          "thoughts_token_count": 0.000015,
+          "output_reasoning": 0.000015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-3-pro-preview",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-3-pro-preview)$",
+    "startDate": "2025-11-26T13:27:53.545Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000002,
+          "input_text": 0.000002,
+          "input_modality_1": 0.000002,
+          "prompt_token_count": 0.000002,
+          "promptTokenCount": 0.000002,
+          "input_cached_tokens": 2e-7,
+          "cached_content_token_count": 2e-7,
+          "output": 0.000012,
+          "output_text": 0.000012,
+          "output_modality_1": 0.000012,
+          "candidates_token_count": 0.000012,
+          "candidatesTokenCount": 0.000012,
+          "thoughtsTokenCount": 0.000012,
+          "thoughts_token_count": 0.000012,
+          "output_reasoning": 0.000012
+        }
+      },
+      {
+        "name": "Large Context",
+        "isDefault": false,
+        "priority": 1,
+        "conditions": [
           {
-            usageDetailPattern: "(input|prompt|cached)",
-            operator: "gt",
-            value: 200000,
-          },
+            "usageDetailPattern": "(input|prompt|cached)",
+            "operator": "gt",
+            "value": 200000
+          }
         ],
-        prices: {
-          input: 0.000004,
-          input_text: 0.000004,
-          input_modality_1: 0.000004,
-          prompt_token_count: 0.000004,
-          promptTokenCount: 0.000004,
-          input_cached_tokens: 4e-7,
-          cached_content_token_count: 4e-7,
-          output: 0.000018,
-          output_text: 0.000018,
-          output_modality_1: 0.000018,
-          candidates_token_count: 0.000018,
-          candidatesTokenCount: 0.000018,
-          thoughtsTokenCount: 0.000018,
-          thoughts_token_count: 0.000018,
-          output_reasoning: 0.000018,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-3.1-pro-preview",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-3.1-pro-preview(-customtools)?)$",
-    startDate: "2026-02-19T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000002,
-          input_modality_1: 0.000002,
-          input_text: 0.000002,
-          prompt_token_count: 0.000002,
-          promptTokenCount: 0.000002,
-          input_cached_tokens: 2e-7,
-          cached_content_token_count: 2e-7,
-          output: 0.000012,
-          output_text: 0.000012,
-          output_modality_1: 0.000012,
-          candidates_token_count: 0.000012,
-          candidatesTokenCount: 0.000012,
-          thoughtsTokenCount: 0.000012,
-          thoughts_token_count: 0.000012,
-          output_reasoning: 0.000012,
-        },
-      },
-      {
-        name: "Large Context",
-        isDefault: false,
-        priority: 1,
-        conditions: [
+        "prices": {
+          "input": 0.000004,
+          "input_text": 0.000004,
+          "input_modality_1": 0.000004,
+          "prompt_token_count": 0.000004,
+          "promptTokenCount": 0.000004,
+          "input_cached_tokens": 4e-7,
+          "cached_content_token_count": 4e-7,
+          "output": 0.000018,
+          "output_text": 0.000018,
+          "output_modality_1": 0.000018,
+          "candidates_token_count": 0.000018,
+          "candidatesTokenCount": 0.000018,
+          "thoughtsTokenCount": 0.000018,
+          "thoughts_token_count": 0.000018,
+          "output_reasoning": 0.000018
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-3.1-pro-preview",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-3.1-pro-preview(-customtools)?)$",
+    "startDate": "2026-02-19T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000002,
+          "input_modality_1": 0.000002,
+          "input_text": 0.000002,
+          "prompt_token_count": 0.000002,
+          "promptTokenCount": 0.000002,
+          "input_cached_tokens": 2e-7,
+          "cached_content_token_count": 2e-7,
+          "output": 0.000012,
+          "output_text": 0.000012,
+          "output_modality_1": 0.000012,
+          "candidates_token_count": 0.000012,
+          "candidatesTokenCount": 0.000012,
+          "thoughtsTokenCount": 0.000012,
+          "thoughts_token_count": 0.000012,
+          "output_reasoning": 0.000012
+        }
+      },
+      {
+        "name": "Large Context",
+        "isDefault": false,
+        "priority": 1,
+        "conditions": [
           {
-            usageDetailPattern: "(input|prompt|cached)",
-            operator: "gt",
-            value: 200000,
-          },
+            "usageDetailPattern": "(input|prompt|cached)",
+            "operator": "gt",
+            "value": 200000
+          }
         ],
-        prices: {
-          input: 0.000004,
-          input_modality_1: 0.000004,
-          input_text: 0.000004,
-          prompt_token_count: 0.000004,
-          promptTokenCount: 0.000004,
-          input_cached_tokens: 4e-7,
-          cached_content_token_count: 4e-7,
-          output: 0.000018,
-          output_text: 0.000018,
-          output_modality_1: 0.000018,
-          candidates_token_count: 0.000018,
-          candidatesTokenCount: 0.000018,
-          thoughtsTokenCount: 0.000018,
-          thoughts_token_count: 0.000018,
-          output_reasoning: 0.000018,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.2",
-    matchPattern: "(?i)^(openai/)?(gpt-5.2)$",
-    startDate: "2025-12-12T09:00:06.513Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00000175,
-          input_cached_tokens: 1.75e-7,
-          input_cache_read: 1.75e-7,
-          output: 0.000014,
-          output_reasoning_tokens: 0.000014,
-          output_reasoning: 0.000014,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.2-2025-12-11",
-    matchPattern: "(?i)^(openai/)?(gpt-5.2-2025-12-11)$",
-    startDate: "2025-12-12T09:00:06.513Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00000175,
-          input_cached_tokens: 1.75e-7,
-          input_cache_read: 1.75e-7,
-          output: 0.000014,
-          output_reasoning_tokens: 0.000014,
-          output_reasoning: 0.000014,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.2-pro",
-    matchPattern: "(?i)^(openai/)?(gpt-5.2-pro)$",
-    startDate: "2025-12-12T09:00:06.513Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000021,
-          output: 0.000168,
-          output_reasoning_tokens: 0.000168,
-          output_reasoning: 0.000168,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.2-pro-2025-12-11",
-    matchPattern: "(?i)^(openai/)?(gpt-5.2-pro-2025-12-11)$",
-    startDate: "2025-12-12T09:00:06.513Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.000021,
-          output: 0.000168,
-          output_reasoning_tokens: 0.000168,
-          output_reasoning: 0.000168,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.4",
-    matchPattern: "(?i)^(openai/)?(gpt-5.4)$",
-    startDate: "2026-03-05T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000025,
-          input_cached_tokens: 2.5e-7,
-          input_cache_read: 2.5e-7,
-          output: 0.000015,
-          output_reasoning_tokens: 0.000015,
-          output_reasoning: 0.000015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.4-pro",
-    matchPattern: "(?i)^(openai/)?(gpt-5.4-pro)$",
-    startDate: "2026-03-05T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00003,
-          output: 0.00018,
-          output_reasoning_tokens: 0.00018,
-          output_reasoning: 0.00018,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.4-2026-03-05",
-    matchPattern: "(?i)^(openai/)?(gpt-5.4-2026-03-05)$",
-    startDate: "2026-03-05T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.0000025,
-          input_cached_tokens: 2.5e-7,
-          input_cache_read: 2.5e-7,
-          output: 0.000015,
-          output_reasoning_tokens: 0.000015,
-          output_reasoning: 0.000015,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.4-pro-2026-03-05",
-    matchPattern: "(?i)^(openai/)?(gpt-5.4-pro-2026-03-05)$",
-    startDate: "2026-03-05T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 0.00003,
-          output: 0.00018,
-          output_reasoning_tokens: 0.00018,
-          output_reasoning: 0.00018,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.4-mini",
-    matchPattern: "(?i)^(openai\\/)?(gpt-5.4-mini)$",
-    startDate: "2026-03-18T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 7.5e-7,
-          input_cached_tokens: 7.5e-8,
-          input_cache_read: 7.5e-8,
-          output: 0.0000045,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.4-mini-2026-03-17",
-    matchPattern: "(?i)^(openai\\/)?(gpt-5.4-mini-2026-03-17)$",
-    startDate: "2026-03-18T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 7.5e-7,
-          input_cached_tokens: 7.5e-8,
-          input_cache_read: 7.5e-8,
-          output: 0.0000045,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.4-nano",
-    matchPattern: "(?i)^(openai\\/)?(gpt-5.4-nano)$",
-    startDate: "2026-03-18T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2e-7,
-          input_cached_tokens: 2e-8,
-          input_cache_read: 2e-8,
-          output: 0.00000125,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gpt-5.4-nano-2026-03-17",
-    matchPattern: "(?i)^(openai\\/)?(gpt-5.4-nano-2026-03-17)$",
-    startDate: "2026-03-18T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2e-7,
-          input_cached_tokens: 2e-8,
-          input_cache_read: 2e-8,
-          output: 0.00000125,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-3-flash-preview",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-3-flash-preview)$",
-    startDate: "2025-12-21T12:01:42.282Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 5e-7,
-          input_text: 5e-7,
-          input_modality_1: 5e-7,
-          prompt_token_count: 5e-7,
-          promptTokenCount: 5e-7,
-          input_cached_tokens: 5e-8,
-          cached_content_token_count: 5e-8,
-          output: 0.000003,
-          output_text: 0.000003,
-          output_modality_1: 0.000003,
-          candidates_token_count: 0.000003,
-          candidatesTokenCount: 0.000003,
-          thoughtsTokenCount: 0.000003,
-          thoughts_token_count: 0.000003,
-          output_reasoning: 0.000003,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-3.1-flash-lite-preview",
-    matchPattern: "(?i)^(google(ai)?/)?(gemini-3.1-flash-lite-preview)$",
-    startDate: "2026-03-03T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input: 2.5e-7,
-          input_modality_1: 2.5e-7,
-          input_text: 2.5e-7,
-          prompt_token_count: 2.5e-7,
-          promptTokenCount: 2.5e-7,
-          input_cached_tokens: 2.5e-8,
-          cached_content_token_count: 2.5e-8,
-          output: 0.0000015,
-          output_text: 0.0000015,
-          output_modality_1: 0.0000015,
-          candidates_token_count: 0.0000015,
-          candidatesTokenCount: 0.0000015,
-          thoughtsTokenCount: 0.0000015,
-          thoughts_token_count: 0.0000015,
-          output_reasoning: 0.0000015,
-          input_audio_tokens: 5e-7,
-        },
-      },
-    ],
-  },
-  {
-    modelName: "gemini-live-2.5-flash-native-audio",
-    matchPattern: "(?i)^(google/)?(gemini-live-2.5-flash-native-audio)$",
-    startDate: "2026-03-16T00:00:00.000Z",
-    pricingTiers: [
-      {
-        name: "Standard",
-        isDefault: true,
-        priority: 0,
-        conditions: [],
-        prices: {
-          input_text: 5e-7,
-          input_audio: 0.000003,
-          input_image: 0.000003,
-          output_text: 0.000002,
-          output_audio: 0.000012,
-        },
-      },
-    ],
-  },
+        "prices": {
+          "input": 0.000004,
+          "input_modality_1": 0.000004,
+          "input_text": 0.000004,
+          "prompt_token_count": 0.000004,
+          "promptTokenCount": 0.000004,
+          "input_cached_tokens": 4e-7,
+          "cached_content_token_count": 4e-7,
+          "output": 0.000018,
+          "output_text": 0.000018,
+          "output_modality_1": 0.000018,
+          "candidates_token_count": 0.000018,
+          "candidatesTokenCount": 0.000018,
+          "thoughtsTokenCount": 0.000018,
+          "thoughts_token_count": 0.000018,
+          "output_reasoning": 0.000018
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.2",
+    "matchPattern": "(?i)^(openai/)?(gpt-5.2)$",
+    "startDate": "2025-12-12T09:00:06.513Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00000175,
+          "input_cached_tokens": 1.75e-7,
+          "input_cache_read": 1.75e-7,
+          "output": 0.000014,
+          "output_reasoning_tokens": 0.000014,
+          "output_reasoning": 0.000014
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.2-2025-12-11",
+    "matchPattern": "(?i)^(openai/)?(gpt-5.2-2025-12-11)$",
+    "startDate": "2025-12-12T09:00:06.513Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00000175,
+          "input_cached_tokens": 1.75e-7,
+          "input_cache_read": 1.75e-7,
+          "output": 0.000014,
+          "output_reasoning_tokens": 0.000014,
+          "output_reasoning": 0.000014
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.2-pro",
+    "matchPattern": "(?i)^(openai/)?(gpt-5.2-pro)$",
+    "startDate": "2025-12-12T09:00:06.513Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000021,
+          "output": 0.000168,
+          "output_reasoning_tokens": 0.000168,
+          "output_reasoning": 0.000168
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.2-pro-2025-12-11",
+    "matchPattern": "(?i)^(openai/)?(gpt-5.2-pro-2025-12-11)$",
+    "startDate": "2025-12-12T09:00:06.513Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.000021,
+          "output": 0.000168,
+          "output_reasoning_tokens": 0.000168,
+          "output_reasoning": 0.000168
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.4",
+    "matchPattern": "(?i)^(openai/)?(gpt-5.4)$",
+    "startDate": "2026-03-05T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000025,
+          "input_cached_tokens": 2.5e-7,
+          "input_cache_read": 2.5e-7,
+          "output": 0.000015,
+          "output_reasoning_tokens": 0.000015,
+          "output_reasoning": 0.000015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.4-pro",
+    "matchPattern": "(?i)^(openai/)?(gpt-5.4-pro)$",
+    "startDate": "2026-03-05T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00003,
+          "output": 0.00018,
+          "output_reasoning_tokens": 0.00018,
+          "output_reasoning": 0.00018
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.4-2026-03-05",
+    "matchPattern": "(?i)^(openai/)?(gpt-5.4-2026-03-05)$",
+    "startDate": "2026-03-05T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.0000025,
+          "input_cached_tokens": 2.5e-7,
+          "input_cache_read": 2.5e-7,
+          "output": 0.000015,
+          "output_reasoning_tokens": 0.000015,
+          "output_reasoning": 0.000015
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.4-pro-2026-03-05",
+    "matchPattern": "(?i)^(openai/)?(gpt-5.4-pro-2026-03-05)$",
+    "startDate": "2026-03-05T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 0.00003,
+          "output": 0.00018,
+          "output_reasoning_tokens": 0.00018,
+          "output_reasoning": 0.00018
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.4-mini",
+    "matchPattern": "(?i)^(openai\\/)?(gpt-5.4-mini)$",
+    "startDate": "2026-03-18T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 7.5e-7,
+          "input_cached_tokens": 7.5e-8,
+          "input_cache_read": 7.5e-8,
+          "output": 0.0000045
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.4-mini-2026-03-17",
+    "matchPattern": "(?i)^(openai\\/)?(gpt-5.4-mini-2026-03-17)$",
+    "startDate": "2026-03-18T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 7.5e-7,
+          "input_cached_tokens": 7.5e-8,
+          "input_cache_read": 7.5e-8,
+          "output": 0.0000045
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.4-nano",
+    "matchPattern": "(?i)^(openai\\/)?(gpt-5.4-nano)$",
+    "startDate": "2026-03-18T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2e-7,
+          "input_cached_tokens": 2e-8,
+          "input_cache_read": 2e-8,
+          "output": 0.00000125
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gpt-5.4-nano-2026-03-17",
+    "matchPattern": "(?i)^(openai\\/)?(gpt-5.4-nano-2026-03-17)$",
+    "startDate": "2026-03-18T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2e-7,
+          "input_cached_tokens": 2e-8,
+          "input_cache_read": 2e-8,
+          "output": 0.00000125
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-3-flash-preview",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-3-flash-preview)$",
+    "startDate": "2025-12-21T12:01:42.282Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 5e-7,
+          "input_text": 5e-7,
+          "input_modality_1": 5e-7,
+          "prompt_token_count": 5e-7,
+          "promptTokenCount": 5e-7,
+          "input_cached_tokens": 5e-8,
+          "cached_content_token_count": 5e-8,
+          "output": 0.000003,
+          "output_text": 0.000003,
+          "output_modality_1": 0.000003,
+          "candidates_token_count": 0.000003,
+          "candidatesTokenCount": 0.000003,
+          "thoughtsTokenCount": 0.000003,
+          "thoughts_token_count": 0.000003,
+          "output_reasoning": 0.000003
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-3.1-flash-lite-preview",
+    "matchPattern": "(?i)^(google(ai)?/)?(gemini-3.1-flash-lite-preview)$",
+    "startDate": "2026-03-03T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input": 2.5e-7,
+          "input_modality_1": 2.5e-7,
+          "input_text": 2.5e-7,
+          "prompt_token_count": 2.5e-7,
+          "promptTokenCount": 2.5e-7,
+          "input_cached_tokens": 2.5e-8,
+          "cached_content_token_count": 2.5e-8,
+          "output": 0.0000015,
+          "output_text": 0.0000015,
+          "output_modality_1": 0.0000015,
+          "candidates_token_count": 0.0000015,
+          "candidatesTokenCount": 0.0000015,
+          "thoughtsTokenCount": 0.0000015,
+          "thoughts_token_count": 0.0000015,
+          "output_reasoning": 0.0000015,
+          "input_audio_tokens": 5e-7
+        }
+      }
+    ]
+  },
+  {
+    "modelName": "gemini-live-2.5-flash-native-audio",
+    "matchPattern": "(?i)^(google/)?(gemini-live-2.5-flash-native-audio)$",
+    "startDate": "2026-03-16T00:00:00.000Z",
+    "pricingTiers": [
+      {
+        "name": "Standard",
+        "isDefault": true,
+        "priority": 0,
+        "conditions": [],
+        "prices": {
+          "input_text": 5e-7,
+          "input_audio": 0.000003,
+          "input_image": 0.000003,
+          "output_text": 0.000002,
+          "output_audio": 0.000012
+        }
+      }
+    ]
+  }
 ];
diff --git a/internal-packages/llm-model-catalog/src/modelCatalog.ts b/internal-packages/llm-model-catalog/src/modelCatalog.ts
index d90eb1a992b..71ae921c3e7 100644
--- a/internal-packages/llm-model-catalog/src/modelCatalog.ts
+++ b/internal-packages/llm-model-catalog/src/modelCatalog.ts
@@ -5,564 +5,677 @@ import type { ModelCatalogEntry } from "./types.js";
 
 export const modelCatalog: Record<string, ModelCatalogEntry> = {
   "chatgpt-4o-latest": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship multimodal model optimized for speed and cost, capable of processing text, images, and audio with strong performance across reasoning, coding, and creative tasks.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: [
+    "provider": "openai",
+    "description": "OpenAI's flagship multimodal model optimized for speed and cost, capable of processing text, images, and audio with strong performance across reasoning, coding, and creative tasks.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "audio_input",
       "audio_output",
-      "fine_tunable",
+      "fine_tunable"
     ],
-    releaseDate: "2024-05-13",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T10:55:46.469Z",
-    baseModelName: "chatgpt-4o",
+    "releaseDate": "2024-05-13",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T10:55:46.469Z",
+    "baseModelName": "chatgpt-4o"
   },
   "claude-1.1": {
-    provider: "anthropic",
-    description:
-      "An early-generation Claude model from Anthropic, offering basic conversational and text completion capabilities. It was quickly superseded by Claude 1.2, 1.3, and the Claude 2 family.",
-    contextWindow: 9000,
-    maxOutputTokens: 8191,
-    capabilities: ["streaming"],
-    releaseDate: "2023-03-14",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: null,
-    resolvedAt: "2026-03-24T10:55:47.906Z",
-    baseModelName: null,
+    "provider": "anthropic",
+    "description": "An early-generation Claude model from Anthropic, offering basic conversational and text completion capabilities. It was quickly superseded by Claude 1.2, 1.3, and the Claude 2 family.",
+    "contextWindow": 9000,
+    "maxOutputTokens": 8191,
+    "capabilities": [
+      "streaming"
+    ],
+    "releaseDate": "2023-03-14",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": null,
+    "resolvedAt": "2026-03-24T10:55:47.906Z",
+    "baseModelName": null
   },
   "claude-1.2": {
-    provider: "anthropic",
-    description:
-      "An early-generation Anthropic model, part of the original Claude 1.x family. It offered improved performance over Claude 1.0 but was quickly superseded by Claude 1.3 and later model families.",
-    contextWindow: 9000,
-    maxOutputTokens: 8191,
-    capabilities: ["streaming"],
-    releaseDate: null,
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: null,
-    resolvedAt: "2026-03-24T10:55:46.760Z",
-    baseModelName: null,
+    "provider": "anthropic",
+    "description": "An early-generation Anthropic model, part of the original Claude 1.x family. It offered improved performance over Claude 1.0 but was quickly superseded by Claude 1.3 and later model families.",
+    "contextWindow": 9000,
+    "maxOutputTokens": 8191,
+    "capabilities": [
+      "streaming"
+    ],
+    "releaseDate": null,
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": null,
+    "resolvedAt": "2026-03-24T10:55:46.760Z",
+    "baseModelName": null
   },
   "claude-1.3": {
-    provider: "anthropic",
-    description:
-      "Early-generation Claude model from Anthropic, offering improved performance over Claude 1.0-1.2 in reasoning and instruction-following tasks.",
-    contextWindow: 100000,
-    maxOutputTokens: null,
-    capabilities: ["streaming"],
-    releaseDate: "2023-03-14",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: null,
-    resolvedAt: "2026-03-24T10:55:46.227Z",
-    baseModelName: null,
+    "provider": "anthropic",
+    "description": "Early-generation Claude model from Anthropic, offering improved performance over Claude 1.0-1.2 in reasoning and instruction-following tasks.",
+    "contextWindow": 100000,
+    "maxOutputTokens": null,
+    "capabilities": [
+      "streaming"
+    ],
+    "releaseDate": "2023-03-14",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": null,
+    "resolvedAt": "2026-03-24T10:55:46.227Z",
+    "baseModelName": null
   },
   "claude-2.0": {
-    provider: "anthropic",
-    description:
-      "Anthropic's second-generation large language model, offering improved performance over Claude 1.x with longer context support. Succeeded by Claude 2.1 and later the Claude 3 family.",
-    contextWindow: 100000,
-    maxOutputTokens: 4096,
-    capabilities: ["streaming"],
-    releaseDate: "2023-07-11",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-02-01",
-    resolvedAt: "2026-03-24T10:55:45.922Z",
-    baseModelName: null,
+    "provider": "anthropic",
+    "description": "Anthropic's second-generation large language model, offering improved performance over Claude 1.x with longer context support. Succeeded by Claude 2.1 and later the Claude 3 family.",
+    "contextWindow": 100000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "streaming"
+    ],
+    "releaseDate": "2023-07-11",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-02-01",
+    "resolvedAt": "2026-03-24T10:55:45.922Z",
+    "baseModelName": null
   },
   "claude-2.1": {
-    provider: "anthropic",
-    description:
-      "Anthropic's Claude 2.1 model featuring a 200K context window, reduced hallucination rates compared to Claude 2.0, and improved accuracy on long document comprehension.",
-    contextWindow: 200000,
-    maxOutputTokens: 4096,
-    capabilities: ["streaming", "tool_use"],
-    releaseDate: "2023-11-21",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-01-01",
-    resolvedAt: "2026-03-24T10:56:22.743Z",
-    baseModelName: null,
+    "provider": "anthropic",
+    "description": "Anthropic's Claude 2.1 model featuring a 200K context window, reduced hallucination rates compared to Claude 2.0, and improved accuracy on long document comprehension.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "streaming",
+      "tool_use"
+    ],
+    "releaseDate": "2023-11-21",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-01-01",
+    "resolvedAt": "2026-03-24T10:56:22.743Z",
+    "baseModelName": null
   },
   "claude-3-5-haiku-20241022": {
-    provider: "anthropic",
-    description:
-      "Anthropic's fastest and most cost-effective model in the Claude 3.5 family, optimized for speed and efficiency while maintaining strong performance across common tasks.",
-    contextWindow: 200000,
-    maxOutputTokens: 8192,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-10-22",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-07-01",
-    resolvedAt: "2026-03-24T10:56:25.724Z",
-    baseModelName: "claude-3-5-haiku",
+    "provider": "anthropic",
+    "description": "Anthropic's fastest and most cost-effective model in the Claude 3.5 family, optimized for speed and efficiency while maintaining strong performance across common tasks.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-10-22",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-07-01",
+    "resolvedAt": "2026-03-24T10:56:25.724Z",
+    "baseModelName": "claude-3-5-haiku"
   },
   "claude-3-5-sonnet-20240620": {
-    provider: "anthropic",
-    description:
-      "Anthropic's Claude 3.5 Sonnet is a mid-tier model balancing intelligence and speed, excelling at coding, analysis, and vision tasks while being faster and cheaper than Opus.",
-    contextWindow: 200000,
-    maxOutputTokens: 8192,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-06-20",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-04-01",
-    resolvedAt: "2026-03-24T10:56:35.401Z",
-    baseModelName: "claude-3-5-sonnet",
+    "provider": "anthropic",
+    "description": "Anthropic's Claude 3.5 Sonnet is a mid-tier model balancing intelligence and speed, excelling at coding, analysis, and vision tasks while being faster and cheaper than Opus.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-06-20",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-04-01",
+    "resolvedAt": "2026-03-24T10:56:35.401Z",
+    "baseModelName": "claude-3-5-sonnet"
   },
   "claude-3-haiku-20240307": {
-    provider: "anthropic",
-    description:
-      "Anthropic's fastest and most compact Claude 3 model, optimized for speed and cost-efficiency while maintaining strong performance on everyday tasks.",
-    contextWindow: 200000,
-    maxOutputTokens: 4096,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-03-13",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-08-01",
-    resolvedAt: "2026-03-24T10:56:25.288Z",
-    baseModelName: "claude-3-haiku",
+    "provider": "anthropic",
+    "description": "Anthropic's fastest and most compact Claude 3 model, optimized for speed and cost-efficiency while maintaining strong performance on everyday tasks.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-03-13",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-08-01",
+    "resolvedAt": "2026-03-24T10:56:25.288Z",
+    "baseModelName": "claude-3-haiku"
   },
   "claude-3-opus-20240229": {
-    provider: "anthropic",
-    description:
-      "Anthropic's most capable model in the Claude 3 family, excelling at complex analysis, nuanced content generation, and advanced reasoning tasks.",
-    contextWindow: 200000,
-    maxOutputTokens: 4096,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-03-04",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-08-01",
-    resolvedAt: "2026-03-24T10:56:26.008Z",
-    baseModelName: "claude-3-opus",
+    "provider": "anthropic",
+    "description": "Anthropic's most capable model in the Claude 3 family, excelling at complex analysis, nuanced content generation, and advanced reasoning tasks.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-03-04",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-08-01",
+    "resolvedAt": "2026-03-24T10:56:26.008Z",
+    "baseModelName": "claude-3-opus"
   },
   "claude-3-sonnet-20240229": {
-    provider: "anthropic",
-    description:
-      "Mid-tier model in Anthropic's Claude 3 family, balancing performance and speed for a wide range of tasks including analysis, coding, and content generation.",
-    contextWindow: 200000,
-    maxOutputTokens: 4096,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-03-04",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-02-01",
-    resolvedAt: "2026-03-24T10:56:59.532Z",
-    baseModelName: "claude-3-sonnet",
+    "provider": "anthropic",
+    "description": "Mid-tier model in Anthropic's Claude 3 family, balancing performance and speed for a wide range of tasks including analysis, coding, and content generation.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-03-04",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-02-01",
+    "resolvedAt": "2026-03-24T10:56:59.532Z",
+    "baseModelName": "claude-3-sonnet"
   },
   "claude-3.5-haiku-latest": {
-    provider: "anthropic",
-    description:
-      "Anthropic's fastest and most cost-effective model in the Claude 3.5 family, optimized for speed and efficiency while maintaining strong performance across a wide range of tasks.",
-    contextWindow: 200000,
-    maxOutputTokens: 8192,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-10-29",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-07-01",
-    resolvedAt: "2026-03-24T10:57:04.392Z",
-    baseModelName: "claude-3.5-haiku",
+    "provider": "anthropic",
+    "description": "Anthropic's fastest and most cost-effective model in the Claude 3.5 family, optimized for speed and efficiency while maintaining strong performance across a wide range of tasks.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-10-29",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-07-01",
+    "resolvedAt": "2026-03-24T10:57:04.392Z",
+    "baseModelName": "claude-3.5-haiku"
   },
   "claude-3.5-sonnet-20241022": {
-    provider: "anthropic",
-    description:
-      "Anthropic's mid-tier model offering strong reasoning, coding, and analysis capabilities at a balance of speed and intelligence, positioned between Haiku and Opus in the Claude 3.5 family.",
-    contextWindow: 200000,
-    maxOutputTokens: 8192,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-06-20",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-04-01",
-    resolvedAt: "2026-03-24T10:57:13.346Z",
-    baseModelName: "claude-3.5-sonnet",
+    "provider": "anthropic",
+    "description": "Anthropic's mid-tier model offering strong reasoning, coding, and analysis capabilities at a balance of speed and intelligence, positioned between Haiku and Opus in the Claude 3.5 family.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-06-20",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-04-01",
+    "resolvedAt": "2026-03-24T10:57:13.346Z",
+    "baseModelName": "claude-3.5-sonnet"
   },
   "claude-3.5-sonnet-latest": {
-    provider: "anthropic",
-    description:
-      "Anthropic's mid-tier model offering strong reasoning, coding, and analysis capabilities at a balance of speed and intelligence, positioned between Haiku and Opus in the Claude 3.5 family.",
-    contextWindow: 200000,
-    maxOutputTokens: 8192,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-06-20",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-04-01",
-    resolvedAt: "2026-03-24T10:57:13.346Z",
-    baseModelName: "claude-3.5-sonnet",
+    "provider": "anthropic",
+    "description": "Anthropic's mid-tier model offering strong reasoning, coding, and analysis capabilities at a balance of speed and intelligence, positioned between Haiku and Opus in the Claude 3.5 family.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-06-20",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-04-01",
+    "resolvedAt": "2026-03-24T10:57:13.346Z",
+    "baseModelName": "claude-3.5-sonnet"
   },
   "claude-3.7-sonnet-20250219": {
-    provider: "anthropic",
-    description:
-      "Anthropic's Claude 3.7 Sonnet is a hybrid reasoning model that introduced extended thinking capabilities, offering strong performance on coding, math, and complex reasoning tasks.",
-    contextWindow: 200000,
-    maxOutputTokens: 16384,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-02-24",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-04-01",
-    resolvedAt: "2026-03-24T10:57:12.967Z",
-    baseModelName: "claude-3.7-sonnet",
+    "provider": "anthropic",
+    "description": "Anthropic's Claude 3.7 Sonnet is a hybrid reasoning model that introduced extended thinking capabilities, offering strong performance on coding, math, and complex reasoning tasks.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-02-24",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-04-01",
+    "resolvedAt": "2026-03-24T10:57:12.967Z",
+    "baseModelName": "claude-3.7-sonnet"
   },
   "claude-3.7-sonnet-latest": {
-    provider: "anthropic",
-    description:
-      "Anthropic's Claude 3.7 Sonnet is a hybrid reasoning model that introduced extended thinking capabilities, offering strong performance on coding, math, and complex reasoning tasks.",
-    contextWindow: 200000,
-    maxOutputTokens: 16384,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-02-24",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-04-01",
-    resolvedAt: "2026-03-24T10:57:12.967Z",
-    baseModelName: "claude-3.7-sonnet",
+    "provider": "anthropic",
+    "description": "Anthropic's Claude 3.7 Sonnet is a hybrid reasoning model that introduced extended thinking capabilities, offering strong performance on coding, math, and complex reasoning tasks.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-02-24",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-04-01",
+    "resolvedAt": "2026-03-24T10:57:12.967Z",
+    "baseModelName": "claude-3.7-sonnet"
   },
   "claude-haiku-4-5-20251001": {
-    provider: "anthropic",
-    description:
-      "Anthropic's fastest model with near-frontier intelligence, optimized for speed and cost efficiency while supporting extended thinking and vision.",
-    contextWindow: 200000,
-    maxOutputTokens: 64000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-10-01",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-07-01",
-    resolvedAt: "2026-03-24T10:57:29.685Z",
-    baseModelName: "claude-haiku-4-5",
+    "provider": "anthropic",
+    "description": "Anthropic's fastest model with near-frontier intelligence, optimized for speed and cost efficiency while supporting extended thinking and vision.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 64000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-10-01",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-07-01",
+    "resolvedAt": "2026-03-24T10:57:29.685Z",
+    "baseModelName": "claude-haiku-4-5"
   },
   "claude-instant-1": {
-    provider: "anthropic",
-    description:
-      "Anthropic's fast and cost-effective model optimized for speed and efficiency, positioned as a lighter alternative to Claude 1.x for tasks requiring lower latency.",
-    contextWindow: 100000,
-    maxOutputTokens: 8191,
-    capabilities: ["streaming"],
-    releaseDate: "2023-03-14",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-01-06",
-    knowledgeCutoff: "2023-01-01",
-    resolvedAt: "2026-03-24T10:57:36.888Z",
-    baseModelName: null,
+    "provider": "anthropic",
+    "description": "Anthropic's fast and cost-effective model optimized for speed and efficiency, positioned as a lighter alternative to Claude 1.x for tasks requiring lower latency.",
+    "contextWindow": 100000,
+    "maxOutputTokens": 8191,
+    "capabilities": [
+      "streaming"
+    ],
+    "releaseDate": "2023-03-14",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-01-06",
+    "knowledgeCutoff": "2023-01-01",
+    "resolvedAt": "2026-03-24T10:57:36.888Z",
+    "baseModelName": null
   },
   "claude-instant-1.2": {
-    provider: "anthropic",
-    description:
-      "Anthropic's fast and cost-effective model, optimized for speed and efficiency while maintaining strong performance on conversational and text generation tasks.",
-    contextWindow: 100000,
-    maxOutputTokens: 8191,
-    capabilities: ["streaming"],
-    releaseDate: "2023-08-09",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-01-01",
-    resolvedAt: "2026-03-24T10:57:41.865Z",
-    baseModelName: null,
+    "provider": "anthropic",
+    "description": "Anthropic's fast and cost-effective model, optimized for speed and efficiency while maintaining strong performance on conversational and text generation tasks.",
+    "contextWindow": 100000,
+    "maxOutputTokens": 8191,
+    "capabilities": [
+      "streaming"
+    ],
+    "releaseDate": "2023-08-09",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-01-01",
+    "resolvedAt": "2026-03-24T10:57:41.865Z",
+    "baseModelName": null
   },
   "claude-opus-4-1-20250805": {
-    provider: "anthropic",
-    description:
-      "Anthropic's hybrid reasoning model with strong software engineering and agentic capabilities, scoring 74.5% on SWE-bench Verified. Supports both rapid responses and step-by-step extended thinking.",
-    contextWindow: 200000,
-    maxOutputTokens: 32000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-08-05",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-03-01",
-    resolvedAt: "2026-03-24T10:58:36.876Z",
-    baseModelName: "claude-opus-4-1",
+    "provider": "anthropic",
+    "description": "Anthropic's hybrid reasoning model with strong software engineering and agentic capabilities, scoring 74.5% on SWE-bench Verified. Supports both rapid responses and step-by-step extended thinking.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 32000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-08-05",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-03-01",
+    "resolvedAt": "2026-03-24T10:58:36.876Z",
+    "baseModelName": "claude-opus-4-1"
   },
   "claude-opus-4-20250514": {
-    provider: "anthropic",
-    description:
-      "Anthropic's flagship model from the Claude 4 family, excelling at complex coding tasks, long-running agent workflows, and deep reasoning with extended thinking support.",
-    contextWindow: 200000,
-    maxOutputTokens: 32000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-05-14",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-03-01",
-    resolvedAt: "2026-03-24T10:58:47.518Z",
-    baseModelName: "claude-opus-4",
+    "provider": "anthropic",
+    "description": "Anthropic's flagship model from the Claude 4 family, excelling at complex coding tasks, long-running agent workflows, and deep reasoning with extended thinking support.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 32000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-05-14",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-03-01",
+    "resolvedAt": "2026-03-24T10:58:47.518Z",
+    "baseModelName": "claude-opus-4"
   },
   "claude-opus-4-5-20251101": {
-    provider: "anthropic",
-    description:
-      "Anthropic's flagship intelligence model released in November 2025, excelling at complex reasoning, vision, and extended thinking with the best performance in Anthropic's lineup before Opus 4.6.",
-    contextWindow: 200000,
-    maxOutputTokens: 64000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-11-01",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-03-01",
-    resolvedAt: "2026-03-24T10:58:48.961Z",
-    baseModelName: "claude-opus-4-5",
+    "provider": "anthropic",
+    "description": "Anthropic's flagship intelligence model released in November 2025, excelling at complex reasoning, vision, and extended thinking with the best performance in Anthropic's lineup before Opus 4.6.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 64000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-11-01",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-03-01",
+    "resolvedAt": "2026-03-24T10:58:48.961Z",
+    "baseModelName": "claude-opus-4-5"
   },
   "claude-opus-4-6": {
-    provider: "anthropic",
-    description:
-      "Anthropic's most intelligent model, optimized for building agents and coding with exceptional reasoning capabilities and extended agentic task horizons.",
-    contextWindow: 1000000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2026-02-05",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-05-01",
-    resolvedAt: "2026-03-24T10:58:42.061Z",
-    baseModelName: null,
+    "provider": "anthropic",
+    "description": "Anthropic's most intelligent model, optimized for building agents and coding with exceptional reasoning capabilities and extended agentic task horizons.",
+    "contextWindow": 1000000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2026-02-05",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-05-01",
+    "resolvedAt": "2026-03-24T10:58:42.061Z",
+    "baseModelName": null
   },
   "claude-sonnet-4-20250514": {
-    provider: "anthropic",
-    description:
-      "Anthropic's balanced Claude 4 model offering strong coding, reasoning, and multilingual performance at moderate cost. Now a legacy model superseded by Claude Sonnet 4.5 and 4.6.",
-    contextWindow: 200000,
-    maxOutputTokens: 64000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-05-14",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-03-01",
-    resolvedAt: "2026-03-24T10:58:39.601Z",
-    baseModelName: "claude-sonnet-4",
+    "provider": "anthropic",
+    "description": "Anthropic's balanced Claude 4 model offering strong coding, reasoning, and multilingual performance at moderate cost. Now a legacy model superseded by Claude Sonnet 4.5 and 4.6.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 64000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-05-14",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-03-01",
+    "resolvedAt": "2026-03-24T10:58:39.601Z",
+    "baseModelName": "claude-sonnet-4"
   },
   "claude-sonnet-4-5-20250929": {
-    provider: "anthropic",
-    description:
-      "Anthropic's high-performance mid-tier model with strong coding, reasoning, and multi-step problem solving capabilities. Successor to Claude Sonnet 4, offering improved benchmarks at the same price point.",
-    contextWindow: 200000,
-    maxOutputTokens: 64000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-09-29",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-01-01",
-    resolvedAt: "2026-03-24T10:59:54.426Z",
-    baseModelName: "claude-sonnet-4-5",
+    "provider": "anthropic",
+    "description": "Anthropic's high-performance mid-tier model with strong coding, reasoning, and multi-step problem solving capabilities. Successor to Claude Sonnet 4, offering improved benchmarks at the same price point.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 64000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-09-29",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-01-01",
+    "resolvedAt": "2026-03-24T10:59:54.426Z",
+    "baseModelName": "claude-sonnet-4-5"
   },
   "claude-sonnet-4-6": {
-    provider: "anthropic",
-    description:
-      "Anthropic's best combination of speed and intelligence, excelling at coding, agentic tasks, and computer use, with a 1M token context window and performance rivaling prior Opus-class models.",
-    contextWindow: 1000000,
-    maxOutputTokens: 64000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2026-02-17",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2026-01-01",
-    resolvedAt: "2026-03-24T10:59:59.014Z",
-    baseModelName: null,
+    "provider": "anthropic",
+    "description": "Anthropic's best combination of speed and intelligence, excelling at coding, agentic tasks, and computer use, with a 1M token context window and performance rivaling prior Opus-class models.",
+    "contextWindow": 1000000,
+    "maxOutputTokens": 64000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2026-02-17",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2026-01-01",
+    "resolvedAt": "2026-03-24T10:59:59.014Z",
+    "baseModelName": null
   },
   "claude-sonnet-4-latest": {
-    provider: "anthropic",
-    description:
-      "Anthropic's balanced Claude 4 model offering strong coding, reasoning, and multilingual performance at moderate cost. Now a legacy model superseded by Claude Sonnet 4.5 and 4.6.",
-    contextWindow: 200000,
-    maxOutputTokens: 64000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-05-14",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-03-01",
-    resolvedAt: "2026-03-24T10:58:39.601Z",
-    baseModelName: "claude-sonnet-4",
+    "provider": "anthropic",
+    "description": "Anthropic's balanced Claude 4 model offering strong coding, reasoning, and multilingual performance at moderate cost. Now a legacy model superseded by Claude Sonnet 4.5 and 4.6.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 64000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-05-14",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-03-01",
+    "resolvedAt": "2026-03-24T10:58:39.601Z",
+    "baseModelName": "claude-sonnet-4"
   },
   "gemini-1.0-pro": {
-    provider: "google",
-    description:
-      "Google's first-generation Gemini Pro model, a mid-size multimodal model designed for text generation, reasoning, and chat applications. Succeeded by Gemini 1.5 Pro.",
-    contextWindow: 32760,
-    maxOutputTokens: 8192,
-    capabilities: ["tool_use", "streaming", "json_mode"],
-    releaseDate: "2023-12-13",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-02-15",
-    knowledgeCutoff: "2023-04-01",
-    resolvedAt: "2026-03-24T10:59:26.767Z",
-    baseModelName: null,
+    "provider": "google",
+    "description": "Google's first-generation Gemini Pro model, a mid-size multimodal model designed for text generation, reasoning, and chat applications. Succeeded by Gemini 1.5 Pro.",
+    "contextWindow": 32760,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2023-12-13",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-02-15",
+    "knowledgeCutoff": "2023-04-01",
+    "resolvedAt": "2026-03-24T10:59:26.767Z",
+    "baseModelName": null
   },
   "gemini-1.0-pro-001": {
-    provider: "google",
-    description:
-      "Google's first-generation Pro model optimized for text generation, reasoning, and multi-turn conversation tasks, part of the original Gemini 1.0 lineup.",
-    contextWindow: 30720,
-    maxOutputTokens: 2048,
-    capabilities: ["tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-02-15",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-02-15",
-    knowledgeCutoff: "2023-04-01",
-    resolvedAt: "2026-03-24T10:59:27.391Z",
-    baseModelName: null,
+    "provider": "google",
+    "description": "Google's first-generation Pro model optimized for text generation, reasoning, and multi-turn conversation tasks, part of the original Gemini 1.0 lineup.",
+    "contextWindow": 30720,
+    "maxOutputTokens": 2048,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-02-15",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-02-15",
+    "knowledgeCutoff": "2023-04-01",
+    "resolvedAt": "2026-03-24T10:59:27.391Z",
+    "baseModelName": null
   },
   "gemini-1.0-pro-latest": {
-    provider: "google",
-    description:
-      "Google's first-generation Gemini Pro model, a mid-size multimodal model designed for text generation, reasoning, and chat applications. Succeeded by Gemini 1.5 Pro.",
-    contextWindow: 32760,
-    maxOutputTokens: 8192,
-    capabilities: ["tool_use", "streaming", "json_mode"],
-    releaseDate: "2023-12-13",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-02-15",
-    knowledgeCutoff: "2023-04-01",
-    resolvedAt: "2026-03-24T10:59:26.767Z",
-    baseModelName: "gemini-1.0-pro",
+    "provider": "google",
+    "description": "Google's first-generation Gemini Pro model, a mid-size multimodal model designed for text generation, reasoning, and chat applications. Succeeded by Gemini 1.5 Pro.",
+    "contextWindow": 32760,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2023-12-13",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-02-15",
+    "knowledgeCutoff": "2023-04-01",
+    "resolvedAt": "2026-03-24T10:59:26.767Z",
+    "baseModelName": "gemini-1.0-pro"
   },
   "gemini-1.5-pro-latest": {
-    provider: "google",
-    description:
-      "Google's mid-size multimodal model with a massive context window, strong at long-document understanding, code generation, and multi-turn conversation.",
-    contextWindow: 2097152,
-    maxOutputTokens: 8192,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "audio_input"],
-    releaseDate: "2024-02-15",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2025-09-24",
-    knowledgeCutoff: "2024-04-01",
-    resolvedAt: "2026-03-24T10:59:25.463Z",
-    baseModelName: "gemini-1.5-pro",
+    "provider": "google",
+    "description": "Google's mid-size multimodal model with a massive context window, strong at long-document understanding, code generation, and multi-turn conversation.",
+    "contextWindow": 2097152,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "audio_input"
+    ],
+    "releaseDate": "2024-02-15",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2025-09-24",
+    "knowledgeCutoff": "2024-04-01",
+    "resolvedAt": "2026-03-24T10:59:25.463Z",
+    "baseModelName": "gemini-1.5-pro"
   },
   "gemini-2.0-flash": {
-    provider: "google",
-    description:
-      "Google's second-generation workhorse model optimized for speed, with native tool use, multimodal input (text, images, audio, video), and a 1M token context window.",
-    contextWindow: 1048576,
-    maxOutputTokens: 8192,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "code_execution", "audio_input"],
-    releaseDate: "2025-02-05",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2026-06-01",
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:01:15.429Z",
-    baseModelName: null,
+    "provider": "google",
+    "description": "Google's second-generation workhorse model optimized for speed, with native tool use, multimodal input (text, images, audio, video), and a 1M token context window.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "code_execution",
+      "audio_input"
+    ],
+    "releaseDate": "2025-02-05",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2026-06-01",
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:01:15.429Z",
+    "baseModelName": null
   },
   "gemini-2.0-flash-001": {
-    provider: "google",
-    description:
-      "Google's fast and efficient multimodal model that outperforms Gemini 1.5 Pro on key benchmarks at twice the speed, supporting text, image, audio, and video inputs with native tool use.",
-    contextWindow: 1048576,
-    maxOutputTokens: 8192,
-    capabilities: [
+    "provider": "google",
+    "description": "Google's fast and efficient multimodal model that outperforms Gemini 1.5 Pro on key benchmarks at twice the speed, supporting text, image, audio, and video inputs with native tool use.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 8192,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
@@ -570,1614 +683,1890 @@ export const modelCatalog: Record<string, ModelCatalogEntry> = {
       "audio_input",
       "image_generation",
       "audio_output",
-      "code_execution",
+      "code_execution"
     ],
-    releaseDate: "2025-02-05",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2026-06-01",
-    knowledgeCutoff: "2024-08-01",
-    resolvedAt: "2026-03-24T11:01:04.084Z",
-    baseModelName: null,
+    "releaseDate": "2025-02-05",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2026-06-01",
+    "knowledgeCutoff": "2024-08-01",
+    "resolvedAt": "2026-03-24T11:01:04.084Z",
+    "baseModelName": null
   },
   "gemini-2.0-flash-lite-preview": {
-    provider: "google",
-    description:
-      "A lightweight, cost-efficient variant of Gemini 2.0 Flash optimized for low latency and high throughput, supporting multimodal input with text output.",
-    contextWindow: 1048576,
-    maxOutputTokens: 8192,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-02-05",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2026-06-01",
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:00:56.775Z",
-    baseModelName: null,
+    "provider": "google",
+    "description": "A lightweight, cost-efficient variant of Gemini 2.0 Flash optimized for low latency and high throughput, supporting multimodal input with text output.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-02-05",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2026-06-01",
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:00:56.775Z",
+    "baseModelName": null
   },
   "gemini-2.0-flash-lite-preview-02-05": {
-    provider: "google",
-    description:
-      "Google's cost-optimized, low-latency model in the Gemini 2.0 family, designed for high-volume tasks like summarization, multimodal processing, and categorization.",
-    contextWindow: 1048576,
-    maxOutputTokens: 8192,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-02-05",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2025-12-09",
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:01:34.165Z",
-    baseModelName: null,
+    "provider": "google",
+    "description": "Google's cost-optimized, low-latency model in the Gemini 2.0 family, designed for high-volume tasks like summarization, multimodal processing, and categorization.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-02-05",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2025-12-09",
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:01:34.165Z",
+    "baseModelName": null
   },
   "gemini-2.5-flash": {
-    provider: "google",
-    description:
-      "Google's best price-performance model optimized for low-latency, high-volume tasks requiring reasoning, with built-in thinking capabilities and multimodal input support.",
-    contextWindow: 1048576,
-    maxOutputTokens: 65536,
-    capabilities: [
+    "provider": "google",
+    "description": "Google's best price-performance model optimized for low-latency, high-volume tasks requiring reasoning, with built-in thinking capabilities and multimodal input support.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 65536,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "extended_thinking",
       "code_execution",
-      "audio_input",
+      "audio_input"
     ],
-    releaseDate: "2025-06-01",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-01-01",
-    resolvedAt: "2026-03-24T11:01:25.200Z",
-    baseModelName: null,
+    "releaseDate": "2025-06-01",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-01-01",
+    "resolvedAt": "2026-03-24T11:01:25.200Z",
+    "baseModelName": null
   },
   "gemini-2.5-flash-lite": {
-    provider: "google",
-    description:
-      "Google's most cost-efficient Gemini model, optimized for low-latency use cases with strong reasoning, multilingual, and long-context capabilities at minimal cost.",
-    contextWindow: 1048576,
-    maxOutputTokens: 65535,
-    capabilities: [
+    "provider": "google",
+    "description": "Google's most cost-efficient Gemini model, optimized for low-latency use cases with strong reasoning, multilingual, and long-context capabilities at minimal cost.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 65535,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "extended_thinking",
       "code_execution",
-      "audio_input",
+      "audio_input"
     ],
-    releaseDate: "2025-07-22",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2026-07-22",
-    knowledgeCutoff: "2025-01-01",
-    resolvedAt: "2026-03-24T11:02:30.060Z",
-    baseModelName: null,
+    "releaseDate": "2025-07-22",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2026-07-22",
+    "knowledgeCutoff": "2025-01-01",
+    "resolvedAt": "2026-03-24T11:02:30.060Z",
+    "baseModelName": null
   },
   "gemini-2.5-pro": {
-    provider: "google",
-    description:
-      "Google's most advanced reasoning model with deep thinking capabilities, excelling at complex tasks like coding, math, and multimodal understanding across text, images, audio, and video.",
-    contextWindow: 1048576,
-    maxOutputTokens: 65535,
-    capabilities: [
+    "provider": "google",
+    "description": "Google's most advanced reasoning model with deep thinking capabilities, excelling at complex tasks like coding, math, and multimodal understanding across text, images, audio, and video.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 65535,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "extended_thinking",
       "code_execution",
-      "audio_input",
+      "audio_input"
     ],
-    releaseDate: "2025-03-25",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2026-06-17",
-    knowledgeCutoff: "2025-01-31",
-    resolvedAt: "2026-03-24T11:02:25.573Z",
-    baseModelName: null,
+    "releaseDate": "2025-03-25",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2026-06-17",
+    "knowledgeCutoff": "2025-01-31",
+    "resolvedAt": "2026-03-24T11:02:25.573Z",
+    "baseModelName": null
   },
   "gemini-3-flash-preview": {
-    provider: "google",
-    description:
-      "Google's high-speed thinking model that matches Gemini 2.5 Pro performance at ~3x faster speed and lower cost, designed for agentic workflows, multi-turn chat, and coding assistance with configurable reasoning levels.",
-    contextWindow: 1048576,
-    maxOutputTokens: 65536,
-    capabilities: [
+    "provider": "google",
+    "description": "Google's high-speed thinking model that matches Gemini 2.5 Pro performance at ~3x faster speed and lower cost, designed for agentic workflows, multi-turn chat, and coding assistance with configurable reasoning levels.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 65536,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "extended_thinking",
       "code_execution",
-      "audio_input",
+      "audio_input"
     ],
-    releaseDate: "2025-12-17",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-01-01",
-    resolvedAt: "2026-03-24T11:02:13.388Z",
-    baseModelName: null,
+    "releaseDate": "2025-12-17",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-01-01",
+    "resolvedAt": "2026-03-24T11:02:13.388Z",
+    "baseModelName": null
   },
   "gemini-3-pro-preview": {
-    provider: "google",
-    description:
-      "Google's flagship reasoning and multimodal model with strong coding and agentic capabilities, now deprecated in favor of Gemini 3.1 Pro.",
-    contextWindow: 1048576,
-    maxOutputTokens: 65536,
-    capabilities: [
+    "provider": "google",
+    "description": "Google's flagship reasoning and multimodal model with strong coding and agentic capabilities, now deprecated in favor of Gemini 3.1 Pro.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 65536,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "extended_thinking",
       "code_execution",
-      "audio_input",
+      "audio_input"
     ],
-    releaseDate: "2025-11-01",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2026-03-09",
-    knowledgeCutoff: "2025-01-01",
-    resolvedAt: "2026-03-24T11:02:29.313Z",
-    baseModelName: null,
+    "releaseDate": "2025-11-01",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2026-03-09",
+    "knowledgeCutoff": "2025-01-01",
+    "resolvedAt": "2026-03-24T11:02:29.313Z",
+    "baseModelName": null
   },
   "gemini-3.1-flash-lite-preview": {
-    provider: "google",
-    description:
-      "Google's most cost-efficient multimodal model in the Gemini 3 series, optimized for high-volume, low-latency tasks like translation, classification, and simple data extraction. Offers 2.5x faster time-to-first-token than Gemini 2.5 Flash.",
-    contextWindow: 1048576,
-    maxOutputTokens: 65536,
-    capabilities: [
+    "provider": "google",
+    "description": "Google's most cost-efficient multimodal model in the Gemini 3 series, optimized for high-volume, low-latency tasks like translation, classification, and simple data extraction. Offers 2.5x faster time-to-first-token than Gemini 2.5 Flash.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 65536,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "extended_thinking",
       "code_execution",
-      "audio_input",
+      "audio_input"
     ],
-    releaseDate: "2026-03-03",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-01-01",
-    resolvedAt: "2026-03-24T11:02:29.253Z",
-    baseModelName: null,
+    "releaseDate": "2026-03-03",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-01-01",
+    "resolvedAt": "2026-03-24T11:02:29.253Z",
+    "baseModelName": null
   },
   "gemini-3.1-pro-preview": {
-    provider: "google",
-    description:
-      "Google's most advanced reasoning model in the Gemini 3.1 family, excelling at complex problem-solving across text, audio, images, video, and code with a 1M token context window and extended thinking capabilities.",
-    contextWindow: 1048576,
-    maxOutputTokens: 65536,
-    capabilities: [
+    "provider": "google",
+    "description": "Google's most advanced reasoning model in the Gemini 3.1 family, excelling at complex problem-solving across text, audio, images, video, and code with a 1M token context window and extended thinking capabilities.",
+    "contextWindow": 1048576,
+    "maxOutputTokens": 65536,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "extended_thinking",
       "code_execution",
-      "audio_input",
+      "audio_input"
     ],
-    releaseDate: "2026-02-19",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-01-01",
-    resolvedAt: "2026-03-24T11:03:33.071Z",
-    baseModelName: null,
+    "releaseDate": "2026-02-19",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-01-01",
+    "resolvedAt": "2026-03-24T11:03:33.071Z",
+    "baseModelName": null
   },
   "gemini-pro": {
-    provider: "google",
-    description:
-      "Google's first-generation Gemini model for text generation, reasoning, and multi-turn conversation. Superseded by Gemini 1.5 Pro and later models.",
-    contextWindow: 32768,
-    maxOutputTokens: 8192,
-    capabilities: ["tool_use", "streaming", "json_mode"],
-    releaseDate: "2023-12-13",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-04-09",
-    knowledgeCutoff: "2023-04-01",
-    resolvedAt: "2026-03-24T11:03:45.401Z",
-    baseModelName: null,
+    "provider": "google",
+    "description": "Google's first-generation Gemini model for text generation, reasoning, and multi-turn conversation. Superseded by Gemini 1.5 Pro and later models.",
+    "contextWindow": 32768,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2023-12-13",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-04-09",
+    "knowledgeCutoff": "2023-04-01",
+    "resolvedAt": "2026-03-24T11:03:45.401Z",
+    "baseModelName": null
   },
   "gpt-3.5-turbo": {
-    provider: "openai",
-    description:
-      "OpenAI's fast and cost-effective model optimized for chat and instruction-following tasks, now superseded by GPT-4o mini.",
-    contextWindow: 16385,
-    maxOutputTokens: 4096,
-    capabilities: ["tool_use", "streaming", "json_mode", "fine_tunable"],
-    releaseDate: "2023-03-01",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2025-09-13",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:03:11.412Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's fast and cost-effective model optimized for chat and instruction-following tasks, now superseded by GPT-4o mini.",
+    "contextWindow": 16385,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "fine_tunable"
+    ],
+    "releaseDate": "2023-03-01",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2025-09-13",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:03:11.412Z",
+    "baseModelName": null
   },
   "gpt-3.5-turbo-0125": {
-    provider: "openai",
-    description:
-      "A fast and cost-effective GPT-3.5 Turbo snapshot optimized for chat completions, offering improved accuracy for function calling and reduced instances of incomplete responses.",
-    contextWindow: 16385,
-    maxOutputTokens: 4096,
-    capabilities: ["tool_use", "streaming", "json_mode", "fine_tunable"],
-    releaseDate: "2024-01-25",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2025-09-13",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:03:11.310Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "A fast and cost-effective GPT-3.5 Turbo snapshot optimized for chat completions, offering improved accuracy for function calling and reduced instances of incomplete responses.",
+    "contextWindow": 16385,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "fine_tunable"
+    ],
+    "releaseDate": "2024-01-25",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2025-09-13",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:03:11.310Z",
+    "baseModelName": null
   },
   "gpt-3.5-turbo-0301": {
-    provider: "openai",
-    description:
-      "Early snapshot of GPT-3.5 Turbo, OpenAI's first ChatGPT-optimized model for chat completions. Fast and cost-effective for simple tasks but superseded by later revisions.",
-    contextWindow: 4096,
-    maxOutputTokens: 4096,
-    capabilities: ["streaming", "fine_tunable"],
-    releaseDate: "2023-03-01",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2024-06-13",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:03:12.060Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "Early snapshot of GPT-3.5 Turbo, OpenAI's first ChatGPT-optimized model for chat completions. Fast and cost-effective for simple tasks but superseded by later revisions.",
+    "contextWindow": 4096,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "streaming",
+      "fine_tunable"
+    ],
+    "releaseDate": "2023-03-01",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2024-06-13",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:03:12.060Z",
+    "baseModelName": null
   },
   "gpt-3.5-turbo-0613": {
-    provider: "openai",
-    description:
-      "A snapshot of GPT-3.5 Turbo from June 2023, optimized for chat and instruction-following tasks with function calling support.",
-    contextWindow: 4096,
-    maxOutputTokens: 4096,
-    capabilities: ["tool_use", "streaming", "json_mode", "fine_tunable"],
-    releaseDate: "2023-06-13",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2024-09-13",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:04:04.463Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "A snapshot of GPT-3.5 Turbo from June 2023, optimized for chat and instruction-following tasks with function calling support.",
+    "contextWindow": 4096,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "fine_tunable"
+    ],
+    "releaseDate": "2023-06-13",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2024-09-13",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:04:04.463Z",
+    "baseModelName": null
   },
   "gpt-3.5-turbo-1106": {
-    provider: "openai",
-    description:
-      "A dated snapshot of GPT-3.5 Turbo released in November 2023, offering improved instruction following, JSON mode, and parallel function calling over previous GPT-3.5 variants.",
-    contextWindow: 16385,
-    maxOutputTokens: 4096,
-    capabilities: ["tool_use", "streaming", "json_mode", "fine_tunable"],
-    releaseDate: "2023-11-06",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2025-09-13",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:04:23.054Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "A dated snapshot of GPT-3.5 Turbo released in November 2023, offering improved instruction following, JSON mode, and parallel function calling over previous GPT-3.5 variants.",
+    "contextWindow": 16385,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "fine_tunable"
+    ],
+    "releaseDate": "2023-11-06",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2025-09-13",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:04:23.054Z",
+    "baseModelName": null
   },
   "gpt-3.5-turbo-16k": {
-    provider: "openai",
-    description:
-      "Extended context version of GPT-3.5 Turbo with 16K token context window, offering the same capabilities as the base model but able to process longer inputs.",
-    contextWindow: 16384,
-    maxOutputTokens: 4096,
-    capabilities: ["streaming", "json_mode", "fine_tunable", "tool_use"],
-    releaseDate: "2023-06-13",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2025-09-13",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:04:36.307Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "Extended context version of GPT-3.5 Turbo with 16K token context window, offering the same capabilities as the base model but able to process longer inputs.",
+    "contextWindow": 16384,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "streaming",
+      "json_mode",
+      "fine_tunable",
+      "tool_use"
+    ],
+    "releaseDate": "2023-06-13",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2025-09-13",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:04:36.307Z",
+    "baseModelName": null
   },
   "gpt-3.5-turbo-16k-0613": {
-    provider: "openai",
-    description:
-      "Extended context window variant of GPT-3.5 Turbo with 16K token context, snapshot from June 2023. Optimized for chat completions with longer document processing.",
-    contextWindow: 16384,
-    maxOutputTokens: 4096,
-    capabilities: ["streaming", "json_mode", "fine_tunable"],
-    releaseDate: "2023-06-13",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2024-09-13",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:04:22.894Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "Extended context window variant of GPT-3.5 Turbo with 16K token context, snapshot from June 2023. Optimized for chat completions with longer document processing.",
+    "contextWindow": 16384,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "streaming",
+      "json_mode",
+      "fine_tunable"
+    ],
+    "releaseDate": "2023-06-13",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2024-09-13",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:04:22.894Z",
+    "baseModelName": null
   },
   "gpt-3.5-turbo-instruct": {
-    provider: "openai",
-    description:
-      "OpenAI's GPT-3.5 Turbo Instruct is a completions-only model (not chat) optimized for following explicit instructions, replacing the legacy text-davinci-003 model.",
-    contextWindow: 4096,
-    maxOutputTokens: 4096,
-    capabilities: ["fine_tunable"],
-    releaseDate: "2023-09-19",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-01-27",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:04:22.309Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's GPT-3.5 Turbo Instruct is a completions-only model (not chat) optimized for following explicit instructions, replacing the legacy text-davinci-003 model.",
+    "contextWindow": 4096,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "fine_tunable"
+    ],
+    "releaseDate": "2023-09-19",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-01-27",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:04:22.309Z",
+    "baseModelName": null
   },
   "gpt-4": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship large language model that preceded GPT-4o, known for strong reasoning and instruction-following capabilities across a wide range of tasks.",
-    contextWindow: 8192,
-    maxOutputTokens: 8192,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2023-03-14",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2025-06-06",
-    knowledgeCutoff: "2023-12-01",
-    resolvedAt: "2026-03-24T11:04:36.773Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's flagship large language model that preceded GPT-4o, known for strong reasoning and instruction-following capabilities across a wide range of tasks.",
+    "contextWindow": 8192,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2023-03-14",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2025-06-06",
+    "knowledgeCutoff": "2023-12-01",
+    "resolvedAt": "2026-03-24T11:04:36.773Z",
+    "baseModelName": null
   },
   "gpt-4-0125-preview": {
-    provider: "openai",
-    description:
-      "An improved GPT-4 Turbo preview model with better task completion, reduced laziness in code generation, and enhanced instruction following.",
-    contextWindow: 128000,
-    maxOutputTokens: 4096,
-    capabilities: ["tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-01-25",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-12-01",
-    resolvedAt: "2026-03-24T11:04:54.196Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "An improved GPT-4 Turbo preview model with better task completion, reduced laziness in code generation, and enhanced instruction following.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-01-25",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-12-01",
+    "resolvedAt": "2026-03-24T11:04:54.196Z",
+    "baseModelName": null
   },
   "gpt-4-0314": {
-    provider: "openai",
-    description:
-      "Original GPT-4 snapshot from March 2023, a large multimodal model (text-only at launch) that was one of OpenAI's first GPT-4 releases. Now deprecated and replaced by newer GPT-4 variants.",
-    contextWindow: 8192,
-    maxOutputTokens: 4096,
-    capabilities: ["streaming"],
-    releaseDate: "2023-03-14",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2024-06-13",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:05:14.112Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "Original GPT-4 snapshot from March 2023, a large multimodal model (text-only at launch) that was one of OpenAI's first GPT-4 releases. Now deprecated and replaced by newer GPT-4 variants.",
+    "contextWindow": 8192,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "streaming"
+    ],
+    "releaseDate": "2023-03-14",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2024-06-13",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:05:14.112Z",
+    "baseModelName": null
   },
   "gpt-4-0613": {
-    provider: "openai",
-    description:
-      "A snapshot of GPT-4 from June 2023, offering strong reasoning and instruction-following capabilities. It was one of the first widely available GPT-4 variants with function calling support.",
-    contextWindow: 8192,
-    maxOutputTokens: 8192,
-    capabilities: ["tool_use", "streaming", "json_mode", "fine_tunable"],
-    releaseDate: "2023-06-13",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-06-06",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:05:13.885Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "A snapshot of GPT-4 from June 2023, offering strong reasoning and instruction-following capabilities. It was one of the first widely available GPT-4 variants with function calling support.",
+    "contextWindow": 8192,
+    "maxOutputTokens": 8192,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "fine_tunable"
+    ],
+    "releaseDate": "2023-06-13",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-06-06",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:05:13.885Z",
+    "baseModelName": null
   },
   "gpt-4-1106-preview": {
-    provider: "openai",
-    description:
-      "GPT-4 Turbo preview model with 128K context window, offering improved instruction following and JSON mode support at reduced cost compared to GPT-4.",
-    contextWindow: 128000,
-    maxOutputTokens: 4096,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2023-11-06",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-04-01",
-    resolvedAt: "2026-03-24T11:05:12.960Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "GPT-4 Turbo preview model with 128K context window, offering improved instruction following and JSON mode support at reduced cost compared to GPT-4.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2023-11-06",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-04-01",
+    "resolvedAt": "2026-03-24T11:05:12.960Z",
+    "baseModelName": null
   },
   "gpt-4-32k": {
-    provider: "openai",
-    description:
-      "Extended context window variant of GPT-4 with 32,768 token capacity, offering the same capabilities as GPT-4 but able to process longer documents and conversations.",
-    contextWindow: 32768,
-    maxOutputTokens: 4096,
-    capabilities: ["tool_use", "streaming", "json_mode"],
-    releaseDate: "2023-03-14",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-06-06",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:05:14.584Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "Extended context window variant of GPT-4 with 32,768 token capacity, offering the same capabilities as GPT-4 but able to process longer documents and conversations.",
+    "contextWindow": 32768,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2023-03-14",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-06-06",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:05:14.584Z",
+    "baseModelName": null
   },
   "gpt-4-32k-0314": {
-    provider: "openai",
-    description:
-      "Extended context (32k token) variant of the original GPT-4 launch snapshot from March 2024, offering the same capabilities as gpt-4-0314 but with 4x the context window.",
-    contextWindow: 32768,
-    maxOutputTokens: 4096,
-    capabilities: ["streaming"],
-    releaseDate: "2023-03-14",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2024-06-13",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:05:32.044Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "Extended context (32k token) variant of the original GPT-4 launch snapshot from March 2024, offering the same capabilities as gpt-4-0314 but with 4x the context window.",
+    "contextWindow": 32768,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "streaming"
+    ],
+    "releaseDate": "2023-03-14",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2024-06-13",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:05:32.044Z",
+    "baseModelName": null
   },
   "gpt-4-32k-0613": {
-    provider: "openai",
-    description:
-      "Extended context window variant of GPT-4 with 32,768 token context, based on the June 2023 snapshot. Offers the same capabilities as GPT-4 but with 4x the context length.",
-    contextWindow: 32768,
-    maxOutputTokens: 4096,
-    capabilities: ["tool_use", "streaming", "json_mode"],
-    releaseDate: "2023-06-13",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-06-06",
-    knowledgeCutoff: "2021-09-01",
-    resolvedAt: "2026-03-24T11:05:53.070Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "Extended context window variant of GPT-4 with 32,768 token context, based on the June 2023 snapshot. Offers the same capabilities as GPT-4 but with 4x the context length.",
+    "contextWindow": 32768,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2023-06-13",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-06-06",
+    "knowledgeCutoff": "2021-09-01",
+    "resolvedAt": "2026-03-24T11:05:53.070Z",
+    "baseModelName": null
   },
   "gpt-4-preview": {
-    provider: "openai",
-    description:
-      "GPT-4 Turbo preview model with 128K context window, JSON mode, and parallel function calling. A preview release in the GPT-4 Turbo series, now deprecated in favor of newer models.",
-    contextWindow: 128000,
-    maxOutputTokens: 4096,
-    capabilities: ["tool_use", "streaming", "json_mode"],
-    releaseDate: "2023-11-06",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2025-06-06",
-    knowledgeCutoff: "2023-04-01",
-    resolvedAt: "2026-03-24T11:06:54.248Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "GPT-4 Turbo preview model with 128K context window, JSON mode, and parallel function calling. A preview release in the GPT-4 Turbo series, now deprecated in favor of newer models.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2023-11-06",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2025-06-06",
+    "knowledgeCutoff": "2023-04-01",
+    "resolvedAt": "2026-03-24T11:06:54.248Z",
+    "baseModelName": null
   },
   "gpt-4-turbo": {
-    provider: "openai",
-    description:
-      "OpenAI's optimized GPT-4 variant offering faster inference and lower cost than the original GPT-4, with vision capabilities and a 128K context window.",
-    contextWindow: 128000,
-    maxOutputTokens: 4096,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-04-09",
-    isHidden: false,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-12-01",
-    resolvedAt: "2026-03-24T11:05:51.415Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's optimized GPT-4 variant offering faster inference and lower cost than the original GPT-4, with vision capabilities and a 128K context window.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-04-09",
+    "isHidden": false,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-12-01",
+    "resolvedAt": "2026-03-24T11:05:51.415Z",
+    "baseModelName": null
   },
   "gpt-4-turbo-2024-04-09": {
-    provider: "openai",
-    description:
-      "OpenAI's optimized GPT-4 variant offering faster inference and lower cost than the original GPT-4, with vision capabilities and a 128K context window.",
-    contextWindow: 128000,
-    maxOutputTokens: 4096,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-04-09",
-    isHidden: false,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-12-01",
-    resolvedAt: "2026-03-24T11:05:51.415Z",
-    baseModelName: "gpt-4-turbo",
+    "provider": "openai",
+    "description": "OpenAI's optimized GPT-4 variant offering faster inference and lower cost than the original GPT-4, with vision capabilities and a 128K context window.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-04-09",
+    "isHidden": false,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-12-01",
+    "resolvedAt": "2026-03-24T11:05:51.415Z",
+    "baseModelName": "gpt-4-turbo"
   },
   "gpt-4-turbo-preview": {
-    provider: "openai",
-    description:
-      "An early preview of GPT-4 Turbo with a 128K context window, offering improved instruction following and JSON mode support at reduced cost compared to GPT-4.",
-    contextWindow: 128000,
-    maxOutputTokens: 4096,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-01-25",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-12-01",
-    resolvedAt: "2026-03-24T11:05:52.346Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "An early preview of GPT-4 Turbo with a 128K context window, offering improved instruction following and JSON mode support at reduced cost compared to GPT-4.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-01-25",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-12-01",
+    "resolvedAt": "2026-03-24T11:05:52.346Z",
+    "baseModelName": null
   },
   "gpt-4-turbo-vision": {
-    provider: "openai",
-    description:
-      "OpenAI's GPT-4 Turbo model with vision capabilities, able to analyze and understand images alongside text. It was a preview model later superseded by GPT-4 Turbo (gpt-4-turbo-2024-04-09) and then GPT-4o.",
-    contextWindow: 128000,
-    maxOutputTokens: 4096,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2023-11-06",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2024-12-06",
-    knowledgeCutoff: "2023-04-01",
-    resolvedAt: "2026-03-24T11:06:38.455Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's GPT-4 Turbo model with vision capabilities, able to analyze and understand images alongside text. It was a preview model later superseded by GPT-4 Turbo (gpt-4-turbo-2024-04-09) and then GPT-4o.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2023-11-06",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2024-12-06",
+    "knowledgeCutoff": "2023-04-01",
+    "resolvedAt": "2026-03-24T11:06:38.455Z",
+    "baseModelName": null
   },
   "gpt-4.1": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship model optimized for coding, instruction following, and tool calling with a 1M token context window. Excels at structured outputs and long-context tasks.",
-    contextWindow: 1047576,
-    maxOutputTokens: 32768,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-04-14",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:07:00.439Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's flagship model optimized for coding, instruction following, and tool calling with a 1M token context window. Excels at structured outputs and long-context tasks.",
+    "contextWindow": 1047576,
+    "maxOutputTokens": 32768,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-04-14",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:07:00.439Z",
+    "baseModelName": null
   },
   "gpt-4.1-2025-04-14": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship model optimized for coding, instruction following, and tool calling with a 1M token context window. Excels at structured outputs and long-context tasks.",
-    contextWindow: 1047576,
-    maxOutputTokens: 32768,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-04-14",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:07:00.439Z",
-    baseModelName: "gpt-4.1",
+    "provider": "openai",
+    "description": "OpenAI's flagship model optimized for coding, instruction following, and tool calling with a 1M token context window. Excels at structured outputs and long-context tasks.",
+    "contextWindow": 1047576,
+    "maxOutputTokens": 32768,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-04-14",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:07:00.439Z",
+    "baseModelName": "gpt-4.1"
   },
   "gpt-4.1-mini": {
-    provider: "openai",
-    description:
-      "A compact, cost-efficient model in OpenAI's GPT-4.1 family that matches or exceeds GPT-4o on many benchmarks while offering nearly half the latency and significantly lower cost.",
-    contextWindow: 1000000,
-    maxOutputTokens: 32768,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "fine_tunable"],
-    releaseDate: "2025-04-14",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:08:14.524Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "A compact, cost-efficient model in OpenAI's GPT-4.1 family that matches or exceeds GPT-4o on many benchmarks while offering nearly half the latency and significantly lower cost.",
+    "contextWindow": 1000000,
+    "maxOutputTokens": 32768,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "fine_tunable"
+    ],
+    "releaseDate": "2025-04-14",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:08:14.524Z",
+    "baseModelName": null
   },
   "gpt-4.1-mini-2025-04-14": {
-    provider: "openai",
-    description:
-      "A compact, cost-efficient model in OpenAI's GPT-4.1 family that matches or exceeds GPT-4o on many benchmarks while offering nearly half the latency and significantly lower cost.",
-    contextWindow: 1000000,
-    maxOutputTokens: 32768,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "fine_tunable"],
-    releaseDate: "2025-04-14",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:08:14.524Z",
-    baseModelName: "gpt-4.1-mini",
+    "provider": "openai",
+    "description": "A compact, cost-efficient model in OpenAI's GPT-4.1 family that matches or exceeds GPT-4o on many benchmarks while offering nearly half the latency and significantly lower cost.",
+    "contextWindow": 1000000,
+    "maxOutputTokens": 32768,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "fine_tunable"
+    ],
+    "releaseDate": "2025-04-14",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:08:14.524Z",
+    "baseModelName": "gpt-4.1-mini"
   },
   "gpt-4.1-nano": {
-    provider: "openai",
-    description:
-      "OpenAI's fastest and most cost-effective model in the GPT-4.1 family, optimized for low-latency tasks like classification, autocompletion, and lightweight agentic workflows with strong instruction-following and tool-calling capabilities.",
-    contextWindow: 1047576,
-    maxOutputTokens: 32768,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-04-14",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:08:04.533Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's fastest and most cost-effective model in the GPT-4.1 family, optimized for low-latency tasks like classification, autocompletion, and lightweight agentic workflows with strong instruction-following and tool-calling capabilities.",
+    "contextWindow": 1047576,
+    "maxOutputTokens": 32768,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-04-14",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:08:04.533Z",
+    "baseModelName": null
   },
   "gpt-4.1-nano-2025-04-14": {
-    provider: "openai",
-    description:
-      "OpenAI's fastest and most cost-effective model in the GPT-4.1 family, optimized for low-latency tasks like classification, autocompletion, and lightweight agentic workflows with strong instruction-following and tool-calling capabilities.",
-    contextWindow: 1047576,
-    maxOutputTokens: 32768,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-04-14",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:08:04.533Z",
-    baseModelName: "gpt-4.1-nano",
+    "provider": "openai",
+    "description": "OpenAI's fastest and most cost-effective model in the GPT-4.1 family, optimized for low-latency tasks like classification, autocompletion, and lightweight agentic workflows with strong instruction-following and tool-calling capabilities.",
+    "contextWindow": 1047576,
+    "maxOutputTokens": 32768,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-04-14",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:08:04.533Z",
+    "baseModelName": "gpt-4.1-nano"
   },
   "gpt-4.5-preview": {
-    provider: "openai",
-    description:
-      "OpenAI's largest pretrained model before the GPT-5 series, emphasizing broad knowledge, creative writing, and improved emotional intelligence over reasoning-focused models.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-02-27",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2025-07-14",
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:07:57.880Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's largest pretrained model before the GPT-5 series, emphasizing broad knowledge, creative writing, and improved emotional intelligence over reasoning-focused models.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-02-27",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2025-07-14",
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:07:57.880Z",
+    "baseModelName": null
   },
   "gpt-4.5-preview-2025-02-27": {
-    provider: "openai",
-    description:
-      "OpenAI's largest pretrained model before the GPT-5 series, emphasizing broad knowledge, creative writing, and improved emotional intelligence over reasoning-focused models.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-02-27",
-    isHidden: true,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2025-07-14",
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:07:57.880Z",
-    baseModelName: "gpt-4.5-preview",
+    "provider": "openai",
+    "description": "OpenAI's largest pretrained model before the GPT-5 series, emphasizing broad knowledge, creative writing, and improved emotional intelligence over reasoning-focused models.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-02-27",
+    "isHidden": true,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2025-07-14",
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:07:57.880Z",
+    "baseModelName": "gpt-4.5-preview"
   },
   "gpt-4o": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship multimodal model combining strong reasoning with vision, audio, and tool use capabilities at faster speeds and lower cost than GPT-4 Turbo.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: [
+    "provider": "openai",
+    "description": "OpenAI's flagship multimodal model combining strong reasoning with vision, audio, and tool use capabilities at faster speeds and lower cost than GPT-4 Turbo.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "audio_input",
       "audio_output",
-      "fine_tunable",
+      "fine_tunable"
     ],
-    releaseDate: "2024-05-13",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:07:31.638Z",
-    baseModelName: null,
+    "releaseDate": "2024-05-13",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:07:31.638Z",
+    "baseModelName": null
   },
   "gpt-4o-2024-05-13": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship multimodal model combining strong reasoning with vision, audio, and tool use capabilities at faster speeds and lower cost than GPT-4 Turbo.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: [
+    "provider": "openai",
+    "description": "OpenAI's flagship multimodal model combining strong reasoning with vision, audio, and tool use capabilities at faster speeds and lower cost than GPT-4 Turbo.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "audio_input",
       "audio_output",
-      "fine_tunable",
+      "fine_tunable"
     ],
-    releaseDate: "2024-05-13",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:07:31.638Z",
-    baseModelName: "gpt-4o",
+    "releaseDate": "2024-05-13",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:07:31.638Z",
+    "baseModelName": "gpt-4o"
   },
   "gpt-4o-2024-08-06": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship multimodal model combining strong reasoning with vision, audio, and tool use capabilities at faster speeds and lower cost than GPT-4 Turbo.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: [
+    "provider": "openai",
+    "description": "OpenAI's flagship multimodal model combining strong reasoning with vision, audio, and tool use capabilities at faster speeds and lower cost than GPT-4 Turbo.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "audio_input",
       "audio_output",
-      "fine_tunable",
+      "fine_tunable"
     ],
-    releaseDate: "2024-05-13",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:07:31.638Z",
-    baseModelName: "gpt-4o",
+    "releaseDate": "2024-05-13",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:07:31.638Z",
+    "baseModelName": "gpt-4o"
   },
   "gpt-4o-2024-11-20": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship multimodal model combining strong reasoning with vision, audio, and tool use capabilities at faster speeds and lower cost than GPT-4 Turbo.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: [
+    "provider": "openai",
+    "description": "OpenAI's flagship multimodal model combining strong reasoning with vision, audio, and tool use capabilities at faster speeds and lower cost than GPT-4 Turbo.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "audio_input",
       "audio_output",
-      "fine_tunable",
+      "fine_tunable"
     ],
-    releaseDate: "2024-05-13",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:07:31.638Z",
-    baseModelName: "gpt-4o",
+    "releaseDate": "2024-05-13",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:07:31.638Z",
+    "baseModelName": "gpt-4o"
   },
   "gpt-4o-audio-preview": {
-    provider: "openai",
-    description:
-      "GPT-4o variant with native audio input and output capabilities via the Chat Completions API, supporting both text and audio modalities for conversational and voice-based applications.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: ["audio_input", "audio_output", "tool_use", "streaming"],
-    releaseDate: "2024-10-01",
-    isHidden: false,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2026-05-07",
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:08:09.590Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "GPT-4o variant with native audio input and output capabilities via the Chat Completions API, supporting both text and audio modalities for conversational and voice-based applications.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
+      "audio_input",
+      "audio_output",
+      "tool_use",
+      "streaming"
+    ],
+    "releaseDate": "2024-10-01",
+    "isHidden": false,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2026-05-07",
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:08:09.590Z",
+    "baseModelName": null
   },
   "gpt-4o-audio-preview-2024-10-01": {
-    provider: "openai",
-    description:
-      "GPT-4o variant with native audio input and output capabilities via the Chat Completions API, supporting both text and audio modalities for conversational and voice-based applications.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: ["audio_input", "audio_output", "tool_use", "streaming"],
-    releaseDate: "2024-10-01",
-    isHidden: false,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: "2026-05-07",
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:08:09.590Z",
-    baseModelName: "gpt-4o-audio-preview",
+    "provider": "openai",
+    "description": "GPT-4o variant with native audio input and output capabilities via the Chat Completions API, supporting both text and audio modalities for conversational and voice-based applications.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
+      "audio_input",
+      "audio_output",
+      "tool_use",
+      "streaming"
+    ],
+    "releaseDate": "2024-10-01",
+    "isHidden": false,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": "2026-05-07",
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:08:09.590Z",
+    "baseModelName": "gpt-4o-audio-preview"
   },
   "gpt-4o-mini": {
-    provider: "openai",
-    description:
-      "Fast, affordable small model optimized for focused tasks. Positioned as OpenAI's cost-efficient option with strong performance on benchmarks relative to its size.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "fine_tunable"],
-    releaseDate: "2024-07-18",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:09:50.130Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "Fast, affordable small model optimized for focused tasks. Positioned as OpenAI's cost-efficient option with strong performance on benchmarks relative to its size.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "fine_tunable"
+    ],
+    "releaseDate": "2024-07-18",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:09:50.130Z",
+    "baseModelName": null
   },
   "gpt-4o-mini-2024-07-18": {
-    provider: "openai",
-    description:
-      "Fast, affordable small model optimized for focused tasks. Positioned as OpenAI's cost-efficient option with strong performance on benchmarks relative to its size.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "fine_tunable"],
-    releaseDate: "2024-07-18",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:09:50.130Z",
-    baseModelName: "gpt-4o-mini",
+    "provider": "openai",
+    "description": "Fast, affordable small model optimized for focused tasks. Positioned as OpenAI's cost-efficient option with strong performance on benchmarks relative to its size.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "fine_tunable"
+    ],
+    "releaseDate": "2024-07-18",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:09:50.130Z",
+    "baseModelName": "gpt-4o-mini"
   },
   "gpt-4o-realtime-preview": {
-    provider: "openai",
-    description:
-      "OpenAI's real-time multimodal model capable of processing and generating both text and audio over WebRTC or WebSocket, enabling low-latency voice conversations and audio interactions.",
-    contextWindow: 128000,
-    maxOutputTokens: 4096,
-    capabilities: ["audio_input", "audio_output", "tool_use", "streaming"],
-    releaseDate: "2024-10-01",
-    isHidden: false,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2026-05-07",
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:09:35.495Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's real-time multimodal model capable of processing and generating both text and audio over WebRTC or WebSocket, enabling low-latency voice conversations and audio interactions.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "audio_input",
+      "audio_output",
+      "tool_use",
+      "streaming"
+    ],
+    "releaseDate": "2024-10-01",
+    "isHidden": false,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2026-05-07",
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:09:35.495Z",
+    "baseModelName": null
   },
   "gpt-4o-realtime-preview-2024-10-01": {
-    provider: "openai",
-    description:
-      "OpenAI's real-time multimodal model capable of processing and generating both text and audio over WebRTC or WebSocket, enabling low-latency voice conversations and audio interactions.",
-    contextWindow: 128000,
-    maxOutputTokens: 4096,
-    capabilities: ["audio_input", "audio_output", "tool_use", "streaming"],
-    releaseDate: "2024-10-01",
-    isHidden: false,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2026-05-07",
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:09:35.495Z",
-    baseModelName: "gpt-4o-realtime-preview",
+    "provider": "openai",
+    "description": "OpenAI's real-time multimodal model capable of processing and generating both text and audio over WebRTC or WebSocket, enabling low-latency voice conversations and audio interactions.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 4096,
+    "capabilities": [
+      "audio_input",
+      "audio_output",
+      "tool_use",
+      "streaming"
+    ],
+    "releaseDate": "2024-10-01",
+    "isHidden": false,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2026-05-07",
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:09:35.495Z",
+    "baseModelName": "gpt-4o-realtime-preview"
   },
   "gpt-5": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship reasoning model released August 2025, featuring a 400K token context window with strong coding, reasoning, and agentic capabilities.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: [
+    "provider": "openai",
+    "description": "OpenAI's flagship reasoning model released August 2025, featuring a 400K token context window with strong coding, reasoning, and agentic capabilities.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "image_generation",
-      "code_execution",
+      "code_execution"
     ],
-    releaseDate: "2025-08-07",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-09-30",
-    resolvedAt: "2026-03-24T11:09:28.216Z",
-    baseModelName: null,
+    "releaseDate": "2025-08-07",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-09-30",
+    "resolvedAt": "2026-03-24T11:09:28.216Z",
+    "baseModelName": null
   },
   "gpt-5-2025-08-07": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship reasoning model released August 2025, featuring a 400K token context window with strong coding, reasoning, and agentic capabilities.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: [
+    "provider": "openai",
+    "description": "OpenAI's flagship reasoning model released August 2025, featuring a 400K token context window with strong coding, reasoning, and agentic capabilities.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
       "vision",
       "tool_use",
       "streaming",
       "json_mode",
       "image_generation",
-      "code_execution",
+      "code_execution"
     ],
-    releaseDate: "2025-08-07",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-09-30",
-    resolvedAt: "2026-03-24T11:09:28.216Z",
-    baseModelName: "gpt-5",
+    "releaseDate": "2025-08-07",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-09-30",
+    "resolvedAt": "2026-03-24T11:09:28.216Z",
+    "baseModelName": "gpt-5"
   },
   "gpt-5-chat-latest": {
-    provider: "openai",
-    description:
-      "Non-reasoning GPT-5 model used in ChatGPT, optimized for conversational tasks. Supports text and image inputs with function calling and structured outputs.",
-    contextWindow: 128000,
-    maxOutputTokens: 16384,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-08-07",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-09-30",
-    resolvedAt: "2026-03-24T11:09:24.834Z",
-    baseModelName: "gpt-5-chat",
+    "provider": "openai",
+    "description": "Non-reasoning GPT-5 model used in ChatGPT, optimized for conversational tasks. Supports text and image inputs with function calling and structured outputs.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 16384,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-08-07",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-09-30",
+    "resolvedAt": "2026-03-24T11:09:24.834Z",
+    "baseModelName": "gpt-5-chat"
   },
   "gpt-5-mini": {
-    provider: "openai",
-    description:
-      "A faster, more cost-efficient version of GPT-5 designed for well-defined tasks and precise prompts. Supports reasoning with configurable effort levels and offers reduced latency compared to the full GPT-5 model.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-08-07",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-05-31",
-    resolvedAt: "2026-03-24T11:09:42.822Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "A faster, more cost-efficient version of GPT-5 designed for well-defined tasks and precise prompts. Supports reasoning with configurable effort levels and offers reduced latency compared to the full GPT-5 model.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-08-07",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-05-31",
+    "resolvedAt": "2026-03-24T11:09:42.822Z",
+    "baseModelName": null
   },
   "gpt-5-mini-2025-08-07": {
-    provider: "openai",
-    description:
-      "A faster, more cost-efficient version of GPT-5 designed for well-defined tasks and precise prompts. Supports reasoning with configurable effort levels and offers reduced latency compared to the full GPT-5 model.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-08-07",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-05-31",
-    resolvedAt: "2026-03-24T11:09:42.822Z",
-    baseModelName: "gpt-5-mini",
+    "provider": "openai",
+    "description": "A faster, more cost-efficient version of GPT-5 designed for well-defined tasks and precise prompts. Supports reasoning with configurable effort levels and offers reduced latency compared to the full GPT-5 model.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-08-07",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-05-31",
+    "resolvedAt": "2026-03-24T11:09:42.822Z",
+    "baseModelName": "gpt-5-mini"
   },
   "gpt-5-nano": {
-    provider: "openai",
-    description:
-      "The smallest and fastest variant in the GPT-5 family, optimized for developer tools, rapid interactions, and ultra-low latency environments. Best suited for classification, data extraction, ranking, and sub-agent tasks.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-08-07",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-05-31",
-    resolvedAt: "2026-03-24T11:11:24.884Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "The smallest and fastest variant in the GPT-5 family, optimized for developer tools, rapid interactions, and ultra-low latency environments. Best suited for classification, data extraction, ranking, and sub-agent tasks.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-08-07",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-05-31",
+    "resolvedAt": "2026-03-24T11:11:24.884Z",
+    "baseModelName": null
   },
   "gpt-5-nano-2025-08-07": {
-    provider: "openai",
-    description:
-      "The smallest and fastest variant in the GPT-5 family, optimized for developer tools, rapid interactions, and ultra-low latency environments. Best suited for classification, data extraction, ranking, and sub-agent tasks.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-08-07",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-05-31",
-    resolvedAt: "2026-03-24T11:11:24.884Z",
-    baseModelName: "gpt-5-nano",
+    "provider": "openai",
+    "description": "The smallest and fastest variant in the GPT-5 family, optimized for developer tools, rapid interactions, and ultra-low latency environments. Best suited for classification, data extraction, ranking, and sub-agent tasks.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-08-07",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-05-31",
+    "resolvedAt": "2026-03-24T11:11:24.884Z",
+    "baseModelName": "gpt-5-nano"
   },
   "gpt-5-pro": {
-    provider: "openai",
-    description:
-      "OpenAI's enhanced GPT-5 variant optimized for complex tasks requiring step-by-step reasoning, with reduced hallucination and improved code quality compared to the base GPT-5.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-10-06",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-10-01",
-    resolvedAt: "2026-03-24T11:11:37.048Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's enhanced GPT-5 variant optimized for complex tasks requiring step-by-step reasoning, with reduced hallucination and improved code quality compared to the base GPT-5.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-10-06",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-10-01",
+    "resolvedAt": "2026-03-24T11:11:37.048Z",
+    "baseModelName": null
   },
   "gpt-5-pro-2025-10-06": {
-    provider: "openai",
-    description:
-      "OpenAI's enhanced GPT-5 variant optimized for complex tasks requiring step-by-step reasoning, with reduced hallucination and improved code quality compared to the base GPT-5.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-10-06",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-10-01",
-    resolvedAt: "2026-03-24T11:11:37.048Z",
-    baseModelName: "gpt-5-pro",
+    "provider": "openai",
+    "description": "OpenAI's enhanced GPT-5 variant optimized for complex tasks requiring step-by-step reasoning, with reduced hallucination and improved code quality compared to the base GPT-5.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-10-06",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-10-01",
+    "resolvedAt": "2026-03-24T11:11:37.048Z",
+    "baseModelName": "gpt-5-pro"
   },
   "gpt-5.1": {
-    provider: "openai",
-    description:
-      "GPT-5.1 is OpenAI's frontier-grade model in the GPT-5 series, offering adaptive reasoning with configurable effort levels, improved coding and math performance, and a more natural conversational style compared to GPT-5.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-11-13",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-09-30",
-    resolvedAt: "2026-03-24T11:11:47.327Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "GPT-5.1 is OpenAI's frontier-grade model in the GPT-5 series, offering adaptive reasoning with configurable effort levels, improved coding and math performance, and a more natural conversational style compared to GPT-5.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-11-13",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-09-30",
+    "resolvedAt": "2026-03-24T11:11:47.327Z",
+    "baseModelName": null
   },
   "gpt-5.1-2025-11-13": {
-    provider: "openai",
-    description:
-      "GPT-5.1 is OpenAI's frontier-grade model in the GPT-5 series, offering adaptive reasoning with configurable effort levels, improved coding and math performance, and a more natural conversational style compared to GPT-5.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2025-11-13",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-09-30",
-    resolvedAt: "2026-03-24T11:11:47.327Z",
-    baseModelName: "gpt-5.1",
+    "provider": "openai",
+    "description": "GPT-5.1 is OpenAI's frontier-grade model in the GPT-5 series, offering adaptive reasoning with configurable effort levels, improved coding and math performance, and a more natural conversational style compared to GPT-5.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2025-11-13",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-09-30",
+    "resolvedAt": "2026-03-24T11:11:47.327Z",
+    "baseModelName": "gpt-5.1"
   },
   "gpt-5.2": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship multimodal model released December 2025, excelling at long-context reasoning, agentic tool use, software engineering, and professional knowledge work. Available in Instant, Thinking, and Pro variants.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-12-11",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:11:13.129Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's flagship multimodal model released December 2025, excelling at long-context reasoning, agentic tool use, software engineering, and professional knowledge work. Available in Instant, Thinking, and Pro variants.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-12-11",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:11:13.129Z",
+    "baseModelName": null
   },
   "gpt-5.2-2025-12-11": {
-    provider: "openai",
-    description:
-      "OpenAI's flagship multimodal model released December 2025, excelling at long-context reasoning, agentic tool use, software engineering, and professional knowledge work. Available in Instant, Thinking, and Pro variants.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-12-11",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:11:13.129Z",
-    baseModelName: "gpt-5.2",
+    "provider": "openai",
+    "description": "OpenAI's flagship multimodal model released December 2025, excelling at long-context reasoning, agentic tool use, software engineering, and professional knowledge work. Available in Instant, Thinking, and Pro variants.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-12-11",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:11:13.129Z",
+    "baseModelName": "gpt-5.2"
   },
   "gpt-5.2-pro": {
-    provider: "openai",
-    description:
-      "OpenAI's previous pro-tier reasoning model optimized for complex professional work requiring step-by-step reasoning, instruction following, and accuracy in high-stakes use cases. Superseded by GPT-5.4 pro.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "extended_thinking"],
-    releaseDate: "2025-12-11",
-    isHidden: false,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:11:12.711Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's previous pro-tier reasoning model optimized for complex professional work requiring step-by-step reasoning, instruction following, and accuracy in high-stakes use cases. Superseded by GPT-5.4 pro.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-12-11",
+    "isHidden": false,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:11:12.711Z",
+    "baseModelName": null
   },
   "gpt-5.2-pro-2025-12-11": {
-    provider: "openai",
-    description:
-      "OpenAI's previous pro-tier reasoning model optimized for complex professional work requiring step-by-step reasoning, instruction following, and accuracy in high-stakes use cases. Superseded by GPT-5.4 pro.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "extended_thinking"],
-    releaseDate: "2025-12-11",
-    isHidden: false,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:11:12.711Z",
-    baseModelName: "gpt-5.2-pro",
+    "provider": "openai",
+    "description": "OpenAI's previous pro-tier reasoning model optimized for complex professional work requiring step-by-step reasoning, instruction following, and accuracy in high-stakes use cases. Superseded by GPT-5.4 pro.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-12-11",
+    "isHidden": false,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:11:12.711Z",
+    "baseModelName": "gpt-5.2-pro"
   },
   "gpt-5.4": {
-    provider: "openai",
-    description:
-      "OpenAI's most capable frontier model as of March 2026, featuring state-of-the-art coding, native computer-use capabilities, and a 1M-token context window for professional and agentic workflows.",
-    contextWindow: 1050000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "code_execution"],
-    releaseDate: "2026-03-05",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:12:09.220Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's most capable frontier model as of March 2026, featuring state-of-the-art coding, native computer-use capabilities, and a 1M-token context window for professional and agentic workflows.",
+    "contextWindow": 1050000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "code_execution"
+    ],
+    "releaseDate": "2026-03-05",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:12:09.220Z",
+    "baseModelName": null
   },
   "gpt-5.4-2026-03-05": {
-    provider: "openai",
-    description:
-      "OpenAI's most capable frontier model as of March 2026, featuring state-of-the-art coding, native computer-use capabilities, and a 1M-token context window for professional and agentic workflows.",
-    contextWindow: 1050000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "code_execution"],
-    releaseDate: "2026-03-05",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:12:09.220Z",
-    baseModelName: "gpt-5.4",
+    "provider": "openai",
+    "description": "OpenAI's most capable frontier model as of March 2026, featuring state-of-the-art coding, native computer-use capabilities, and a 1M-token context window for professional and agentic workflows.",
+    "contextWindow": 1050000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "code_execution"
+    ],
+    "releaseDate": "2026-03-05",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:12:09.220Z",
+    "baseModelName": "gpt-5.4"
   },
   "gpt-5.4-mini": {
-    provider: "openai",
-    description:
-      "OpenAI's fast and efficient small model from the GPT-5.4 family, designed for high-volume workloads. Approaches GPT-5.4 performance on coding and reasoning while running over 2x faster than GPT-5 mini.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2026-03-17",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:12:35.473Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's fast and efficient small model from the GPT-5.4 family, designed for high-volume workloads. Approaches GPT-5.4 performance on coding and reasoning while running over 2x faster than GPT-5 mini.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2026-03-17",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:12:35.473Z",
+    "baseModelName": null
   },
   "gpt-5.4-mini-2026-03-17": {
-    provider: "openai",
-    description:
-      "OpenAI's fast and efficient small model from the GPT-5.4 family, designed for high-volume workloads. Approaches GPT-5.4 performance on coding and reasoning while running over 2x faster than GPT-5 mini.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2026-03-17",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:12:35.473Z",
-    baseModelName: "gpt-5.4-mini",
+    "provider": "openai",
+    "description": "OpenAI's fast and efficient small model from the GPT-5.4 family, designed for high-volume workloads. Approaches GPT-5.4 performance on coding and reasoning while running over 2x faster than GPT-5 mini.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2026-03-17",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:12:35.473Z",
+    "baseModelName": "gpt-5.4-mini"
   },
   "gpt-5.4-nano": {
-    provider: "openai",
-    description:
-      "OpenAI's cheapest GPT-5.4-class model optimized for simple high-volume tasks like classification, data extraction, ranking, and sub-agent delegation in agentic workflows.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2026-03-17",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:12:52.285Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's cheapest GPT-5.4-class model optimized for simple high-volume tasks like classification, data extraction, ranking, and sub-agent delegation in agentic workflows.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2026-03-17",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:12:52.285Z",
+    "baseModelName": null
   },
   "gpt-5.4-nano-2026-03-17": {
-    provider: "openai",
-    description:
-      "OpenAI's cheapest GPT-5.4-class model optimized for simple high-volume tasks like classification, data extraction, ranking, and sub-agent delegation in agentic workflows.",
-    contextWindow: 400000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2026-03-17",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:12:52.285Z",
-    baseModelName: "gpt-5.4-nano",
+    "provider": "openai",
+    "description": "OpenAI's cheapest GPT-5.4-class model optimized for simple high-volume tasks like classification, data extraction, ranking, and sub-agent delegation in agentic workflows.",
+    "contextWindow": 400000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2026-03-17",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:12:52.285Z",
+    "baseModelName": "gpt-5.4-nano"
   },
   "gpt-5.4-pro": {
-    provider: "openai",
-    description:
-      "OpenAI's highest-capability GPT-5.4 variant, using additional compute for harder problems. Available via Responses API only, designed for complex reasoning, coding, and agentic workflows.",
-    contextWindow: 1050000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "extended_thinking"],
-    releaseDate: "2026-03-05",
-    isHidden: false,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:12:56.903Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's highest-capability GPT-5.4 variant, using additional compute for harder problems. Available via Responses API only, designed for complex reasoning, coding, and agentic workflows.",
+    "contextWindow": 1050000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "extended_thinking"
+    ],
+    "releaseDate": "2026-03-05",
+    "isHidden": false,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:12:56.903Z",
+    "baseModelName": null
   },
   "gpt-5.4-pro-2026-03-05": {
-    provider: "openai",
-    description:
-      "OpenAI's highest-capability GPT-5.4 variant, using additional compute for harder problems. Available via Responses API only, designed for complex reasoning, coding, and agentic workflows.",
-    contextWindow: 1050000,
-    maxOutputTokens: 128000,
-    capabilities: ["vision", "tool_use", "streaming", "extended_thinking"],
-    releaseDate: "2026-03-05",
-    isHidden: false,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-08-31",
-    resolvedAt: "2026-03-24T11:12:56.903Z",
-    baseModelName: "gpt-5.4-pro",
-  },
-  o1: {
-    provider: "openai",
-    description:
-      "OpenAI's reasoning model designed for complex tasks requiring multi-step logical thinking, excelling at math, science, and coding problems.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-12-17",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:12:23.948Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's highest-capability GPT-5.4 variant, using additional compute for harder problems. Available via Responses API only, designed for complex reasoning, coding, and agentic workflows.",
+    "contextWindow": 1050000,
+    "maxOutputTokens": 128000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "extended_thinking"
+    ],
+    "releaseDate": "2026-03-05",
+    "isHidden": false,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-08-31",
+    "resolvedAt": "2026-03-24T11:12:56.903Z",
+    "baseModelName": "gpt-5.4-pro"
+  },
+  "o1": {
+    "provider": "openai",
+    "description": "OpenAI's reasoning model designed for complex tasks requiring multi-step logical thinking, excelling at math, science, and coding problems.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-12-17",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:12:23.948Z",
+    "baseModelName": null
   },
   "o1-2024-12-17": {
-    provider: "openai",
-    description:
-      "OpenAI's reasoning model designed for complex tasks requiring multi-step logical thinking, excelling at math, science, and coding problems.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode"],
-    releaseDate: "2024-12-17",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:12:23.948Z",
-    baseModelName: "o1",
+    "provider": "openai",
+    "description": "OpenAI's reasoning model designed for complex tasks requiring multi-step logical thinking, excelling at math, science, and coding problems.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-12-17",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:12:23.948Z",
+    "baseModelName": "o1"
   },
   "o1-mini": {
-    provider: "openai",
-    description:
-      "A smaller, faster, and cheaper reasoning model in OpenAI's o1 series, optimized for coding, math, and science tasks requiring multi-step reasoning.",
-    contextWindow: 128000,
-    maxOutputTokens: 65536,
-    capabilities: ["streaming", "json_mode"],
-    releaseDate: "2024-09-12",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-06-30",
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:12:37.030Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "A smaller, faster, and cheaper reasoning model in OpenAI's o1 series, optimized for coding, math, and science tasks requiring multi-step reasoning.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 65536,
+    "capabilities": [
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-09-12",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-06-30",
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:12:37.030Z",
+    "baseModelName": null
   },
   "o1-mini-2024-09-12": {
-    provider: "openai",
-    description:
-      "A smaller, faster, and cheaper reasoning model in OpenAI's o1 series, optimized for coding, math, and science tasks requiring multi-step reasoning.",
-    contextWindow: 128000,
-    maxOutputTokens: 65536,
-    capabilities: ["streaming", "json_mode"],
-    releaseDate: "2024-09-12",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-06-30",
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:12:37.030Z",
-    baseModelName: "o1-mini",
+    "provider": "openai",
+    "description": "A smaller, faster, and cheaper reasoning model in OpenAI's o1 series, optimized for coding, math, and science tasks requiring multi-step reasoning.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 65536,
+    "capabilities": [
+      "streaming",
+      "json_mode"
+    ],
+    "releaseDate": "2024-09-12",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-06-30",
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:12:37.030Z",
+    "baseModelName": "o1-mini"
   },
   "o1-preview": {
-    provider: "openai",
-    description:
-      "OpenAI's first reasoning model using chain-of-thought to solve complex problems in science, coding, and math. Predecessor to o1 and o3 series.",
-    contextWindow: 128000,
-    maxOutputTokens: 32768,
-    capabilities: ["streaming"],
-    releaseDate: "2024-09-12",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-10-31",
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:12:59.198Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's first reasoning model using chain-of-thought to solve complex problems in science, coding, and math. Predecessor to o1 and o3 series.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 32768,
+    "capabilities": [
+      "streaming"
+    ],
+    "releaseDate": "2024-09-12",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-10-31",
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:12:59.198Z",
+    "baseModelName": null
   },
   "o1-preview-2024-09-12": {
-    provider: "openai",
-    description:
-      "OpenAI's first reasoning model using chain-of-thought to solve complex problems in science, coding, and math. Predecessor to o1 and o3 series.",
-    contextWindow: 128000,
-    maxOutputTokens: 32768,
-    capabilities: ["streaming"],
-    releaseDate: "2024-09-12",
-    isHidden: true,
-    supportsStructuredOutput: false,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: "2025-10-31",
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:12:59.198Z",
-    baseModelName: "o1-preview",
+    "provider": "openai",
+    "description": "OpenAI's first reasoning model using chain-of-thought to solve complex problems in science, coding, and math. Predecessor to o1 and o3 series.",
+    "contextWindow": 128000,
+    "maxOutputTokens": 32768,
+    "capabilities": [
+      "streaming"
+    ],
+    "releaseDate": "2024-09-12",
+    "isHidden": true,
+    "supportsStructuredOutput": false,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": "2025-10-31",
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:12:59.198Z",
+    "baseModelName": "o1-preview"
   },
   "o1-pro": {
-    provider: "openai",
-    description:
-      "A version of OpenAI's o1 reasoning model that uses significantly more compute to deliver better, more consistent answers on complex reasoning tasks in science, coding, and math.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["vision", "tool_use", "json_mode", "extended_thinking"],
-    releaseDate: "2025-03-19",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:13:57.532Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "A version of OpenAI's o1 reasoning model that uses significantly more compute to deliver better, more consistent answers on complex reasoning tasks in science, coding, and math.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-03-19",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:13:57.532Z",
+    "baseModelName": null
   },
   "o1-pro-2025-03-19": {
-    provider: "openai",
-    description:
-      "A version of OpenAI's o1 reasoning model that uses significantly more compute to deliver better, more consistent answers on complex reasoning tasks in science, coding, and math.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["vision", "tool_use", "json_mode", "extended_thinking"],
-    releaseDate: "2025-03-19",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: "2023-10-01",
-    resolvedAt: "2026-03-24T11:13:57.532Z",
-    baseModelName: "o1-pro",
-  },
-  o3: {
-    provider: "openai",
-    description:
-      "OpenAI's advanced reasoning model designed for complex tasks requiring deep reasoning, excelling at software engineering, mathematics, scientific reasoning, and visual reasoning tasks.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-04-16",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:14:04.906Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "A version of OpenAI's o1 reasoning model that uses significantly more compute to deliver better, more consistent answers on complex reasoning tasks in science, coding, and math.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-03-19",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2023-10-01",
+    "resolvedAt": "2026-03-24T11:13:57.532Z",
+    "baseModelName": "o1-pro"
+  },
+  "o3": {
+    "provider": "openai",
+    "description": "OpenAI's advanced reasoning model designed for complex tasks requiring deep reasoning, excelling at software engineering, mathematics, scientific reasoning, and visual reasoning tasks.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-04-16",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:14:04.906Z",
+    "baseModelName": null
   },
   "o3-2025-04-16": {
-    provider: "openai",
-    description:
-      "OpenAI's advanced reasoning model designed for complex tasks requiring deep reasoning, excelling at software engineering, mathematics, scientific reasoning, and visual reasoning tasks.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-04-16",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:14:04.906Z",
-    baseModelName: "o3",
+    "provider": "openai",
+    "description": "OpenAI's advanced reasoning model designed for complex tasks requiring deep reasoning, excelling at software engineering, mathematics, scientific reasoning, and visual reasoning tasks.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-04-16",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:14:04.906Z",
+    "baseModelName": "o3"
   },
   "o3-mini": {
-    provider: "openai",
-    description:
-      "OpenAI's compact reasoning model optimized for STEM tasks, offering strong performance in math, science, and coding at lower cost than o3.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-01-31",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-01-01",
-    resolvedAt: "2026-03-24T11:13:33.788Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's compact reasoning model optimized for STEM tasks, offering strong performance in math, science, and coding at lower cost than o3.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-01-31",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-01-01",
+    "resolvedAt": "2026-03-24T11:13:33.788Z",
+    "baseModelName": null
   },
   "o3-mini-2025-01-31": {
-    provider: "openai",
-    description:
-      "OpenAI's compact reasoning model optimized for STEM tasks, offering strong performance in math, science, and coding at lower cost than o3.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-01-31",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2025-01-01",
-    resolvedAt: "2026-03-24T11:13:33.788Z",
-    baseModelName: "o3-mini",
+    "provider": "openai",
+    "description": "OpenAI's compact reasoning model optimized for STEM tasks, offering strong performance in math, science, and coding at lower cost than o3.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-01-31",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2025-01-01",
+    "resolvedAt": "2026-03-24T11:13:33.788Z",
+    "baseModelName": "o3-mini"
   },
   "o3-pro": {
-    provider: "openai",
-    description:
-      "OpenAI's most reliable reasoning model, a version of o3 designed to think longer and provide more consistently accurate answers for challenging math, science, and coding problems.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-06-10",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:14:10.900Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's most reliable reasoning model, a version of o3 designed to think longer and provide more consistently accurate answers for challenging math, science, and coding problems.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-06-10",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:14:10.900Z",
+    "baseModelName": null
   },
   "o3-pro-2025-06-10": {
-    provider: "openai",
-    description:
-      "OpenAI's most reliable reasoning model, a version of o3 designed to think longer and provide more consistently accurate answers for challenging math, science, and coding problems.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-06-10",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: false,
-    supportsStreamingToolCalls: false,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:14:10.900Z",
-    baseModelName: "o3-pro",
+    "provider": "openai",
+    "description": "OpenAI's most reliable reasoning model, a version of o3 designed to think longer and provide more consistently accurate answers for challenging math, science, and coding problems.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-06-10",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": false,
+    "supportsStreamingToolCalls": false,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:14:10.900Z",
+    "baseModelName": "o3-pro"
   },
   "o4-mini": {
-    provider: "openai",
-    description:
-      "OpenAI's small reasoning model optimized for fast, cost-efficient reasoning with strong performance in math, coding, and visual tasks.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-04-16",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:14:16.050Z",
-    baseModelName: null,
+    "provider": "openai",
+    "description": "OpenAI's small reasoning model optimized for fast, cost-efficient reasoning with strong performance in math, coding, and visual tasks.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-04-16",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:14:16.050Z",
+    "baseModelName": null
   },
   "o4-mini-2025-04-16": {
-    provider: "openai",
-    description:
-      "OpenAI's small reasoning model optimized for fast, cost-efficient reasoning with strong performance in math, coding, and visual tasks.",
-    contextWindow: 200000,
-    maxOutputTokens: 100000,
-    capabilities: ["vision", "tool_use", "streaming", "json_mode", "extended_thinking"],
-    releaseDate: "2025-04-16",
-    isHidden: false,
-    supportsStructuredOutput: true,
-    supportsParallelToolCalls: true,
-    supportsStreamingToolCalls: true,
-    deprecationDate: null,
-    knowledgeCutoff: "2024-06-01",
-    resolvedAt: "2026-03-24T11:14:16.050Z",
-    baseModelName: "o4-mini",
-  },
+    "provider": "openai",
+    "description": "OpenAI's small reasoning model optimized for fast, cost-efficient reasoning with strong performance in math, coding, and visual tasks.",
+    "contextWindow": 200000,
+    "maxOutputTokens": 100000,
+    "capabilities": [
+      "vision",
+      "tool_use",
+      "streaming",
+      "json_mode",
+      "extended_thinking"
+    ],
+    "releaseDate": "2025-04-16",
+    "isHidden": false,
+    "supportsStructuredOutput": true,
+    "supportsParallelToolCalls": true,
+    "supportsStreamingToolCalls": true,
+    "deprecationDate": null,
+    "knowledgeCutoff": "2024-06-01",
+    "resolvedAt": "2026-03-24T11:14:16.050Z",
+    "baseModelName": "o4-mini"
+  }
 };
diff --git a/internal-packages/run-store/src/runOpsStore.idSetResidencyRouting.test.ts b/internal-packages/run-store/src/runOpsStore.idSetResidencyRouting.test.ts
new file mode 100644
index 00000000000..7e9231e7f86
--- /dev/null
+++ b/internal-packages/run-store/src/runOpsStore.idSetResidencyRouting.test.ts
@@ -0,0 +1,132 @@
+import { heteroPostgresTest } from "@internal/testcontainers";
+import type { PrismaClient } from "@trigger.dev/database";
+import { classifyResidency } from "@trigger.dev/core/v3/isomorphic";
+import { describe, expect } from "vitest";
+import { PostgresRunStore } from "./PostgresRunStore.js";
+import { RoutingRunStore } from "./runOpsStore.js";
+
+const ORG_ID = "orgroute0000000000000001";
+const PROJ_ID = "projroute00000000000001";
+const ENV_ID = "envroute0000000000000001";
+
+const newId = (i: number) => "k".repeat(20) + String(i).padStart(4, "0") + "01";
+const cuidId = (i: number) => "c".repeat(21) + String(i).padStart(4, "0");
+
+async function seedShared(prisma: PrismaClient, suffix: string) {
+  await prisma.organization.create({
+    data: { id: ORG_ID, title: `Route ${suffix}`, slug: `route-${suffix}` },
+  });
+  await prisma.project.create({
+    data: {
+      id: PROJ_ID,
+      name: `Route ${suffix}`,
+      slug: `route-${suffix}`,
+      externalRef: `proj_route_${suffix}`,
+      organizationId: ORG_ID,
+    },
+  });
+  await prisma.runtimeEnvironment.create({
+    data: {
+      id: ENV_ID,
+      type: "PRODUCTION",
+      slug: "prod",
+      projectId: PROJ_ID,
+      organizationId: ORG_ID,
+      apiKey: `tr_prod_${suffix}`,
+      pkApiKey: `pk_prod_${suffix}`,
+      shortcode: `short_${suffix}`,
+    },
+  });
+}
+
+const BASE = new Date("2026-01-01T00:00:00.000Z").getTime();
+
+async function seedRun(prisma: PrismaClient, id: string, offsetSec: number) {
+  await prisma.taskRun.create({
+    data: {
+      id,
+      engine: "V2",
+      status: "COMPLETED_SUCCESSFULLY",
+      friendlyId: `run_${id}`,
+      runtimeEnvironmentId: ENV_ID,
+      environmentType: "PRODUCTION",
+      organizationId: ORG_ID,
+      projectId: PROJ_ID,
+      taskIdentifier: "route-task",
+      payload: "{}",
+      payloadType: "application/json",
+      traceId: `trace_${id}`,
+      spanId: `span_${id}`,
+      queue: "task/route",
+      isTest: false,
+      taskEventStore: "taskEvent",
+      depth: 0,
+      createdAt: new Date(BASE + offsetSec * 1000),
+    },
+  });
+}
+
+describe("RoutingRunStore id-set residency routing", () => {
+  heteroPostgresTest(
+    "routes each id to its owning store and merges in orderBy order",
+    { timeout: 120000 },
+    async ({ prisma14, prisma17 }) => {
+      for (let i = 0; i < 5; i++) {
+        expect(classifyResidency(newId(i))).toBe("NEW");
+        expect(classifyResidency(cuidId(i))).toBe("LEGACY");
+      }
+
+      await seedShared(prisma14, "legacy");
+      await seedShared(prisma17, "new");
+
+      for (let i = 0; i < 5; i++) {
+        await seedRun(prisma17, newId(i), i * 2 + 1);
+        await seedRun(prisma14, cuidId(i), i * 2);
+      }
+
+      const legacyStore = new PostgresRunStore({ prisma: prisma14, readOnlyPrisma: prisma14 });
+      const newStore = new PostgresRunStore({ prisma: prisma17, readOnlyPrisma: prisma17 });
+      const router = new RoutingRunStore({ new: newStore, legacy: legacyStore });
+
+      const mixedIds = [0, 1, 2, 3, 4].flatMap((i) => [newId(i), cuidId(i)]);
+      const globalDesc = [
+        newId(4),
+        cuidId(4),
+        newId(3),
+        cuidId(3),
+        newId(2),
+        cuidId(2),
+        newId(1),
+        cuidId(1),
+        newId(0),
+        cuidId(0),
+      ];
+
+      const all = (await router.findRuns({
+        where: { id: { in: mixedIds } },
+        orderBy: { createdAt: "desc" },
+        take: 100,
+      })) as Array<{ id: string }>;
+      expect(all.map((r) => r.id)).toEqual(globalDesc);
+
+      const top4 = (await router.findRuns({
+        where: { id: { in: mixedIds } },
+        orderBy: { createdAt: "desc" },
+        take: 4,
+      })) as Array<{ id: string }>;
+      expect(top4.map((r) => r.id)).toEqual(globalDesc.slice(0, 4));
+
+      const newOnly = (await router.findRuns({
+        where: { id: { in: [newId(0), newId(2), newId(4)] } },
+        orderBy: { createdAt: "asc" },
+      })) as Array<{ id: string }>;
+      expect(newOnly.map((r) => r.id)).toEqual([newId(0), newId(2), newId(4)]);
+
+      const legacyOnly = (await router.findRuns({
+        where: { id: { in: [cuidId(1), cuidId(3)] } },
+        orderBy: { createdAt: "asc" },
+      })) as Array<{ id: string }>;
+      expect(legacyOnly.map((r) => r.id)).toEqual([cuidId(1), cuidId(3)]);
+    }
+  );
+});
diff --git a/internal-packages/run-store/src/runOpsStore.mixedResidency.test.ts b/internal-packages/run-store/src/runOpsStore.mixedResidency.test.ts
index ba87c75ff5e..cf21212016b 100644
--- a/internal-packages/run-store/src/runOpsStore.mixedResidency.test.ts
+++ b/internal-packages/run-store/src/runOpsStore.mixedResidency.test.ts
@@ -262,11 +262,8 @@ describe("RoutingRunStore — mixed-residency matrix (cuid #legacy + run-ops id
     }
   );
 
-  // ── Case 1b: NEW-wins on id collision in #findRunsByIdSet ──
-  // The copy→fence window can leave the same id on both DBs. The id-set path queries NEW first; an id
-  // already found on NEW must NOT be re-fetched from LEGACY, so the NEW copy wins.
   heteroRunOpsPostgresTest(
-    "case 1b: findRuns by id-set with a colliding id resolves to the NEW copy",
+    "case 1b: findRuns by id-set routes a cuid id to LEGACY only, ignoring any NEW copy",
     async ({ prisma14, prisma17 }) => {
       const { router } = makeSplitRouter(prisma14, prisma17);
       const env = await seedSharedEnv(prisma14, "m1b");
@@ -304,8 +301,8 @@ describe("RoutingRunStore — mixed-residency matrix (cuid #legacy + run-ops id
         where: { id: { in: [collidingId] } },
         select: { id: true, taskIdentifier: true },
       });
-      expect(rows).toHaveLength(1); // deduped, not double-reported
-      expect((rows[0] as any).taskIdentifier).toBe("new-copy-wins"); // NEW wins
+      expect(rows).toHaveLength(1);
+      expect((rows[0] as any).taskIdentifier).toBe("my-task");
     }
   );
 
diff --git a/internal-packages/run-store/src/runOpsStore.test.ts b/internal-packages/run-store/src/runOpsStore.test.ts
index 75f838deb34..a7c5adbbfb2 100644
--- a/internal-packages/run-store/src/runOpsStore.test.ts
+++ b/internal-packages/run-store/src/runOpsStore.test.ts
@@ -1004,10 +1004,8 @@ describe("RoutingRunStore.findRuns split-mode fan-out + drain", () => {
     }
   );
 
-  // A run present on BOTH DBs (the copy->fence migration window) must be returned ONCE,
-  // and the NEW copy wins.
   heteroPostgresTest(
-    "id-set dedupes a run present on both DBs, preferring NEW",
+    "id-set routes a cuid id to its LEGACY owner and does not consult NEW",
     async ({ prisma14, prisma17 }) => {
       const legacyStore = new PostgresRunStore({ prisma: prisma14, readOnlyPrisma: prisma14 });
       const newStore = new PostgresRunStore({ prisma: prisma17, readOnlyPrisma: prisma17 });
@@ -1031,7 +1029,7 @@ describe("RoutingRunStore.findRuns split-mode fan-out + drain", () => {
         select: { id: true, taskIdentifier: true },
       })) as Array<{ id: string; taskIdentifier: string }>;
       expect(rows).toHaveLength(1);
-      expect(rows[0]!.taskIdentifier).toBe("from-new");
+      expect(rows[0]!.taskIdentifier).toBe("from-legacy");
     }
   );
 
diff --git a/internal-packages/run-store/src/runOpsStore.ts b/internal-packages/run-store/src/runOpsStore.ts
index ba496980768..467df81df26 100644
--- a/internal-packages/run-store/src/runOpsStore.ts
+++ b/internal-packages/run-store/src/runOpsStore.ts
@@ -301,12 +301,12 @@ export class RoutingRunStore implements RunStore {
     },
     client?: ReadClient
   ): Promise<unknown> {
-    // SPLIT-mode fan-out across NEW + LEGACY. A `findRuns` `where` can span ids of mixed
-    // residency, so we resolve each owning store and merge, preserving orderBy/take/skip.
-    // The caller's client is never forwarded verbatim (it is the control-plane client); its
-    // presence routes each leg to that store's OWN primary (read-your-writes), else each store
-    // reads its own replica as before. NEW wins on id collisions (the copy->fence migration
-    // window) so a half-migrated run is never double-reported.
+    // SPLIT-mode routing across NEW + LEGACY. A bounded id set is routed per id to its owning
+    // store by residency (#findRunsByIdSet); an open predicate with no id to route on unions both
+    // stores and dedupes NEW-wins (#findRunsOpen). Either way orderBy/take/skip are re-imposed
+    // globally over the merged rows. The caller's client is never forwarded verbatim (it is the
+    // control-plane client); its presence routes each leg to that store's OWN primary
+    // (read-your-writes), else each store reads its own replica as before.
     return this.#findRunsRouted(args, client);
   }
 
@@ -324,33 +324,27 @@ export class RoutingRunStore implements RunStore {
     return idList ? this.#findRunsByIdSet(args, idList, client) : this.#findRunsOpen(args, client);
   }
 
-  // Bounded id-set (the list hydrate + engine sweeps). Query NEW for the whole set first
-  // (it holds run-ops runs); probe LEGACY only for the ids NEW missed that could still live
-  // there (cuid). The two id sets are disjoint by construction, so the merge needs no dedupe.
+  // Bounded id-set (the list hydrate + engine sweeps). Residency is a total function of the id
+  // (classifyResidency), so route each id to its owning store and query each store only for its
+  // own ids, in parallel; never query NEW for a cuid or LEGACY for a run-ops id. The partitions
+  // are disjoint by construction, so the merge needs no dedupe. take/skip are never pushed per
+  // store (that would truncate a store's page before the merge knows membership); finalizeRows
+  // re-imposes orderBy/take/skip once, globally, over the merged rows.
   async #findRunsByIdSet(
     args: FindRunsArgs,
     ids: string[],
     client?: ReadClient
   ): Promise<unknown[]> {
     const { args: selArgs, addedFields } = ensureProjected(args);
-    // The id set already bounds the per-store result, so never push take/skip down — doing
-    // so would truncate a store's page before the merge knows membership and mis-attribute
-    // rows. take/skip are applied once, globally, in finalizeRows.
     const fan = { ...selArgs, take: undefined, skip: undefined };
+    const newIds = ids.filter((id) => this.#classifySafe(id) === "NEW");
+    const legacyIds = ids.filter((id) => this.#classifySafe(id) !== "NEW");
     const findNew = this.#findManyOn(this.#new, client);
     const findLegacy = this.#findManyOn(this.#legacy, client);
-
-    const newRows = await findNew(fan);
-    const foundIds = new Set(newRows.map((r) => r.id as string));
-
-    const toLegacy: string[] = [];
-    for (const id of ids) {
-      if (foundIds.has(id)) continue;
-      if (this.#classifySafe(id) === "NEW") continue; // run-ops id: cannot live on LEGACY
-      toLegacy.push(id);
-    }
-
-    const legacyRows = toLegacy.length > 0 ? await findLegacy(narrowToIds(fan, toLegacy)) : [];
+    const [newRows, legacyRows] = await Promise.all([
+      newIds.length > 0 ? findNew(narrowToIds(fan, newIds)) : [],
+      legacyIds.length > 0 ? findLegacy(narrowToIds(fan, legacyIds)) : [],
+    ]);
     return finalizeRows([...newRows, ...legacyRows], args, addedFields);
   }
 
diff --git a/package.json b/package.json
index dddb2275380..3b00102ac83 100644
--- a/package.json
+++ b/package.json
@@ -102,7 +102,7 @@
       "@ai-sdk/provider-utils@^4": "4.0.29",
       "express@^4>body-parser": "1.20.3",
       "@remix-run/dev@2.17.5>tar-fs": "2.1.4",
-      "tar@>=7 <7.5.11": "^7.5.11",
+      "tar": "7.5.19",
       "form-data@^2": "2.5.4",
       "form-data@^3": "3.0.5",
       "form-data@^4": "4.0.6",
diff --git a/packages/build/CHANGELOG.md b/packages/build/CHANGELOG.md
index def8d5fe79d..c8bbf39dd05 100644
--- a/packages/build/CHANGELOG.md
+++ b/packages/build/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @trigger.dev/build
 
+## 4.5.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.5.7`
+
 ## 4.5.6
 
 ### Patch Changes
diff --git a/packages/build/package.json b/packages/build/package.json
index dcadb68db99..e598555da86 100644
--- a/packages/build/package.json
+++ b/packages/build/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/build",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "trigger.dev build extensions",
   "license": "MIT",
   "publishConfig": {
@@ -79,7 +79,7 @@
   },
   "dependencies": {
     "@prisma/config": "^6.10.0",
-    "@trigger.dev/core": "workspace:4.5.6",
+    "@trigger.dev/core": "workspace:4.5.7",
     "mlly": "^1.7.1",
     "pkg-types": "^1.1.3",
     "resolve": "^1.22.8",
diff --git a/packages/cli-v3/CHANGELOG.md b/packages/cli-v3/CHANGELOG.md
index 6cb6c8b3086..5840b31cdf6 100644
--- a/packages/cli-v3/CHANGELOG.md
+++ b/packages/cli-v3/CHANGELOG.md
@@ -1,5 +1,27 @@
 # trigger.dev
 
+## 4.5.7
+
+### Patch Changes
+
+- Fixes intermittent `trigger dev` run crashes where a run could fail at boot with a cryptic `Cannot find module .../dev-run-worker.mjs` after a rebuild had cleaned up the build directory the run was launched against. Dev runs now retry cleanly instead of hard-crashing when their build directory is missing, the dev watchdog no longer removes the build tree of a still-running session, and a run assigned to a worker version that was superseded by a rebuild now fails fast with a clear message instead of silently hanging until it times out. ([#4276](https://github.com/triggerdotdev/trigger.dev/pull/4276))
+- Add `node-24` and `node-26` as supported `runtime` options in `trigger.config.ts`. The `experimental-node-24` and `experimental-node-26` names are now deprecated aliases and emit a deprecation warning; switch to `node-24` / `node-26` instead. ([#4337](https://github.com/triggerdotdev/trigger.dev/pull/4337))
+
+  ```ts
+  import { defineConfig } from "@trigger.dev/sdk";
+
+  export default defineConfig({
+    runtime: "node-24",
+    project: "<your-project-ref>",
+  });
+  ```
+
+- Avoid logging task run environment variable values at debug level ([#4336](https://github.com/triggerdotdev/trigger.dev/pull/4336))
+- Updated dependencies:
+  - `@trigger.dev/core@4.5.7`
+  - `@trigger.dev/build@4.5.7`
+  - `@trigger.dev/schema-to-json@4.5.7`
+
 ## 4.5.6
 
 ### Patch Changes
diff --git a/packages/cli-v3/package.json b/packages/cli-v3/package.json
index 0aa3b9aa288..c6d8d9719dc 100644
--- a/packages/cli-v3/package.json
+++ b/packages/cli-v3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "trigger.dev",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "A Command-Line Interface for Trigger.dev projects",
   "type": "module",
   "license": "MIT",
@@ -96,9 +96,9 @@
     "@opentelemetry/sdk-trace-node": "2.7.1",
     "@opentelemetry/semantic-conventions": "1.41.1",
     "@s2-dev/streamstore": "^0.22.10",
-    "@trigger.dev/build": "workspace:4.5.6",
-    "@trigger.dev/core": "workspace:4.5.6",
-    "@trigger.dev/schema-to-json": "workspace:4.5.6",
+    "@trigger.dev/build": "workspace:4.5.7",
+    "@trigger.dev/core": "workspace:4.5.7",
+    "@trigger.dev/schema-to-json": "workspace:4.5.7",
     "ansi-escapes": "^7.0.0",
     "braces": "^3.0.3",
     "c12": "^1.11.1",
diff --git a/packages/cli-v3/src/config.test.ts b/packages/cli-v3/src/config.test.ts
index 910b2362420..cafee4b9a3d 100644
--- a/packages/cli-v3/src/config.test.ts
+++ b/packages/cli-v3/src/config.test.ts
@@ -33,6 +33,10 @@ async function createProject(runtime?: string) {
 
 describe("loadConfig runtime", () => {
   it.each([
+    ["node", "node"],
+    ["node-22", "node-22"],
+    ["node-24", "node-24"],
+    ["node-26", "node-26"],
     ["experimental-node-24", "node-24"],
     ["experimental-node-26", "node-26"],
   ] as const)("normalizes %s before returning the resolved config", async (runtime, expected) => {
@@ -47,7 +51,7 @@ describe("loadConfig runtime", () => {
     await expect(loadConfig({ cwd, warn: false })).resolves.toMatchObject({ runtime: "node" });
   });
 
-  it.each(["node-24", "node-26", "node-23"])(
+  it.each(["node-23"])(
     "rejects unsupported public runtime %s while loading config",
     async (runtime) => {
       const cwd = await createProject(runtime);
diff --git a/packages/cli-v3/src/config.ts b/packages/cli-v3/src/config.ts
index 8b162fbc409..2e7ffdee509 100644
--- a/packages/cli-v3/src/config.ts
+++ b/packages/cli-v3/src/config.ts
@@ -8,7 +8,8 @@ import type {
 import type { ResolvedConfig } from "@trigger.dev/core/v3/build";
 import {
   DEFAULT_RUNTIME,
-  isExperimentalConfigRuntime,
+  deprecatedRuntimeReplacement,
+  isDeprecatedConfigRuntime,
   resolveBuildRuntime,
 } from "@trigger.dev/core/v3/build";
 import * as c12 from "c12";
@@ -184,9 +185,11 @@ async function resolveConfig(
   const configuredRuntime = overrides?.runtime ?? config.runtime ?? defaultRuntime;
   const runtime = resolveBuildRuntime(configuredRuntime);
 
-  if (warn && isExperimentalConfigRuntime(configuredRuntime)) {
+  if (warn && isDeprecatedConfigRuntime(configuredRuntime)) {
     prettyWarning(
-      `The "${configuredRuntime}" runtime is experimental and may change before general availability.`
+      `The "${configuredRuntime}" runtime is deprecated. Use "${deprecatedRuntimeReplacement(
+        configuredRuntime
+      )}" instead.`
     );
   }
 
diff --git a/packages/cli-v3/src/dev/devSupervisor.ts b/packages/cli-v3/src/dev/devSupervisor.ts
index 7335f947a5a..6a0d1888afd 100644
--- a/packages/cli-v3/src/dev/devSupervisor.ts
+++ b/packages/cli-v3/src/dev/devSupervisor.ts
@@ -1,7 +1,9 @@
 import { tryCatch } from "@trigger.dev/core/utils";
+import { TaskRunErrorCodes } from "@trigger.dev/core/v3";
 import type {
   BuildManifest,
   CreateBackgroundWorkerRequestBody,
+  DequeuedMessage,
   DevConfigResponseBody,
   WorkerManifest,
 } from "@trigger.dev/core/v3";
@@ -224,6 +226,7 @@ class DevSupervisor implements WorkerRuntime {
 
     this.activeRunsPath = join(triggerDir, `active-runs${suffix}.json`);
     this.watchdogPidPath = join(triggerDir, `watchdog${suffix}.pid`);
+    const lockFilePath = join(triggerDir, safeBranch ? `dev.${safeBranch}.lock` : "dev.lock");
 
     // Write empty active-runs file
     this.#updateActiveRunsFile();
@@ -249,6 +252,7 @@ class DevSupervisor implements WorkerRuntime {
           WATCHDOG_ACTIVE_RUNS: this.activeRunsPath,
           WATCHDOG_PID_FILE: this.watchdogPidPath,
           WATCHDOG_TMP_DIR: getTmpRoot(this.options.config.workingDir, this.options.branch),
+          WATCHDOG_LOCK_FILE: lockFilePath,
         },
       });
 
@@ -478,7 +482,9 @@ class DevSupervisor implements WorkerRuntime {
             }
           );
 
-          //todo call the API to crash the run with a good message
+          this.#failRunWithMissingWorker(message).catch((error) => {
+            logger.debug("[DevSupervisor] Failed to fail run with missing worker", { error });
+          });
           continue;
         }
 
@@ -588,6 +594,33 @@ class DevSupervisor implements WorkerRuntime {
     }
   }
 
+  async #failRunWithMissingWorker(message: DequeuedMessage) {
+    const start = await this.options.client.dev.startRunAttempt(
+      message.run.friendlyId,
+      message.snapshot.friendlyId
+    );
+
+    if (!start.success) {
+      return;
+    }
+
+    const { run, snapshot, execution } = start.data;
+
+    await this.options.client.dev.completeRunAttempt(run.friendlyId, snapshot.friendlyId, {
+      completion: {
+        id: execution.run.id,
+        ok: false,
+        retry: undefined,
+        error: {
+          type: "INTERNAL_ERROR",
+          code: TaskRunErrorCodes.COULD_NOT_FIND_EXECUTOR,
+          message:
+            "This run was assigned to a background worker version that is no longer available in the dev session because it was superseded by a rebuild. Trigger the run again to use the current version.",
+        },
+      },
+    });
+  }
+
   async #startPresenceConnection() {
     try {
       const eventSource = this.options.client.dev.presenceConnection();
diff --git a/packages/cli-v3/src/dev/devWatchdog.ts b/packages/cli-v3/src/dev/devWatchdog.ts
index 15dfae929f3..906da7d1803 100644
--- a/packages/cli-v3/src/dev/devWatchdog.ts
+++ b/packages/cli-v3/src/dev/devWatchdog.ts
@@ -34,6 +34,7 @@ const apiKey = process.env.WATCHDOG_API_KEY!;
 const activeRunsPath = process.env.WATCHDOG_ACTIVE_RUNS!;
 const pidFilePath = process.env.WATCHDOG_PID_FILE!;
 const tmpDir = process.env.WATCHDOG_TMP_DIR;
+const lockFilePath = process.env.WATCHDOG_LOCK_FILE;
 
 if (!parentPid || !apiUrl || !apiKey || !activeRunsPath || !pidFilePath) {
   process.exit(1);
@@ -77,8 +78,25 @@ function cleanup() {
   } catch {}
 }
 
+function tmpDirOwnedByLiveSession(): boolean {
+  if (!lockFilePath) return false;
+  try {
+    const pid = Number(readFileSync(lockFilePath, "utf8").trim());
+    if (!pid || pid === parentPid) return false;
+    try {
+      process.kill(pid, 0);
+      return true;
+    } catch {
+      return false;
+    }
+  } catch {
+    return false;
+  }
+}
+
 function cleanupTmpDir() {
   if (!tmpDir) return;
+  if (tmpDirOwnedByLiveSession()) return;
   try {
     rmSync(tmpDir, { recursive: true, force: true });
   } catch {
diff --git a/packages/cli-v3/src/entryPoints/dev-run-controller.ts b/packages/cli-v3/src/entryPoints/dev-run-controller.ts
index 9ef8f2007c9..7b679b6490f 100644
--- a/packages/cli-v3/src/entryPoints/dev-run-controller.ts
+++ b/packages/cli-v3/src/entryPoints/dev-run-controller.ts
@@ -14,6 +14,7 @@ import {
   isOOMRunError,
   SuspendedProcessError,
 } from "@trigger.dev/core/v3";
+import { UnexpectedExitError } from "@trigger.dev/core/v3/errors";
 import { type WorkloadRunAttemptStartResponseBody } from "@trigger.dev/core/v3/workers";
 import { setTimeout as sleep } from "timers/promises";
 import type { CliApiClient } from "../apiClient.js";
@@ -22,6 +23,7 @@ import { assertExhaustive } from "../utilities/assertExhaustive.js";
 import { logger } from "../utilities/logger.js";
 import { sanitizeEnvVars } from "../utilities/sanitizeEnvVars.js";
 import { join } from "node:path";
+import { existsSync } from "node:fs";
 import type { BackgroundWorker } from "../dev/backgroundWorker.js";
 import { eventBus } from "../utilities/eventBus.js";
 import type { TaskRunProcessPool } from "../dev/taskRunProcessPool.js";
@@ -600,6 +602,15 @@ export class DevRunController {
       throw new Error(`No worker manifest for Dev ${run.friendlyId}`);
     }
 
+    const workerEntryPoint = this.opts.worker.manifest.workerEntryPoint;
+    if (!existsSync(workerEntryPoint)) {
+      throw new UnexpectedExitError(
+        1,
+        null,
+        `Dev worker build directory was removed before the run could start, likely cleaned up by a concurrent rebuild. Missing worker entry: ${workerEntryPoint}`
+      );
+    }
+
     this.snapshotPoller.start();
 
     logger.debug("getProcess", {
diff --git a/packages/cli-v3/src/executions/taskRunProcess.ts b/packages/cli-v3/src/executions/taskRunProcess.ts
index 66b30269ada..03504c412e4 100644
--- a/packages/cli-v3/src/executions/taskRunProcess.ts
+++ b/packages/cli-v3/src/executions/taskRunProcess.ts
@@ -151,7 +151,7 @@ export class TaskRunProcess {
     };
 
     logger.debug(`initializing task run process`, {
-      env: fullEnv,
+      envKeys: Object.keys(fullEnv),
       path: workerManifest.workerEntryPoint,
       cwd,
     });
diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
index 0696d5123f1..6c2fb47dd01 100644
--- a/packages/core/CHANGELOG.md
+++ b/packages/core/CHANGELOG.md
@@ -1,5 +1,20 @@
 # internal-platform
 
+## 4.5.7
+
+### Patch Changes
+
+- Add `node-24` and `node-26` as supported `runtime` options in `trigger.config.ts`. The `experimental-node-24` and `experimental-node-26` names are now deprecated aliases and emit a deprecation warning; switch to `node-24` / `node-26` instead. ([#4337](https://github.com/triggerdotdev/trigger.dev/pull/4337))
+
+  ```ts
+  import { defineConfig } from "@trigger.dev/sdk";
+
+  export default defineConfig({
+    runtime: "node-24",
+    project: "<your-project-ref>",
+  });
+  ```
+
 ## 4.5.6
 
 ### Patch Changes
diff --git a/packages/core/package.json b/packages/core/package.json
index ca827985641..f0c3adfcf2f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/core",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "Core code used across the Trigger.dev SDK and platform",
   "license": "MIT",
   "publishConfig": {
diff --git a/packages/core/src/v3/build/runtime.test.ts b/packages/core/src/v3/build/runtime.test.ts
index 2c166f2b01f..0073c15b22a 100644
--- a/packages/core/src/v3/build/runtime.test.ts
+++ b/packages/core/src/v3/build/runtime.test.ts
@@ -1,31 +1,38 @@
 import { describe, expect, it } from "vitest";
 import { BuildManifest, BuildRuntime, ConfigRuntime, WorkerManifest } from "../schemas/build.js";
-import { isExperimentalConfigRuntime, resolveBuildRuntime } from "./runtime.js";
+import { isDeprecatedConfigRuntime, resolveBuildRuntime } from "./runtime.js";
 
 describe("runtime configuration", () => {
-  it.each(["node", "node-22", "experimental-node-24", "experimental-node-26", "bun"] as const)(
-    "accepts %s as a public config runtime",
-    (runtime) => {
-      expect(ConfigRuntime.parse(runtime)).toBe(runtime);
-    }
-  );
+  it.each([
+    "node",
+    "node-22",
+    "node-24",
+    "node-26",
+    "experimental-node-24",
+    "experimental-node-26",
+    "bun",
+  ] as const)("accepts %s as a public config runtime", (runtime) => {
+    expect(ConfigRuntime.parse(runtime)).toBe(runtime);
+  });
 
   it.each([
     ["experimental-node-24", "node-24"],
     ["experimental-node-26", "node-26"],
     ["node", "node"],
     ["node-22", "node-22"],
+    ["node-24", "node-24"],
+    ["node-26", "node-26"],
     ["bun", "bun"],
   ] as const)("normalizes %s to %s", (runtime, expected) => {
     expect(resolveBuildRuntime(runtime)).toBe(expected);
   });
 
   it.each(["node-24", "node-26"] as const)(
-    "keeps internal runtime %s out of the public config schema",
+    "accepts internal runtime %s in both public and internal schemas",
     (runtime) => {
-      expect(ConfigRuntime.safeParse(runtime).success).toBe(false);
+      expect(ConfigRuntime.safeParse(runtime).success).toBe(true);
       expect(BuildRuntime.safeParse(runtime).success).toBe(true);
-      expect(() => resolveBuildRuntime(runtime)).toThrowError(/Unsupported runtime/);
+      expect(resolveBuildRuntime(runtime)).toBe(runtime);
     }
   );
 
@@ -36,12 +43,12 @@ describe("runtime configuration", () => {
   });
 
   it.each(["experimental-node-24", "experimental-node-26"] as const)(
-    "keeps %s out of internal runtime schemas",
+    "treats %s as a deprecated alias kept out of internal runtime schemas",
     (runtime) => {
       expect(BuildRuntime.safeParse(runtime).success).toBe(false);
       expect(BuildManifest.shape.runtime.safeParse(runtime).success).toBe(false);
       expect(WorkerManifest.shape.runtime.safeParse(runtime).success).toBe(false);
-      expect(isExperimentalConfigRuntime(runtime)).toBe(true);
+      expect(isDeprecatedConfigRuntime(runtime)).toBe(true);
     }
   );
 });
diff --git a/packages/core/src/v3/build/runtime.ts b/packages/core/src/v3/build/runtime.ts
index 10fcc962b78..aa4617c9df5 100644
--- a/packages/core/src/v3/build/runtime.ts
+++ b/packages/core/src/v3/build/runtime.ts
@@ -6,14 +6,28 @@ import { homedir } from "node:os";
 
 export const DEFAULT_RUNTIME = "node" satisfies BuildRuntime;
 
-export type ExperimentalConfigRuntime = "experimental-node-24" | "experimental-node-26";
+export type DeprecatedConfigRuntime = "experimental-node-24" | "experimental-node-26";
 
-export function isExperimentalConfigRuntime(
-  runtime: unknown
-): runtime is ExperimentalConfigRuntime {
+export function isDeprecatedConfigRuntime(runtime: unknown): runtime is DeprecatedConfigRuntime {
   return runtime === "experimental-node-24" || runtime === "experimental-node-26";
 }
 
+/** Maps a deprecated runtime alias to the runtime that should be used instead. */
+export function deprecatedRuntimeReplacement(runtime: DeprecatedConfigRuntime): BuildRuntime {
+  switch (runtime) {
+    case "experimental-node-24":
+      return "node-24";
+    case "experimental-node-26":
+      return "node-26";
+  }
+}
+
+/** @deprecated Renamed to {@link DeprecatedConfigRuntime}. */
+export type ExperimentalConfigRuntime = DeprecatedConfigRuntime;
+
+/** @deprecated Renamed to {@link isDeprecatedConfigRuntime}. */
+export const isExperimentalConfigRuntime = isDeprecatedConfigRuntime;
+
 export function resolveBuildRuntime(runtime: unknown): BuildRuntime {
   const parsedRuntime = ConfigRuntime.safeParse(runtime);
 
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/http.ts b/packages/core/src/v3/runEngineWorker/supervisor/http.ts
index d6d51b1c2b2..450be432577 100644
--- a/packages/core/src/v3/runEngineWorker/supervisor/http.ts
+++ b/packages/core/src/v3/runEngineWorker/supervisor/http.ts
@@ -21,9 +21,9 @@ import {
   WorkerApiSuspendRunResponseBody,
   WorkerApiRunSnapshotsSinceResponseBody,
 } from "./schemas.js";
-import type { SupervisorClientCommonOptions } from "./types.js";
+import type { SupervisorClientCommonOptions, SupervisorHttpRequestMetric } from "./types.js";
 import { getDefaultWorkerHeaders } from "./util.js";
-import { wrapZodFetch } from "../../zodfetch.js";
+import { wrapZodFetch, type ApiResult, type ZodFetchOptions } from "../../zodfetch.js";
 import { createHeaders } from "../util.js";
 import { WORKER_HEADERS } from "../consts.js";
 import { SimpleStructuredLogger } from "../../utils/structuredLogger.js";
@@ -36,6 +36,7 @@ export class SupervisorHttpClient {
   private readonly instanceName: string;
   private readonly defaultHeaders: Record<string, string>;
   private readonly sendRunDebugLogs: boolean;
+  private readonly onHttpRequestComplete?: (metric: SupervisorHttpRequestMetric) => void;
 
   private readonly logger = new SimpleStructuredLogger("supervisor-http-client");
 
@@ -45,6 +46,7 @@ export class SupervisorHttpClient {
     this.instanceName = opts.instanceName;
     this.defaultHeaders = getDefaultWorkerHeaders(opts);
     this.sendRunDebugLogs = opts.sendRunDebugLogs ?? false;
+    this.onHttpRequestComplete = opts.onHttpRequestComplete;
 
     if (!this.apiUrl) {
       throw new Error("apiURL is required and needs to be a non-empty string");
@@ -59,8 +61,55 @@ export class SupervisorHttpClient {
     }
   }
 
+  private async request<T extends z.ZodTypeAny>(
+    name: string,
+    schema: T,
+    url: string,
+    requestInit?: RequestInit,
+    options?: ZodFetchOptions<z.output<T>>
+  ): Promise<ApiResult<z.infer<T>>> {
+    const start = performance.now();
+    const result = await wrapZodFetch(schema, url, requestInit, options);
+
+    if (this.onHttpRequestComplete) {
+      const durationMs = performance.now() - start;
+      const method = requestInit?.method ?? "GET";
+
+      if (result.success) {
+        this.onHttpRequestComplete({ name, method, status: "2xx", outcome: "ok", durationMs });
+      } else if (result.statusCode === 200) {
+        this.onHttpRequestComplete({
+          name,
+          method,
+          status: "200",
+          outcome: "invalid_response",
+          durationMs,
+        });
+      } else if (typeof result.statusCode === "number") {
+        this.onHttpRequestComplete({
+          name,
+          method,
+          status: String(result.statusCode),
+          outcome: "http_error",
+          durationMs,
+        });
+      } else {
+        this.onHttpRequestComplete({
+          name,
+          method,
+          status: "none",
+          outcome: "network_error",
+          durationMs,
+        });
+      }
+    }
+
+    return result;
+  }
+
   async connect(body: WorkerApiConnectRequestBody) {
-    return wrapZodFetch(
+    return this.request(
+      "connect",
       WorkerApiConnectResponseBody,
       `${this.apiUrl}/engine/v1/worker-actions/connect`,
       {
@@ -75,7 +124,8 @@ export class SupervisorHttpClient {
   }
 
   async dequeue(body: WorkerApiDequeueRequestBody) {
-    return wrapZodFetch(
+    return this.request(
+      "dequeue",
       WorkerApiDequeueResponseBody,
       `${this.apiUrl}/engine/v1/worker-actions/dequeue`,
       {
@@ -91,7 +141,8 @@ export class SupervisorHttpClient {
 
   /** @deprecated Not currently used */
   async dequeueFromVersion(deploymentId: string, maxRunCount = 1, runnerId?: string) {
-    return wrapZodFetch(
+    return this.request(
+      "dequeue_from_version",
       WorkerApiDequeueResponseBody,
       `${this.apiUrl}/engine/v1/worker-actions/deployments/${deploymentId}/dequeue?maxRunCount=${maxRunCount}`,
       {
@@ -104,7 +155,8 @@ export class SupervisorHttpClient {
   }
 
   async heartbeatWorker(body: WorkerApiHeartbeatRequestBody) {
-    return wrapZodFetch(
+    return this.request(
+      "heartbeat_worker",
       WorkerApiHeartbeatResponseBody,
       `${this.apiUrl}/engine/v1/worker-actions/heartbeat`,
       {
@@ -124,7 +176,8 @@ export class SupervisorHttpClient {
     body: WorkerApiRunHeartbeatRequestBody,
     runnerId?: string
   ) {
-    return wrapZodFetch(
+    return this.request(
+      "heartbeat_run",
       WorkerApiRunHeartbeatResponseBody,
       `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/heartbeat`,
       {
@@ -146,7 +199,8 @@ export class SupervisorHttpClient {
     runnerId?: string,
     environmentId?: string
   ) {
-    return wrapZodFetch(
+    return this.request(
+      "start_run_attempt",
       WorkerApiRunAttemptStartResponseBody,
       `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/attempts/start`,
       {
@@ -168,7 +222,8 @@ export class SupervisorHttpClient {
     runnerId?: string,
     environmentId?: string
   ) {
-    return wrapZodFetch(
+    return this.request(
+      "complete_run_attempt",
       WorkerApiRunAttemptCompleteResponseBody,
       `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/attempts/complete`,
       {
@@ -184,7 +239,8 @@ export class SupervisorHttpClient {
   }
 
   async getLatestSnapshot(runId: string, runnerId?: string, environmentId?: string) {
-    return wrapZodFetch(
+    return this.request(
+      "get_latest_snapshot",
       WorkerApiRunLatestSnapshotResponseBody,
       `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/latest`,
       {
@@ -204,7 +260,8 @@ export class SupervisorHttpClient {
     runnerId?: string,
     environmentId?: string
   ) {
-    return wrapZodFetch(
+    return this.request(
+      "get_snapshots_since",
       WorkerApiRunSnapshotsSinceResponseBody,
       `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/since/${snapshotId}`,
       {
@@ -224,7 +281,8 @@ export class SupervisorHttpClient {
     }
 
     try {
-      const res = await wrapZodFetch(
+      const res = await this.request(
+        "send_debug_log",
         z.unknown(),
         `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/logs/debug`,
         {
@@ -252,7 +310,8 @@ export class SupervisorHttpClient {
     runnerId?: string,
     environmentId?: string
   ) {
-    return wrapZodFetch(
+    return this.request(
+      "continue_run_execution",
       WorkerApiContinueRunExecutionRequestBody,
       `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/continue`,
       {
@@ -292,7 +351,8 @@ export class SupervisorHttpClient {
     runnerId?: string;
     body: WorkerApiSuspendRunRequestBody;
   }) {
-    return wrapZodFetch(
+    return this.request(
+      "submit_suspend_completion",
       WorkerApiSuspendRunResponseBody,
       `${this.apiUrl}/engine/v1/worker-actions/runs/${runId}/snapshots/${snapshotId}/suspend`,
       {
diff --git a/packages/core/src/v3/runEngineWorker/supervisor/types.ts b/packages/core/src/v3/runEngineWorker/supervisor/types.ts
index 4d0479cbcac..aff6ffa7d2d 100644
--- a/packages/core/src/v3/runEngineWorker/supervisor/types.ts
+++ b/packages/core/src/v3/runEngineWorker/supervisor/types.ts
@@ -1,5 +1,13 @@
 import type { MachineResources } from "../../schemas/runEngine.js";
 
+export type SupervisorHttpRequestMetric = {
+  name: string;
+  method: string;
+  status: string;
+  outcome: "ok" | "http_error" | "invalid_response" | "network_error";
+  durationMs: number;
+};
+
 export type SupervisorClientCommonOptions = {
   apiUrl: string;
   workerToken: string;
@@ -7,6 +15,7 @@ export type SupervisorClientCommonOptions = {
   deploymentId?: string;
   managedWorkerSecret?: string;
   sendRunDebugLogs?: boolean;
+  onHttpRequestComplete?: (metric: SupervisorHttpRequestMetric) => void;
 };
 
 export type PreDequeueFn = () => Promise<{
diff --git a/packages/core/src/v3/schemas/build.ts b/packages/core/src/v3/schemas/build.ts
index 1ab5b5b8169..52cae0b2385 100644
--- a/packages/core/src/v3/schemas/build.ts
+++ b/packages/core/src/v3/schemas/build.ts
@@ -16,6 +16,9 @@ export type BuildTarget = z.infer<typeof BuildTarget>;
 export const ConfigRuntime = z.enum([
   "node",
   "node-22",
+  "node-24",
+  "node-26",
+  // Deprecated aliases, kept for backwards compatibility. Use "node-24"/"node-26" instead.
   "experimental-node-24",
   "experimental-node-26",
   "bun",
diff --git a/packages/python/CHANGELOG.md b/packages/python/CHANGELOG.md
index 48ca36c0ca2..bd9c54d71c7 100644
--- a/packages/python/CHANGELOG.md
+++ b/packages/python/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @trigger.dev/python
 
+## 4.5.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/sdk@4.5.7`
+  - `@trigger.dev/core@4.5.7`
+  - `@trigger.dev/build@4.5.7`
+
 ## 4.5.6
 
 ### Patch Changes
diff --git a/packages/python/package.json b/packages/python/package.json
index 635f74ef382..bebd4ade64f 100644
--- a/packages/python/package.json
+++ b/packages/python/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/python",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "Python runtime and build extension for Trigger.dev",
   "license": "MIT",
   "publishConfig": {
@@ -45,7 +45,7 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:4.5.6",
+    "@trigger.dev/core": "workspace:4.5.7",
     "tinyexec": "^0.3.2"
   },
   "devDependencies": {
@@ -56,12 +56,12 @@
     "tsx": "4.17.0",
     "esbuild": "^0.23.0",
     "@arethetypeswrong/cli": "^0.18.5",
-    "@trigger.dev/build": "workspace:4.5.6",
-    "@trigger.dev/sdk": "workspace:4.5.6"
+    "@trigger.dev/build": "workspace:4.5.7",
+    "@trigger.dev/sdk": "workspace:4.5.7"
   },
   "peerDependencies": {
-    "@trigger.dev/sdk": "workspace:^4.5.6",
-    "@trigger.dev/build": "workspace:^4.5.6"
+    "@trigger.dev/sdk": "workspace:^4.5.7",
+    "@trigger.dev/build": "workspace:^4.5.7"
   },
   "engines": {
     "node": ">=18.20.0"
diff --git a/packages/react-hooks/CHANGELOG.md b/packages/react-hooks/CHANGELOG.md
index dc99b3b456f..f422e8cb94f 100644
--- a/packages/react-hooks/CHANGELOG.md
+++ b/packages/react-hooks/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @trigger.dev/react-hooks
 
+## 4.5.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.5.7`
+
 ## 4.5.6
 
 ### Patch Changes
diff --git a/packages/react-hooks/package.json b/packages/react-hooks/package.json
index 9a348b8ad35..b0b0ae668d9 100644
--- a/packages/react-hooks/package.json
+++ b/packages/react-hooks/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/react-hooks",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "trigger.dev react hooks",
   "license": "MIT",
   "publishConfig": {
@@ -37,7 +37,7 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:^4.5.6",
+    "@trigger.dev/core": "workspace:^4.5.7",
     "swr": "^2.2.5"
   },
   "devDependencies": {
diff --git a/packages/redis-worker/CHANGELOG.md b/packages/redis-worker/CHANGELOG.md
index db6f152a23a..5ddc4f32d44 100644
--- a/packages/redis-worker/CHANGELOG.md
+++ b/packages/redis-worker/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @trigger.dev/redis-worker
 
+## 4.5.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.5.7`
+
 ## 4.5.6
 
 ### Patch Changes
diff --git a/packages/redis-worker/package.json b/packages/redis-worker/package.json
index ed7c16d3c1f..edd27f40e41 100644
--- a/packages/redis-worker/package.json
+++ b/packages/redis-worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/redis-worker",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "Redis worker for trigger.dev",
   "license": "MIT",
   "publishConfig": {
@@ -23,7 +23,7 @@
     "test": "vitest --sequence.concurrent=false --no-file-parallelism"
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:4.5.6",
+    "@trigger.dev/core": "workspace:4.5.7",
     "lodash.omit": "^4.5.0",
     "nanoid": "^5.0.7",
     "p-limit": "^6.2.0",
diff --git a/packages/rsc/CHANGELOG.md b/packages/rsc/CHANGELOG.md
index 17bf179f3d1..89b0364191d 100644
--- a/packages/rsc/CHANGELOG.md
+++ b/packages/rsc/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @trigger.dev/rsc
 
+## 4.5.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.5.7`
+
 ## 4.5.6
 
 ### Patch Changes
diff --git a/packages/rsc/package.json b/packages/rsc/package.json
index 98624b20e20..46b17e36ba9 100644
--- a/packages/rsc/package.json
+++ b/packages/rsc/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/rsc",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "trigger.dev rsc",
   "license": "MIT",
   "publishConfig": {
@@ -37,14 +37,14 @@
     "check-exports": "attw --pack ."
   },
   "dependencies": {
-    "@trigger.dev/core": "workspace:^4.5.6",
+    "@trigger.dev/core": "workspace:^4.5.7",
     "mlly": "^1.7.1",
     "react": "19.0.0-rc.1",
     "react-dom": "19.0.0-rc.1"
   },
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.5",
-    "@trigger.dev/build": "workspace:^4.5.6",
+    "@trigger.dev/build": "workspace:^4.5.7",
     "@types/node": "^24.13.3",
     "@types/react": "*",
     "@types/react-dom": "*",
diff --git a/packages/schema-to-json/CHANGELOG.md b/packages/schema-to-json/CHANGELOG.md
index 68fbd531a88..50c400b068b 100644
--- a/packages/schema-to-json/CHANGELOG.md
+++ b/packages/schema-to-json/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @trigger.dev/schema-to-json
 
+## 4.5.7
+
+### Patch Changes
+
+- Updated dependencies:
+  - `@trigger.dev/core@4.5.7`
+
 ## 4.5.6
 
 ### Patch Changes
diff --git a/packages/schema-to-json/package.json b/packages/schema-to-json/package.json
index 5148d5f0dae..03e9c936210 100644
--- a/packages/schema-to-json/package.json
+++ b/packages/schema-to-json/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/schema-to-json",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "Convert various schema validation libraries to JSON Schema",
   "license": "MIT",
   "publishConfig": {
diff --git a/packages/trigger-sdk/CHANGELOG.md b/packages/trigger-sdk/CHANGELOG.md
index 6a4ebef26bc..ecb8fc3bacf 100644
--- a/packages/trigger-sdk/CHANGELOG.md
+++ b/packages/trigger-sdk/CHANGELOG.md
@@ -1,5 +1,34 @@
 # @trigger.dev/sdk
 
+## 4.5.7
+
+### Patch Changes
+
+- Custom chat agent loops get two ergonomic wins for owning the turn loop. ([#4304](https://github.com/triggerdotdev/trigger.dev/pull/4304))
+
+  `chat.writeTurnComplete()` now returns the turn boundary's resume cursors (`lastEventId` for the output stream and `sessionInEventId` for the input stream), so you can persist them straight from the task instead of round-tripping them back from the client.
+
+  ```ts
+  const { lastEventId, sessionInEventId } = await chat.writeTurnComplete();
+  await db.chats.update(chatId, { lastEventId, sessionInEventId });
+  ```
+
+  `chat.pipeAndCapture()` no longer throws when a stream is stopped or fails. It now returns a `PipeAndCaptureResult` whose `message` holds any partial output captured before the stop or failure, alongside a typed `status` (`"complete" | "aborted" | "error"`) and, on failure, the `error`. Read the message off the result:
+
+  ```ts
+  const { message, status, error } = await chat.pipeAndCapture(result, {
+    signal,
+  });
+  if (message) conversation.addResponse(message);
+  if (status === "error") logger.error("turn failed", { error });
+  ```
+
+  Note: `pipeAndCapture` previously resolved to `UIMessage | undefined`. Update call sites to read `.message` from the returned result.
+
+- Suppress a build-time warning that could appear in Vite-based projects when the optional `@ai-sdk/otel` package is not installed. ([#4188](https://github.com/triggerdotdev/trigger.dev/pull/4188))
+- Updated dependencies:
+  - `@trigger.dev/core@4.5.7`
+
 ## 4.5.6
 
 ### Patch Changes
diff --git a/packages/trigger-sdk/package.json b/packages/trigger-sdk/package.json
index 77889cb09f3..50141b73cd0 100644
--- a/packages/trigger-sdk/package.json
+++ b/packages/trigger-sdk/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@trigger.dev/sdk",
-  "version": "4.5.6",
+  "version": "4.5.7",
   "description": "trigger.dev Node.JS SDK",
   "license": "MIT",
   "publishConfig": {
@@ -77,7 +77,7 @@
   "dependencies": {
     "@opentelemetry/api": "1.9.1",
     "@opentelemetry/semantic-conventions": "1.41.1",
-    "@trigger.dev/core": "workspace:4.5.6",
+    "@trigger.dev/core": "workspace:4.5.7",
     "chalk": "^5.2.0",
     "cronstrue": "^2.21.0",
     "debug": "^4.3.4",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 10efffa967d..a89ab24160d 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,7 +13,7 @@ overrides:
   '@ai-sdk/provider-utils@^4': 4.0.29
   express@^4>body-parser: 1.20.3
   '@remix-run/dev@2.17.5>tar-fs': 2.1.4
-  tar@>=7 <7.5.11: ^7.5.11
+  tar: 7.5.19
   form-data@^2: 2.5.4
   form-data@^3: 3.0.5
   form-data@^4: 4.0.6
@@ -1442,7 +1442,7 @@ importers:
         specifier: ^6.10.0
         version: 6.19.0(magicast@0.3.5)
       '@trigger.dev/core':
-        specifier: workspace:4.5.6
+        specifier: workspace:4.5.7
         version: link:../core
       mlly:
         specifier: ^1.7.1
@@ -1518,13 +1518,13 @@ importers:
         specifier: ^0.22.10
         version: 0.22.10(supports-color@10.0.0)
       '@trigger.dev/build':
-        specifier: workspace:4.5.6
+        specifier: workspace:4.5.7
         version: link:../build
       '@trigger.dev/core':
-        specifier: workspace:4.5.6
+        specifier: workspace:4.5.7
         version: link:../core
       '@trigger.dev/schema-to-json':
-        specifier: workspace:4.5.6
+        specifier: workspace:4.5.7
         version: link:../schema-to-json
       ansi-escapes:
         specifier: ^7.0.0
@@ -1650,8 +1650,8 @@ importers:
         specifier: ^10.0.0
         version: 10.0.0
       tar:
-        specifier: ^7.5.13
-        version: 7.5.13
+        specifier: 7.5.19
+        version: 7.5.19
       tiny-invariant:
         specifier: ^1.2.0
         version: 1.3.1
@@ -1911,7 +1911,7 @@ importers:
   packages/python:
     dependencies:
       '@trigger.dev/core':
-        specifier: workspace:4.5.6
+        specifier: workspace:4.5.7
         version: link:../core
       tinyexec:
         specifier: ^0.3.2
@@ -1921,10 +1921,10 @@ importers:
         specifier: ^0.18.5
         version: 0.18.5
       '@trigger.dev/build':
-        specifier: workspace:4.5.6
+        specifier: workspace:4.5.7
         version: link:../build
       '@trigger.dev/sdk':
-        specifier: workspace:4.5.6
+        specifier: workspace:4.5.7
         version: link:../trigger-sdk
       '@types/node':
         specifier: 24.13.3
@@ -1948,7 +1948,7 @@ importers:
   packages/react-hooks:
     dependencies:
       '@trigger.dev/core':
-        specifier: workspace:^4.5.6
+        specifier: workspace:^4.5.7
         version: link:../core
       react:
         specifier: 18.3.1
@@ -1982,7 +1982,7 @@ importers:
   packages/redis-worker:
     dependencies:
       '@trigger.dev/core':
-        specifier: workspace:4.5.6
+        specifier: workspace:4.5.7
         version: link:../core
       cron-parser:
         specifier: ^4.9.0
@@ -2031,7 +2031,7 @@ importers:
   packages/rsc:
     dependencies:
       '@trigger.dev/core':
-        specifier: workspace:^4.5.6
+        specifier: workspace:^4.5.7
         version: link:../core
       mlly:
         specifier: ^1.7.1
@@ -2047,7 +2047,7 @@ importers:
         specifier: ^0.18.5
         version: 0.18.5
       '@trigger.dev/build':
-        specifier: workspace:^4.5.6
+        specifier: workspace:^4.5.7
         version: link:../build
       '@types/node':
         specifier: 24.13.3
@@ -2126,7 +2126,7 @@ importers:
         specifier: 1.41.1
         version: 1.41.1
       '@trigger.dev/core':
-        specifier: workspace:4.5.6
+        specifier: workspace:4.5.7
         version: link:../core
       chalk:
         specifier: ^5.2.0
@@ -3251,19 +3251,19 @@ packages:
 
   '@esbuild-kit/core-utils@3.0.0':
     resolution: {integrity: sha512-TXmwH9EFS3DC2sI2YJWJBgHGhlteK0Xyu1VabwetMULfm3oYhbrsWV5yaSr2NTWZIgDGVLHbRf0inxbjXqAcmQ==}
-    deprecated: 'Merged into tsx: https://tsx.is'
+    deprecated: 'Merged into tsx: https://tsx.hirok.io'
 
   '@esbuild-kit/core-utils@3.3.2':
     resolution: {integrity: sha512-sPRAnw9CdSsRmEtnsl2WXWdyquogVpB3yZ3dgwJfe8zrOzTsV7cJvmwrKVa+0ma5BoiGJ+BoqkMvawbayKUsqQ==}
-    deprecated: 'Merged into tsx: https://tsx.is'
+    deprecated: 'Merged into tsx: https://tsx.hirok.io'
 
   '@esbuild-kit/esm-loader@2.5.4':
     resolution: {integrity: sha512-afmtLf6uqxD5IgwCzomtqCYIgz/sjHzCWZFvfS5+FzeYxOURPUo4QcHtqJxbxWOMOogKriZanN/1bJQE/ZL93A==}
-    deprecated: 'Merged into tsx: https://tsx.is'
+    deprecated: 'Merged into tsx: https://tsx.hirok.io'
 
   '@esbuild-kit/esm-loader@2.6.5':
     resolution: {integrity: sha512-FxEMIkJKnodyA1OaCUoEvbYRkoZlLZ4d/eXFu9Fh8CbBBgP5EmZxrfTRyN0qpXZ4vOvqnE5YdRdcrmUUXuU+dA==}
-    deprecated: 'Merged into tsx: https://tsx.is'
+    deprecated: 'Merged into tsx: https://tsx.hirok.io'
 
   '@esbuild/aix-ppc64@0.23.0':
     resolution: {integrity: sha512-3sG8Zwa5fMcA9bgqB8AfWPQ+HFke6uD3h1s3RIwUNK8EG7a4buxvuFTs3j1IMs2NXAk9F30C/FF4vxRgQCcmoQ==}
@@ -8921,10 +8921,6 @@ packages:
   chownr@1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
 
-  chownr@2.0.0:
-    resolution: {integrity: sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==}
-    engines: {node: '>=10'}
-
   chownr@3.0.0:
     resolution: {integrity: sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==}
     engines: {node: '>=18'}
@@ -10601,10 +10597,6 @@ packages:
     resolution: {integrity: sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==}
     engines: {node: '>=6 <7 || >=8'}
 
-  fs-minipass@2.1.0:
-    resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==}
-    engines: {node: '>= 8'}
-
   fs-minipass@3.0.3:
     resolution: {integrity: sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==}
     engines: {node: ^14.17.0 || ^16.13.0 || >=18.0.0}
@@ -12237,22 +12229,10 @@ packages:
     resolution: {integrity: sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==}
     engines: {node: '>=8'}
 
-  minipass@5.0.0:
-    resolution: {integrity: sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==}
-    engines: {node: '>=8'}
-
-  minipass@7.1.2:
-    resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
-    engines: {node: '>=16 || 14 >=14.17'}
-
   minipass@7.1.3:
     resolution: {integrity: sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==}
     engines: {node: '>=16 || 14 >=14.17'}
 
-  minizlib@2.1.2:
-    resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==}
-    engines: {node: '>= 8'}
-
   minizlib@3.1.0:
     resolution: {integrity: sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==}
     engines: {node: '>= 18'}
@@ -12264,11 +12244,6 @@ packages:
   mkdirp-classic@0.5.3:
     resolution: {integrity: sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==}
 
-  mkdirp@1.0.4:
-    resolution: {integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==}
-    engines: {node: '>=10'}
-    hasBin: true
-
   mkdirp@3.0.1:
     resolution: {integrity: sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==}
     engines: {node: '>=10'}
@@ -14551,13 +14526,8 @@ packages:
   tar-stream@3.1.7:
     resolution: {integrity: sha512-qJj60CXt7IU1Ffyc3NJMjh6EkuCFej46zUqJ4J7pqYlThyd9bO0XBTmcOIhSzZJVWfsLks0+nle/j538YAW9RQ==}
 
-  tar@6.2.1:
-    resolution: {integrity: sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==}
-    engines: {node: '>=10'}
-    deprecated: Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me
-
-  tar@7.5.13:
-    resolution: {integrity: sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==}
+  tar@7.5.19:
+    resolution: {integrity: sha512-4LeEWl96twnS2Q7Bz4MGqgazLqO+hJN63GZxXoIqh1T3VweYD997gbU1ItNsQafqqXTXd5WFyFdReLtwvRBNiw==}
     engines: {node: '>=18'}
 
   tdigest@0.1.2:
@@ -18820,7 +18790,7 @@ snapshots:
       openid-client: 6.3.3
       rfc4648: 1.5.3
       stream-buffers: 3.0.2
-      tar: 7.5.13
+      tar: 7.5.19
       tmp-promise: 3.0.3
       tslib: 2.6.2
       ws: 8.21.0(bufferutil@4.0.9)
@@ -23738,7 +23708,7 @@ snapshots:
       minipass-pipeline: 1.2.4
       p-map: 4.0.0
       ssri: 10.0.5
-      tar: 6.2.1
+      tar: 7.5.19
       unique-filename: 3.0.0
 
   cacheable-request@6.1.0:
@@ -23848,8 +23818,6 @@ snapshots:
 
   chownr@1.1.4: {}
 
-  chownr@2.0.0: {}
-
   chownr@3.0.0: {}
 
   chrome-trace-event@1.0.4: {}
@@ -25826,10 +25794,6 @@ snapshots:
       jsonfile: 4.0.0
       universalify: 0.1.2
 
-  fs-minipass@2.1.0:
-    dependencies:
-      minipass: 3.3.6
-
   fs-minipass@3.0.3:
     dependencies:
       minipass: 7.1.3
@@ -25935,7 +25899,7 @@ snapshots:
       nypm: 0.3.9
       ohash: 1.1.3
       pathe: 1.1.2
-      tar: 6.2.1
+      tar: 7.5.19
 
   giget@2.0.0:
     dependencies:
@@ -27857,17 +27821,8 @@ snapshots:
     dependencies:
       yallist: 4.0.0
 
-  minipass@5.0.0: {}
-
-  minipass@7.1.2: {}
-
   minipass@7.1.3: {}
 
-  minizlib@2.1.2:
-    dependencies:
-      minipass: 3.3.6
-      yallist: 4.0.0
-
   minizlib@3.1.0:
     dependencies:
       minipass: 7.1.3
@@ -27876,8 +27831,6 @@ snapshots:
 
   mkdirp-classic@0.5.3: {}
 
-  mkdirp@1.0.4: {}
-
   mkdirp@3.0.1: {}
 
   ml-array-max@1.2.4:
@@ -30549,20 +30502,11 @@ snapshots:
     transitivePeerDependencies:
       - bare-abort-controller
 
-  tar@6.2.1:
-    dependencies:
-      chownr: 2.0.0
-      fs-minipass: 2.1.0
-      minipass: 5.0.0
-      minizlib: 2.1.2
-      mkdirp: 1.0.4
-      yallist: 4.0.0
-
-  tar@7.5.13:
+  tar@7.5.19:
     dependencies:
       '@isaacs/fs-minipass': 4.0.1
       chownr: 3.0.0
-      minipass: 7.1.2
+      minipass: 7.1.3
       minizlib: 3.1.0
       yallist: 5.0.0