zevairouter 1.0.152 → 1.0.154

package/src/app/(dashboard)/dashboard/media-providers/[kind]/[id]/page.js

@@ -14,6 +14,7 @@ import ModelsCard from "@/app/(dashboard)/dashboard/providers/components/ModelsC
 import { TTS_PROVIDER_CONFIG } from "@/shared/constants/ttsProviders";
 import { getTtsVoicesForModel } from "open-sse/config/ttsModels.js";
 import { GOOGLE_TTS_LANGUAGES } from "open-sse/config/googleTtsLanguages.js";
+import { getDashboardMediaEndpoint } from "@/shared/utils/dashboardMedia";
 
 // Shared row layout — defined outside components to avoid re-mount on re-render
 function Row({ label, children }) {
@@ -153,10 +154,6 @@ function EmbeddingExampleCard({ providerId, customAlias }) {
   useEffect(() => {
     // eslint-disable-next-line react-hooks/set-state-in-effect -- one-time mount initialization from window.location (external source, client-only, avoids hydration mismatch)
     setLocalEndpoint(window.location.origin);
-    fetch("/api/keys")
-      .then((r) => r.json())
-      .then((d) => { setApiKey((d.keys || []).find((k) => k.isActive !== false)?.key || ""); })
-      .catch(() => {});
     fetch("/api/tunnel/status")
       .then((r) => r.json())
       .then((d) => { if (d.publicUrl) setTunnelEndpoint(d.publicUrl); })
@@ -188,7 +185,7 @@ function EmbeddingExampleCard({ providerId, customAlias }) {
     try {
       const headers = { "Content-Type": "application/json" };
       if (apiKey) headers["Authorization"] = `Bearer ${apiKey}`;
-      const res = await fetch("/api/v1/embeddings", {
+      const res = await fetch(getDashboardMediaEndpoint("/v1/embeddings"), {
         method: "POST",
         headers,
         body: JSON.stringify(buildBody()),
@@ -392,7 +389,6 @@ function TtsExampleCard({ providerId }) {
 
   // Form state
   const [input, setInput]               = useState("Hello, this is a text to speech test.");
-  const [apiKey, setApiKey]             = useState("");
   const [useTunnel, setUseTunnel]       = useState(false);
   const [localEndpoint, setLocalEndpoint]   = useState("");
   const [tunnelEndpoint, setTunnelEndpoint] = useState("");
@@ -417,10 +413,6 @@ function TtsExampleCard({ providerId }) {
   useEffect(() => {
     // eslint-disable-next-line react-hooks/set-state-in-effect -- one-time mount initialization from window.location (external source, client-only, avoids hydration mismatch)
     setLocalEndpoint(window.location.origin);
-    fetch("/api/keys")
-      .then((r) => r.json())
-      .then((d) => { setApiKey((d.keys || []).find((k) => k.isActive !== false)?.key || ""); })
-      .catch(() => {});
     fetch("/api/tunnel/status")
       .then((r) => r.json())
       .then((d) => { if (d.publicUrl) setTunnelEndpoint(d.publicUrl); })
@@ -544,7 +536,7 @@ function TtsExampleCard({ providerId }) {
   })();
   const curlSnippet = `curl -X POST ${endpoint}/v1/audio/speech${responseFormat === "json" ? "?response_format=json" : ""} \\
   -H "Content-Type: application/json" \\
-  -H "Authorization: Bearer ${apiKey || "YOUR_KEY"}" \\
+  -H "Authorization: Bearer YOUR_KEY" \\
   -d '${JSON.stringify(ttsBody)}' \\
   ${responseFormat === "json" ? "" : "--output speech.mp3"}`;
 
@@ -557,8 +549,7 @@ function TtsExampleCard({ providerId }) {
     const start = Date.now();
     try {
       const headers = { "Content-Type": "application/json" };
-      if (apiKey) headers["Authorization"] = `Bearer ${apiKey}`;
-      const url = `/api/v1/audio/speech${responseFormat === "json" ? "?response_format=json" : ""}`;
+      const url = getDashboardMediaEndpoint(`/v1/audio/speech${responseFormat === "json" ? "?response_format=json" : ""}`);
       const res = await fetch(url, {
         method: "POST",
         headers,
@@ -615,7 +606,7 @@ function TtsExampleCard({ providerId }) {
           </Row>
           <Row label="API Key">
             <span className="px-3 py-1.5 text-sm font-mono text-text-main bg-sidebar rounded-lg truncate block">
-              {apiKey ? `${apiKey.slice(0, 8)}${"•".repeat(Math.min(20, apiKey.length - 8))}` : <span className="text-text-muted italic">No key configured</span>}
+              <span className="text-text-muted italic">Dashboard session (server-side)</span>
             </span>
           </Row>
 
@@ -946,7 +937,7 @@ function GenericExampleCard({ providerId, kind }) {
   const [extraValues, setExtraValues] = useState(() =>
     (safeExConfig.extraFields || []).reduce((acc, f) => { acc[f.key] = f.default ?? ""; return acc; }, {})
   );
-  const [apiKey, setApiKey] = useState("");
+  const apiKey = "";
   const [useTunnel, setUseTunnel] = useState(false);
   const [localEndpoint, setLocalEndpoint] = useState("");
   const [tunnelEndpoint, setTunnelEndpoint] = useState("");
@@ -965,10 +956,6 @@ function GenericExampleCard({ providerId, kind }) {
   useEffect(() => {
     // eslint-disable-next-line react-hooks/set-state-in-effect -- one-time mount initialization from window.location (external source, client-only, avoids hydration mismatch)
     setLocalEndpoint(window.location.origin);
-    fetch("/api/keys")
-      .then((r) => r.json())
-      .then((d) => { setApiKey((d.keys || []).find((k) => k.isActive !== false)?.key || ""); })
-      .catch(() => {});
     fetch("/api/tunnel/status")
       .then((r) => r.json())
       .then((d) => { if (d.publicUrl) setTunnelEndpoint(d.publicUrl); })
@@ -1018,12 +1005,17 @@ function GenericExampleCard({ providerId, kind }) {
   const wantBinary = kind === "image" && imageOutputFormat === "binary";
   const useStreaming = kind === "image" && providerId === "codex" && !wantBinary;
   const apiPathWithQuery = `${apiPath}${wantBinary ? "?response_format=binary" : ""}`;
+  const dashboardApiPath = getDashboardMediaEndpoint(apiPathWithQuery);
   const headersPreview = `-H "Content-Type: application/json" \\\n  -H "Authorization: Bearer ${apiKey || "YOUR_KEY"}"${pinnedConnectionId ? ` \\\n  -H "x-connection-id: ${pinnedConnectionId}"` : ""}${useStreaming ? ` \\\n  -H "Accept: text/event-stream"` : ""}`;
   const curlSnippet = `curl -X ${kindConfig.endpoint.method} ${endpoint}${apiPathWithQuery} \\
   ${headersPreview.replace(/\\\n  /g, "\\\n  ")} \\
   -d '${JSON.stringify(requestBody)}'${wantBinary ? " \\\n  --output image.png" : ""}`;
 
   const handleRun = async () => {
+    if (!dashboardApiPath) {
+      setError("Not supported by this router build");
+      return;
+    }
     if (!input.trim() || !modelFull) return;
     setRunning(true);
     setError("");
@@ -1034,11 +1026,10 @@ function GenericExampleCard({ providerId, kind }) {
     const start = Date.now();
     try {
       const headers = { "Content-Type": "application/json" };
-      if (apiKey) headers["Authorization"] = `Bearer ${apiKey}`;
       if (pinnedConnectionId) headers["x-connection-id"] = pinnedConnectionId;
       if (useStreaming) headers["Accept"] = "text/event-stream";
       const body = { ...requestBody, model: modelFull };
-      const res = await fetch(`/api${apiPathWithQuery}`, {
+      const res = await fetch(dashboardApiPath, {
         method: kindConfig.endpoint.method,
         headers,
         body: JSON.stringify(body),
@@ -1169,7 +1160,7 @@ function GenericExampleCard({ providerId, kind }) {
         {/* API Key */}
         <Row label="API Key">
           <span className="px-3 py-1.5 text-sm font-mono text-text-main bg-sidebar rounded-lg truncate block">
-            {apiKey ? `${apiKey.slice(0, 8)}${"\u2022".repeat(Math.min(20, apiKey.length - 8))}` : <span className="text-text-muted italic">No key configured</span>}
+            <span className="text-text-muted italic">Dashboard session (server-side)</span>
           </span>
         </Row>
 
@@ -1338,26 +1329,35 @@ function GenericExampleCard({ providerId, kind }) {
           <div className="flex flex-col gap-2 sm:flex-row sm:items-center sm:justify-between mb-1.5">
             <span className="text-xs font-semibold text-text-muted uppercase tracking-wider">Request</span>
             <div className="flex w-full flex-col gap-2 sm:w-auto sm:flex-row sm:items-center">
-              <button
-                onClick={() => copyCurl(curlSnippet)}
-                className="inline-flex items-center gap-1 text-xs text-text-muted hover:text-primary transition-colors"
-              >
-                <span className="material-symbols-outlined text-[14px]">{copiedCurl ? "check" : "content_copy"}</span>
-                {copiedCurl ? "Copied" : "Copy"}
-              </button>
+              {dashboardApiPath && (
+                <button
+                  onClick={() => copyCurl(curlSnippet)}
+                  className="inline-flex items-center gap-1 text-xs text-text-muted hover:text-primary transition-colors"
+                >
+                  <span className="material-symbols-outlined text-[14px]">{copiedCurl ? "check" : "content_copy"}</span>
+                  {copiedCurl ? "Copied" : "Copy"}
+                </button>
+              )}
             <button
               onClick={handleRun}
-              disabled={running || !input.trim() || !modelFull}
+              disabled={!dashboardApiPath || running || !input.trim() || !modelFull}
+              title={dashboardApiPath ? undefined : "Not supported by this router build"}
               className="flex w-full sm:w-auto items-center justify-center gap-1.5 px-3 py-1 rounded-lg bg-primary text-white text-xs font-medium hover:bg-primary/90 transition-colors disabled:opacity-50 disabled:cursor-not-allowed"
             >
                 <span className="material-symbols-outlined text-[14px]" style={running ? { animation: "spin 1s linear infinite" } : undefined}>
                   play_arrow
                 </span>
-                {running ? "Running..." : "Run"}
+                {dashboardApiPath ? (running ? "Running..." : "Run") : "Unavailable"}
               </button>
             </div>
           </div>
-          <pre className="bg-sidebar rounded-lg px-3 py-2.5 text-xs font-mono text-text-main overflow-x-auto whitespace-pre-wrap break-all">{curlSnippet}</pre>
+          {dashboardApiPath ? (
+            <pre className="bg-sidebar rounded-lg px-3 py-2.5 text-xs font-mono text-text-main overflow-x-auto whitespace-pre-wrap break-all">{curlSnippet}</pre>
+          ) : (
+            <div className="rounded-lg border border-border bg-sidebar px-3 py-2.5 text-xs text-text-muted">
+              Not supported by this router build
+            </div>
+          )}
         </div>
 
         {/* Streaming progress */}
@@ -1448,7 +1448,7 @@ function SttExampleCard({ providerId }) {
   const [prompt, setPrompt] = useState("");
   const [responseFormat, setResponseFormat] = useState("json");
   const [temperature, setTemperature] = useState("");
-  const [apiKey, setApiKey] = useState("");
+  const apiKey = "";
   const [useTunnel, setUseTunnel] = useState(false);
   const [localEndpoint, setLocalEndpoint] = useState("");
   const [tunnelEndpoint, setTunnelEndpoint] = useState("");
@@ -1462,10 +1462,6 @@ function SttExampleCard({ providerId }) {
   useEffect(() => {
     // eslint-disable-next-line react-hooks/set-state-in-effect -- one-time mount initialization from window.location (external source, client-only, avoids hydration mismatch)
     setLocalEndpoint(window.location.origin);
-    fetch("/api/keys")
-      .then((r) => r.json())
-      .then((d) => { setApiKey((d.keys || []).find((k) => k.isActive !== false)?.key || ""); })
-      .catch(() => {});
     fetch("/api/tunnel/status")
       .then((r) => r.json())
       .then((d) => { if (d.publicUrl) setTunnelEndpoint(d.publicUrl); })
@@ -1512,9 +1508,7 @@ function SttExampleCard({ providerId }) {
       if (allowedParams.includes("temperature") && temperature) fd.append("temperature", temperature);
       if (allowedParams.includes("prompt") && prompt) fd.append("prompt", prompt);
 
-      const headers = {};
-      if (apiKey) headers["Authorization"] = `Bearer ${apiKey}`;
-      const res = await fetch("/api/v1/audio/transcriptions", { method: "POST", headers, body: fd });
+      const res = await fetch(getDashboardMediaEndpoint("/v1/audio/transcriptions"), { method: "POST", body: fd });
       // eslint-disable-next-line react-hooks/purity -- Date.now() runs inside the handleRun click handler after fetch resolves, not during render; computes request latency
       setLatency(Date.now() - start);
       const ct = res.headers.get("content-type") || "";
@@ -1585,7 +1579,7 @@ function SttExampleCard({ providerId }) {
         {/* API Key */}
         <Row label="API Key">
           <span className="px-3 py-1.5 text-sm font-mono text-text-main bg-sidebar rounded-lg truncate block">
-            {apiKey ? `${apiKey.slice(0, 8)}${"\u2022".repeat(Math.min(20, apiKey.length - 8))}` : <span className="text-text-muted italic">No key configured</span>}
+            <span className="text-text-muted italic">Dashboard session (server-side)</span>
           </span>
         </Row>
 

package/src/app/(dashboard)/dashboard/media-providers/combo/[id]/page.js

@@ -7,6 +7,7 @@ import Link from "next/link";
 import { Card, Button, Input, Toggle, ModelSelectModal } from "@/shared/components";
 import ProviderIcon from "@/shared/components/ProviderIcon";
 import { AI_PROVIDERS, MEDIA_PROVIDER_KINDS } from "@/shared/constants/providers";
+import { getDashboardMediaEndpoint } from "@/shared/utils/dashboardMedia";
 
 // Parse "providerId/model" or just "providerId" → { providerId, model }
 function parseModelEntry(entry) {
@@ -59,25 +60,20 @@ export default function ComboDetailPage() {
   const [testing, setTesting] = useState(false);
   const [testResult, setTestResult] = useState(null);
   const [testError, setTestError] = useState("");
-  const [apiKey, setApiKey] = useState("");
+  const apiKey = "";
   const [connections, setConnections] = useState([]);
   const [modelAliases, setModelAliases] = useState({});
 
   const fetchAll = async () => {
     try {
-      const [comboRes, settingsRes, logsRes, keysRes, connsRes, aliasesRes] = await Promise.all([
+      const [comboRes, settingsRes, logsRes, connsRes, aliasesRes] = await Promise.all([
         fetch(`/api/combos/${id}`, { cache: "no-store" }),
         fetch("/api/settings", { cache: "no-store" }),
         fetch("/api/usage/logs", { cache: "no-store" }),
-        fetch("/api/keys", { cache: "no-store" }),
         fetch("/api/providers", { cache: "no-store" }),
         fetch("/api/models/alias", { cache: "no-store" }),
       ]);
       if (aliasesRes.ok) setModelAliases((await aliasesRes.json()).aliases || {});
-      if (keysRes.ok) {
-        const k = await keysRes.json();
-        setApiKey((k.keys || []).find((x) => x.isActive !== false)?.key || "");
-      }
       if (connsRes.ok) setConnections((await connsRes.json()).connections || []);
       if (!comboRes.ok) { setCombo(null); setLoading(false); return; }
       const c = await comboRes.json();
@@ -180,10 +176,14 @@ export default function ComboDetailPage() {
     const start = Date.now();
     try {
       const path = EXAMPLE_PATHS[combo.kind];
+      const dashboardPath = getDashboardMediaEndpoint(path);
+      if (!dashboardPath) {
+        setTestError("Not supported by this router build");
+        return;
+      }
       const body = EXAMPLE_BODIES[combo.kind](combo.name);
       const headers = { "Content-Type": "application/json" };
-      if (apiKey) headers["Authorization"] = `Bearer ${apiKey}`;
-      const res = await fetch(`/api${path}`, { method: "POST", headers, body: JSON.stringify(body) });
+      const res = await fetch(dashboardPath, { method: "POST", headers, body: JSON.stringify(body) });
       // eslint-disable-next-line react-hooks/purity -- Date.now() runs inside the handleTest click handler after fetch resolves, not during render; computes request latency
       const latencyMs = Date.now() - start;
       if (!res.ok) {

package/src/app/(dashboard)/dashboard/mitm/MitmPageClient.js

@@ -37,7 +37,7 @@ export default function MitmPageClient() {
 
   const fetchApiKeys = async () => {
     try {
-      const res = await fetch("/api/keys");
+      const res = await fetch("/api/dashboard/cli-tools/keys", { cache: "no-store" });
       if (res.ok) {
         const data = await res.json();
         setApiKeys(data.keys || []);

package/src/app/(dashboard)/dashboard/profile/page.js

@@ -1019,12 +1019,12 @@ export default function ProfilePage() {
               <div className="flex-1 min-w-0">
                 <p className="font-medium text-sm sm:text-base">Response Cache</p>
                 <p className="text-xs sm:text-sm text-text-muted">
-                  Serve identical non-streaming requests from memory (saves cost)
+                  Cache repeated temperature-0 requests per API key
                 </p>
               </div>
               <Toggle
-                checked={settings.responseCacheEnabled !== false}
-                onChange={() => updateResponseCacheEnabled(settings.responseCacheEnabled === false)}
+                checked={settings.responseCacheEnabled === true}
+                onChange={() => updateResponseCacheEnabled(settings.responseCacheEnabled !== true)}
                 disabled={loading}
               />
             </div>

package/src/app/(dashboard)/dashboard/providers/[id]/ConnectionRow.js

@@ -4,6 +4,7 @@ import { useState, useEffect, useRef } from "react";
 import PropTypes from "prop-types";
 import { Badge, Toggle } from "@/shared/components";
 import { classifyConnectionStatus, getStatusBadgeVariant } from "@/shared/utils/connectionStatus";
+import { useModelLockUntil } from "@/shared/hooks/useModelLockUntil";
 import CooldownTimer from "./CooldownTimer";
 
 export default function ConnectionRow({ connection, proxyPools, isOAuth, isFirst, isLast, onMoveUp, onMoveDown, onToggleActive, onUpdateProxy, onEdit, onDelete, oneByOneStatus = null }) {
@@ -76,33 +77,9 @@ export default function ConnectionRow({ connection, proxyPools, isOAuth, isFirst
     ? (isEmail(connection.email) ? connection.email : (isEmail(connection.name) ? connection.name : (connection.name || connection.email || connection.displayName || "OAuth Account")))
     : (connection.name || connection.email || connection.displayName || "API Key");
 
-  // Use useState + useEffect for impure Date.now() to avoid calling during render
-  const [isCooldown, setIsCooldown] = useState(false);
+  const modelLockUntil = useModelLockUntil(connection);
 
-  // Get earliest model lock timestamp (useEffect handles the Date.now() comparison)
-  const modelLockUntil = Object.entries(connection)
-    .filter(([k]) => k.startsWith("modelLock_"))
-    .map(([, v]) => v)
-    .filter(v => !!v)
-    .sort()[0] || null;
-
-  useEffect(() => {
-    const checkCooldown = () => {
-      const until = Object.entries(connection)
-        .filter(([k]) => k.startsWith("modelLock_"))
-        .map(([, v]) => v)
-        .filter(v => v && new Date(v).getTime() > Date.now())
-        .sort()[0] || null;
-      setIsCooldown(!!until);
-    };
-
-    checkCooldown();
-    const interval = modelLockUntil ? setInterval(checkCooldown, 1000) : null;
-    return () => {
-      if (interval) clearInterval(interval);
-    };
-  // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional: react only to [modelLockUntil]; read latest connection (adding it would re-trigger on every change)
-  }, [modelLockUntil]);
+  const isCooldown = modelLockUntil !== null;
 
   // Determine effective status (override unavailable if cooldown expired)
   const effectiveStatus = (connection.testStatus === "unavailable" && !isCooldown)

package/src/app/(dashboard)/dashboard/providers/[id]/page.js

@@ -12,6 +12,7 @@ import { useCopyToClipboard } from "@/shared/hooks/useCopyToClipboard";
 import { translate } from "@/i18n/runtime";
 import { fetchSuggestedModels } from "@/shared/utils/providerModelsFetcher";
 import { classifyConnectionStatus, CONNECTION_STATUS_FILTERS, filterConnectionByStatus } from "@/shared/utils/connectionStatus";
+import { startAsyncPolling } from "@/shared/utils/asyncPolling";
 import ModelRow from "./ModelRow";
 import PassthroughModelsSection from "./PassthroughModelsSection";
 import CompatibleModelsSection from "./CompatibleModelsSection";
@@ -539,47 +540,45 @@ export default function ProviderDetailPage() {
   useEffect(() => {
     if (providerId !== "kiro" || !kiroBulkJob?.jobId || isBulkJobTerminal(kiroBulkJob.status)) return undefined;
 
-    const interval = window.setInterval(async () => {
-      try {
-        const current = await fetchBulkJobById(kiroBulkJob.jobId);
-        if (current?.res.ok && current.data?.job) {
-          const nextSuccessCount = current.data.job.summary?.success || 0;
+    return startAsyncPolling(async (isCancelled) => {
+      const current = await fetchBulkJobById(kiroBulkJob.jobId);
+      if (isCancelled()) return;
+      if (current?.res.ok && current.data?.job) {
+        const nextSuccessCount = current.data.job.summary?.success || 0;
+        if (nextSuccessCount > kiroBulkSuccessRef.current) {
+          kiroBulkSuccessRef.current = nextSuccessCount;
+          await fetchConnections();
+          if (isCancelled()) return;
+        }
+
+        setKiroBulkNotice("");
+        setKiroBulkJob(current.data.job);
+        return;
+      }
+
+      if (current?.res.status === 404) {
+        const latest = await fetchLatestBulkJob();
+        if (isCancelled()) return;
+        if (latest.res.ok && latest.data?.job) {
+          const nextSuccessCount = latest.data.job.summary?.success || 0;
           if (nextSuccessCount > kiroBulkSuccessRef.current) {
             kiroBulkSuccessRef.current = nextSuccessCount;
             await fetchConnections();
+            if (isCancelled()) return;
           }
 
           setKiroBulkNotice("");
-          setKiroBulkJob(current.data.job);
+          setKiroBulkJob(latest.data.job);
+          if (typeof window !== "undefined") {
+            window.localStorage.setItem(KIRO_BULK_JOB_STORAGE_KEY, latest.data.job.jobId);
+          }
           return;
         }
 
-        if (current?.res.status === 404) {
-          const latest = await fetchLatestBulkJob();
-          if (latest.res.ok && latest.data?.job) {
-            const nextSuccessCount = latest.data.job.summary?.success || 0;
-            if (nextSuccessCount > kiroBulkSuccessRef.current) {
-              kiroBulkSuccessRef.current = nextSuccessCount;
-              await fetchConnections();
-            }
-
-            setKiroBulkNotice("");
-            setKiroBulkJob(latest.data.job);
-            if (typeof window !== "undefined") {
-              window.localStorage.setItem(KIRO_BULK_JOB_STORAGE_KEY, latest.data.job.jobId);
-            }
-            return;
-          }
-
-          clearKiroBulkProgress();
-          setKiroBulkNotice(KIRO_BULK_JOB_EXPIRED_MESSAGE);
-        }
-      } catch {
-        // Keep the last snapshot visible and allow the user to reopen the modal.
+        clearKiroBulkProgress();
+        setKiroBulkNotice(KIRO_BULK_JOB_EXPIRED_MESSAGE);
       }
     }, 2000);
-
-    return () => window.clearInterval(interval);
   }, [clearKiroBulkProgress, fetchConnections, kiroBulkJob?.jobId, kiroBulkJob?.status, providerId]);
 
   // Fetch suggested models from provider's public API (if configured)

package/src/app/(dashboard)/dashboard/providers/components/ConnectionsCard.js

@@ -3,6 +3,7 @@
 import { useState, useEffect, useCallback, useRef } from "react";
 import PropTypes from "prop-types";
 import { Card, Badge, Button, Modal, Select, Toggle, EditConnectionModal, ConfirmModal } from "@/shared/components";
+import { useModelLockUntil } from "@/shared/hooks/useModelLockUntil";
 
 // ── CooldownTimer ──────────────────────────────────────────────
 function CooldownTimer({ until }) {
@@ -32,7 +33,6 @@ CooldownTimer.propTypes = { until: PropTypes.string.isRequired };
 function ConnectionRow({ connection, proxyPools, isOAuth, isFirst, isLast, onMoveUp, onMoveDown, onToggleActive, onUpdateProxy, onEdit, onDelete }) {
   const [showProxyDropdown, setShowProxyDropdown] = useState(false);
   const [updatingProxy, setUpdatingProxy] = useState(false);
-  const [isCooldown, setIsCooldown] = useState(false);
   const proxyDropdownRef = useRef(null);
 
   const proxyPoolMap = new Map((proxyPools || []).map((p) => [p.id, p]));
@@ -58,22 +58,9 @@ function ConnectionRow({ connection, proxyPools, isOAuth, isFirst, isLast, onMov
   const noProxyText = boundProxyPool?.noProxy || connection.providerSpecificData?.connectionNoProxy || "";
   const proxyBadgeVariant = boundProxyPool?.isActive === true ? "success" : (boundProxyPoolId || hasLegacyProxy) ? "error" : "default";
 
-  const modelLockUntil = Object.entries(connection)
-    .filter(([k]) => k.startsWith("modelLock_"))
-    .map(([, v]) => v).filter(Boolean).sort()[0] || null;
+  const modelLockUntil = useModelLockUntil(connection);
 
-  useEffect(() => {
-    const check = () => {
-      const until = Object.entries(connection)
-        .filter(([k]) => k.startsWith("modelLock_"))
-        .map(([, v]) => v).filter(v => v && new Date(v).getTime() > Date.now()).sort()[0] || null;
-      setIsCooldown(!!until);
-    };
-    check();
-    const t = modelLockUntil ? setInterval(check, 1000) : null;
-    return () => { if (t) clearInterval(t); };
-  // eslint-disable-next-line react-hooks/exhaustive-deps -- intentional: react only to [modelLockUntil]; read latest connection (adding it would re-trigger on every change)
-  }, [modelLockUntil]);
+  const isCooldown = modelLockUntil !== null;
 
   useEffect(() => {
     if (!showProxyDropdown) return;

package/src/app/(dashboard)/dashboard/proxy-pools/page.js

@@ -99,10 +99,19 @@ export default function ProxyPoolsPage() {
     setShowFormModal(true);
   };
 
-  const openEditModal = (proxyPool) => {
-    setEditingProxyPool(proxyPool);
-    setFormData(normalizeFormData(proxyPool));
-    setShowFormModal(true);
+  const openEditModal = async (proxyPool) => {
+    try {
+      const res = await fetch(`/api/proxy-pools/${proxyPool.id}?reveal=1`, { cache: "no-store" });
+      const data = await res.json();
+      if (!res.ok || !data.proxyPool) {
+        throw new Error(data.error || "Failed to load proxy pool");
+      }
+      setEditingProxyPool(data.proxyPool);
+      setFormData(normalizeFormData(data.proxyPool));
+      setShowFormModal(true);
+    } catch (error) {
+      notify.error(error.message || "Failed to load proxy pool");
+    }
   };
 
   const closeFormModal = () => {
@@ -562,6 +571,9 @@ export default function ProxyPoolsPage() {
         if (res.ok) {
           created += 1;
           existingKeys.add(dedupeKey);
+        } else if (res.status === 409) {
+          skipped += 1;
+          existingKeys.add(dedupeKey);
         } else {
           failed += 1;
         }

package/src/app/(dashboard)/dashboard/usage/components/ProviderLimits/index.js

@@ -529,7 +529,7 @@ export default function ProviderLimits() {
   // Refresh quota for a specific provider
   const refreshProvider = useCallback(
     async (connectionId, provider) => {
-      await fetchQuota(connectionId, provider);
+      await fetchQuota(connectionId, provider, true);
       setLastUpdated(new Date());
     },
     [fetchQuota],
@@ -578,7 +578,7 @@ export default function ProviderLimits() {
         ...Object.fromEntries(connectionIds.map((id) => [id, true])),
       }));
 
-      await Promise.all(connectionIds.map((id) => fetchQuota(id, provider)));
+      await Promise.all(connectionIds.map((id) => fetchQuota(id, provider, true)));
       setLastUpdated(new Date());
     },
     [fetchQuota, displayMode, fetchServerAggregate],
@@ -725,7 +725,9 @@ export default function ProviderLimits() {
         const providers = providerFilter !== "all"
           ? [providerFilter]
           : providerOptions.map((opt) => opt.value || opt).filter((v) => v !== "all");
-        providers.forEach((provider) => fetchServerAggregate(provider, true));
+        await Promise.all(
+          providers.map((provider) => fetchServerAggregate(provider, true)),
+        );
       }
 
       setLastUpdated(new Date());
@@ -966,24 +968,6 @@ export default function ProviderLimits() {
     );
   }
 
-  if (!connectionsLoading && !hasVisibleConnections) {
-    return (
-      <Card padding="lg">
-        <div className="text-center py-12">
-          <span className="material-symbols-outlined text-[64px] text-text-muted opacity-20">
-            {emptyState.icon}
-          </span>
-          <h3 className="mt-4 text-lg font-semibold text-text-primary">
-            {emptyState.title}
-          </h3>
-          <p className="mt-2 text-sm text-text-muted max-w-md mx-auto">
-            {emptyState.description}
-          </p>
-        </div>
-      </Card>
-    );
-  }
-
   return (
     <div className="space-y-6">
       {/* Header Controls */}
@@ -1224,6 +1208,22 @@ export default function ProviderLimits() {
         </div>
       </div>
 
+      {!hasVisibleConnections ? (
+        <Card padding="lg">
+          <div className="text-center py-12">
+            <span className="material-symbols-outlined text-[64px] text-text-muted opacity-20">
+              {emptyState.icon}
+            </span>
+            <h3 className="mt-4 text-lg font-semibold text-text-primary">
+              {emptyState.title}
+            </h3>
+            <p className="mt-2 text-sm text-text-muted max-w-md mx-auto">
+              {emptyState.description}
+            </p>
+          </div>
+        </Card>
+      ) : (
+        <>
       {/* Provider cards: 2 columns, compact */}
       {expiringFirst && (
         <div className="rounded-xl border border-amber-500/20 bg-amber-500/10 px-3 py-2 text-xs text-amber-700 dark:text-amber-300">
@@ -1553,6 +1553,8 @@ export default function ProviderLimits() {
             </div>
           </div>
         </div>
+        </>
+      )}
 
       <EditConnectionModal
         isOpen={showEditModal}