Merge branch 'refactor/simplify-proxy-logs' into feature/global-proxy

Resolve conflict in skill.rs: keep global HTTP client for proxy support

src/App.tsx

@@ -808,6 +808,7 @@ function App() {
 
       {effectiveUsageProvider && (
         <UsageScriptModal
+          key={effectiveUsageProvider.id}
           provider={effectiveUsageProvider}
           appId={activeApp}
           isOpen={Boolean(usageProvider)}

src/components/providers/forms/ProviderForm.tsx

@@ -236,7 +236,7 @@ export function ProviderForm({
     } catch {
       // ignore
     }
-    return true;
+    return false; // OpenRouter now supports Claude Code compatible API, no need for transform
   }, [isOpenRouterProvider, settingsConfigValue]);
 
   const handleOpenRouterCompatChange = useCallback(
@@ -864,7 +864,7 @@ export function ProviderForm({
             defaultOpusModel={defaultOpusModel}
             onModelChange={handleModelChange}
             speedTestEndpoints={speedTestEndpoints}
-            showOpenRouterCompatToggle={isOpenRouterProvider}
+            showOpenRouterCompatToggle={false}
             openRouterCompatEnabled={openRouterCompatEnabled}
             onOpenRouterCompatChange={handleOpenRouterCompatChange}
           />

src/components/providers/forms/hooks/useApiKeyState.ts

@@ -43,11 +43,7 @@ export function useApiKeyState({
       return;
     }
 
-    // 仅当配置确实包含 API Key 字段时才同步（避免无意清空用户正在输入的 key）
-    if (!hasApiKeyField(initialConfig, appType)) {
-      return;
-    }
-
+    // 从配置中提取 API Key（如果不存在则返回空字符串）
     const extracted = getApiKeyFromConfig(initialConfig, appType);
     if (extracted !== apiKey) {
       setApiKey(extracted);

src/components/providers/forms/hooks/useBaseUrlState.ts

@@ -41,8 +41,9 @@ export function useBaseUrlState({
     try {
       const config = JSON.parse(settingsConfig || "{}");
       const envUrl: unknown = config?.env?.ANTHROPIC_BASE_URL;
-      if (typeof envUrl === "string" && envUrl && envUrl.trim() !== baseUrl) {
-        setBaseUrl(envUrl.trim());
+      const nextUrl = typeof envUrl === "string" ? envUrl.trim() : "";
+      if (nextUrl !== baseUrl) {
+        setBaseUrl(nextUrl);
       }
     } catch {
       // ignore

src/components/proxy/AutoFailoverConfigPanel.tsx

@@ -56,29 +56,122 @@ export function AutoFailoverConfigPanel({
 
   const handleSave = async () => {
     if (!config) return;
-    // 解析数字，空值使用默认值，0 是有效值
-    const parseNum = (val: string, defaultVal: number) => {
-      const n = parseInt(val);
-      return isNaN(n) ? defaultVal : n;
+    // 解析数字，返回 NaN 表示无效输入
+    const parseNum = (val: string) => {
+      const trimmed = val.trim();
+      // 必须是纯数字
+      if (!/^-?\d+$/.test(trimmed)) return NaN;
+      return parseInt(trimmed);
     };
+
+    // 定义各字段的有效范围
+    const ranges = {
+      maxRetries: { min: 0, max: 10 },
+      streamingFirstByteTimeout: { min: 0, max: 180 },
+      streamingIdleTimeout: { min: 0, max: 600 },
+      nonStreamingTimeout: { min: 0, max: 1800 },
+      circuitFailureThreshold: { min: 1, max: 20 },
+      circuitSuccessThreshold: { min: 1, max: 10 },
+      circuitTimeoutSeconds: { min: 0, max: 300 },
+      circuitErrorRateThreshold: { min: 0, max: 100 },
+      circuitMinRequests: { min: 5, max: 100 },
+    };
+
+    // 解析原始值
+    const raw = {
+      maxRetries: parseNum(formData.maxRetries),
+      streamingFirstByteTimeout: parseNum(formData.streamingFirstByteTimeout),
+      streamingIdleTimeout: parseNum(formData.streamingIdleTimeout),
+      nonStreamingTimeout: parseNum(formData.nonStreamingTimeout),
+      circuitFailureThreshold: parseNum(formData.circuitFailureThreshold),
+      circuitSuccessThreshold: parseNum(formData.circuitSuccessThreshold),
+      circuitTimeoutSeconds: parseNum(formData.circuitTimeoutSeconds),
+      circuitErrorRateThreshold: parseNum(formData.circuitErrorRateThreshold),
+      circuitMinRequests: parseNum(formData.circuitMinRequests),
+    };
+
+    // 校验是否超出范围（NaN 也视为无效）
+    const errors: string[] = [];
+    const checkRange = (
+      value: number,
+      range: { min: number; max: number },
+      label: string,
+    ) => {
+      if (isNaN(value) || value < range.min || value > range.max) {
+        errors.push(`${label}: ${range.min}-${range.max}`);
+      }
+    };
+
+    checkRange(
+      raw.maxRetries,
+      ranges.maxRetries,
+      t("proxy.autoFailover.maxRetries", "最大重试次数"),
+    );
+    checkRange(
+      raw.streamingFirstByteTimeout,
+      ranges.streamingFirstByteTimeout,
+      t("proxy.autoFailover.streamingFirstByte", "流式首字节超时"),
+    );
+    checkRange(
+      raw.streamingIdleTimeout,
+      ranges.streamingIdleTimeout,
+      t("proxy.autoFailover.streamingIdle", "流式静默超时"),
+    );
+    checkRange(
+      raw.nonStreamingTimeout,
+      ranges.nonStreamingTimeout,
+      t("proxy.autoFailover.nonStreaming", "非流式超时"),
+    );
+    checkRange(
+      raw.circuitFailureThreshold,
+      ranges.circuitFailureThreshold,
+      t("proxy.autoFailover.failureThreshold", "失败阈值"),
+    );
+    checkRange(
+      raw.circuitSuccessThreshold,
+      ranges.circuitSuccessThreshold,
+      t("proxy.autoFailover.successThreshold", "恢复成功阈值"),
+    );
+    checkRange(
+      raw.circuitTimeoutSeconds,
+      ranges.circuitTimeoutSeconds,
+      t("proxy.autoFailover.timeout", "恢复等待时间"),
+    );
+    checkRange(
+      raw.circuitErrorRateThreshold,
+      ranges.circuitErrorRateThreshold,
+      t("proxy.autoFailover.errorRate", "错误率阈值"),
+    );
+    checkRange(
+      raw.circuitMinRequests,
+      ranges.circuitMinRequests,
+      t("proxy.autoFailover.minRequests", "最小请求数"),
+    );
+
+    if (errors.length > 0) {
+      toast.error(
+        t("proxy.autoFailover.validationFailed", {
+          fields: errors.join("; "),
+          defaultValue: `以下字段超出有效范围: ${errors.join("; ")}`,
+        }),
+      );
+      return;
+    }
+
     try {
       await updateConfig.mutateAsync({
         appType,
         enabled: config.enabled,
         autoFailoverEnabled: formData.autoFailoverEnabled,
-        maxRetries: parseNum(formData.maxRetries, 3),
-        streamingFirstByteTimeout: parseNum(
-          formData.streamingFirstByteTimeout,
-          30,
-        ),
-        streamingIdleTimeout: parseNum(formData.streamingIdleTimeout, 60),
-        nonStreamingTimeout: parseNum(formData.nonStreamingTimeout, 300),
-        circuitFailureThreshold: parseNum(formData.circuitFailureThreshold, 5),
-        circuitSuccessThreshold: parseNum(formData.circuitSuccessThreshold, 2),
-        circuitTimeoutSeconds: parseNum(formData.circuitTimeoutSeconds, 60),
-        circuitErrorRateThreshold:
-          parseNum(formData.circuitErrorRateThreshold, 50) / 100,
-        circuitMinRequests: parseNum(formData.circuitMinRequests, 10),
+        maxRetries: raw.maxRetries,
+        streamingFirstByteTimeout: raw.streamingFirstByteTimeout,
+        streamingIdleTimeout: raw.streamingIdleTimeout,
+        nonStreamingTimeout: raw.nonStreamingTimeout,
+        circuitFailureThreshold: raw.circuitFailureThreshold,
+        circuitSuccessThreshold: raw.circuitSuccessThreshold,
+        circuitTimeoutSeconds: raw.circuitTimeoutSeconds,
+        circuitErrorRateThreshold: raw.circuitErrorRateThreshold / 100,
+        circuitMinRequests: raw.circuitMinRequests,
       });
       toast.success(
         t("proxy.autoFailover.configSaved", "自动故障转移配置已保存"),
@@ -327,7 +420,7 @@ export function AutoFailoverConfigPanel({
               <Input
                 id={`timeoutSeconds-${appType}`}
                 type="number"
-                min="10"
+                min="0"
                 max="300"
                 value={formData.circuitTimeoutSeconds}
                 onChange={(e) =>

src/components/proxy/CircuitBreakerConfigPanel.tsx

@@ -7,12 +7,14 @@ import { Label } from "@/components/ui/label";
 import { Button } from "@/components/ui/button";
 import { useState, useEffect } from "react";
 import { toast } from "sonner";
+import { useTranslation } from "react-i18next";
 
 /**
  * 熔断器配置面板
  * 允许用户调整熔断器参数
  */
 export function CircuitBreakerConfigPanel() {
+  const { t } = useTranslation();
   const { data: config, isLoading } = useCircuitBreakerConfig();
   const updateConfig = useUpdateCircuitBreakerConfig();
 
@@ -39,23 +41,95 @@ export function CircuitBreakerConfigPanel() {
   }, [config]);
 
   const handleSave = async () => {
-    // 解析数字，空值使用默认值，0 是有效值
-    const parseNum = (val: string, defaultVal: number) => {
-      const n = parseInt(val);
-      return isNaN(n) ? defaultVal : n;
+    // 解析数字，返回 NaN 表示无效输入
+    const parseNum = (val: string) => {
+      const trimmed = val.trim();
+      // 必须是纯数字
+      if (!/^-?\d+$/.test(trimmed)) return NaN;
+      return parseInt(trimmed);
     };
+
+    // 定义各字段的有效范围
+    const ranges = {
+      failureThreshold: { min: 1, max: 20 },
+      successThreshold: { min: 1, max: 10 },
+      timeoutSeconds: { min: 0, max: 300 },
+      errorRateThreshold: { min: 0, max: 100 },
+      minRequests: { min: 5, max: 100 },
+    };
+
+    // 解析原始值
+    const raw = {
+      failureThreshold: parseNum(formData.failureThreshold),
+      successThreshold: parseNum(formData.successThreshold),
+      timeoutSeconds: parseNum(formData.timeoutSeconds),
+      errorRateThreshold: parseNum(formData.errorRateThreshold),
+      minRequests: parseNum(formData.minRequests),
+    };
+
+    // 校验是否超出范围（NaN 也视为无效）
+    const errors: string[] = [];
+    const checkRange = (
+      value: number,
+      range: { min: number; max: number },
+      label: string,
+    ) => {
+      if (isNaN(value) || value < range.min || value > range.max) {
+        errors.push(`${label}: ${range.min}-${range.max}`);
+      }
+    };
+
+    checkRange(
+      raw.failureThreshold,
+      ranges.failureThreshold,
+      t("circuitBreaker.failureThreshold", "失败阈值"),
+    );
+    checkRange(
+      raw.successThreshold,
+      ranges.successThreshold,
+      t("circuitBreaker.successThreshold", "成功阈值"),
+    );
+    checkRange(
+      raw.timeoutSeconds,
+      ranges.timeoutSeconds,
+      t("circuitBreaker.timeoutSeconds", "超时时间"),
+    );
+    checkRange(
+      raw.errorRateThreshold,
+      ranges.errorRateThreshold,
+      t("circuitBreaker.errorRateThreshold", "错误率阈值"),
+    );
+    checkRange(
+      raw.minRequests,
+      ranges.minRequests,
+      t("circuitBreaker.minRequests", "最小请求数"),
+    );
+
+    if (errors.length > 0) {
+      toast.error(
+        t("circuitBreaker.validationFailed", {
+          fields: errors.join("; "),
+          defaultValue: `以下字段超出有效范围: ${errors.join("; ")}`,
+        }),
+      );
+      return;
+    }
+
     try {
-      const parsed = {
-        failureThreshold: parseNum(formData.failureThreshold, 5),
-        successThreshold: parseNum(formData.successThreshold, 2),
-        timeoutSeconds: parseNum(formData.timeoutSeconds, 60),
-        errorRateThreshold: parseNum(formData.errorRateThreshold, 50) / 100,
-        minRequests: parseNum(formData.minRequests, 10),
-      };
-      await updateConfig.mutateAsync(parsed);
-      toast.success("熔断器配置已保存", { closeButton: true });
+      await updateConfig.mutateAsync({
+        failureThreshold: raw.failureThreshold,
+        successThreshold: raw.successThreshold,
+        timeoutSeconds: raw.timeoutSeconds,
+        errorRateThreshold: raw.errorRateThreshold / 100,
+        minRequests: raw.minRequests,
+      });
+      toast.success(t("circuitBreaker.configSaved", "熔断器配置已保存"), {
+        closeButton: true,
+      });
     } catch (error) {
-      toast.error("保存失败: " + String(error));
+      toast.error(
+        t("circuitBreaker.saveFailed", "保存失败") + ": " + String(error),
+      );
     }
   };
 
@@ -111,7 +185,7 @@ export function CircuitBreakerConfigPanel() {
           <Input
             id="timeoutSeconds"
             type="number"
-            min="10"
+            min="0"
             max="300"
             value={formData.timeoutSeconds}
             onChange={(e) =>

src/components/proxy/ProxyPanel.tsx

@@ -102,14 +102,57 @@ export function ProxyPanel() {
 
   const handleSaveBasicConfig = async () => {
     if (!globalConfig) return;
-    const port = parseInt(listenPort);
-    const validPort = isNaN(port) || port < 1024 || port > 65535 ? 15721 : port;
+
+    // 校验地址格式（简单的 IP 地址或 localhost 校验）
+    const addressTrimmed = listenAddress.trim();
+    const ipv4Regex = /^(\d{1,3}\.){3}\d{1,3}$/;
+    // 规范化 localhost 为 127.0.0.1
+    const normalizedAddress =
+      addressTrimmed === "localhost" ? "127.0.0.1" : addressTrimmed;
+    const isValidAddress =
+      normalizedAddress === "0.0.0.0" ||
+      (ipv4Regex.test(normalizedAddress) &&
+        normalizedAddress.split(".").every((n) => {
+          const num = parseInt(n);
+          return num >= 0 && num <= 255;
+        }));
+    if (!isValidAddress) {
+      toast.error(
+        t("proxy.settings.invalidAddress", {
+          defaultValue:
+            "地址无效，请输入有效的 IP 地址（如 127.0.0.1）或 localhost",
+        }),
+      );
+      return;
+    }
+
+    // 严格校验端口：必须是纯数字
+    const portTrimmed = listenPort.trim();
+    if (!/^\d+$/.test(portTrimmed)) {
+      toast.error(
+        t("proxy.settings.invalidPort", {
+          defaultValue: "端口无效，请输入 1024-65535 之间的数字",
+        }),
+      );
+      return;
+    }
+    const port = parseInt(portTrimmed);
+    if (isNaN(port) || port < 1024 || port > 65535) {
+      toast.error(
+        t("proxy.settings.invalidPort", {
+          defaultValue: "端口无效，请输入 1024-65535 之间的数字",
+        }),
+      );
+      return;
+    }
     try {
       await updateGlobalConfig.mutateAsync({
         ...globalConfig,
-        listenAddress,
-        listenPort: validPort,
+        listenAddress: normalizedAddress,
+        listenPort: port,
       });
+      // 同步更新本地状态为规范化后的值
+      setListenAddress(normalizedAddress);
       toast.success(
         t("proxy.settings.configSaved", { defaultValue: "代理配置已保存" }),
         { closeButton: true },
@@ -135,6 +178,13 @@ export function ProxyPanel() {
     }
   };
 
+  // 格式化地址用于 URL（IPv6 需要方括号）
+  const formatAddressForUrl = (address: string, port: number): string => {
+    const isIPv6 = address.includes(":");
+    const host = isIPv6 ? `[${address}]` : address;
+    return `http://${host}:${port}`;
+  };
+
   return (
     <>
       <section className="space-y-6">
@@ -149,14 +199,14 @@ export function ProxyPanel() {
                 </p>
                 <div className="flex flex-col gap-2 sm:flex-row sm:items-center">
                   <code className="flex-1 text-sm bg-background px-3 py-2 rounded border border-border/60">
-                    http://{status.address}:{status.port}
+                    {formatAddressForUrl(status.address, status.port)}
                   </code>
                   <Button
                     size="sm"
                     variant="outline"
                     onClick={() => {
                       navigator.clipboard.writeText(
-                        `http://${status.address}:${status.port}`,
+                        formatAddressForUrl(status.address, status.port),
                       );
                       toast.success(
                         t("proxy.panel.addressCopied", {

src/i18n/locales/en.json

@@ -1116,7 +1116,12 @@
       "toast": {
         "saved": "Proxy configuration saved",
         "saveFailed": "Save failed: {{error}}"
-      }
+      },
+      "invalidPort": "Invalid port, please enter a number between 1024-65535",
+      "invalidAddress": "Invalid address, please enter a valid IP address (e.g. 127.0.0.1) or localhost",
+      "configSaved": "Proxy configuration saved",
+      "configSaveFailed": "Failed to save configuration",
+      "restartRequired": "Restart proxy service for address or port changes to take effect"
     },
     "switchFailed": "Switch failed: {{error}}",
     "failover": {
@@ -1143,6 +1148,7 @@
       "info": "When the failover queue has multiple providers, the system will try them in priority order when requests fail. When a provider reaches the consecutive failure threshold, the circuit breaker will open and skip it temporarily.",
       "configSaved": "Auto failover config saved",
       "configSaveFailed": "Failed to save",
+      "validationFailed": "The following fields are out of valid range: {{fields}}",
       "retrySettings": "Retry & Timeout Settings",
       "failureThreshold": "Failure Threshold",
       "failureThresholdHint": "Open circuit breaker after this many consecutive failures (recommended: 3-10)",
@@ -1194,6 +1200,16 @@
     "streamingIdle": "Streaming Idle Timeout",
     "nonStreaming": "Non-Streaming Timeout"
   },
+  "circuitBreaker": {
+    "failureThreshold": "Failure Threshold",
+    "successThreshold": "Success Threshold",
+    "timeoutSeconds": "Timeout (seconds)",
+    "errorRateThreshold": "Error Rate Threshold",
+    "minRequests": "Min Requests",
+    "validationFailed": "The following fields are out of valid range: {{fields}}",
+    "configSaved": "Circuit breaker config saved",
+    "saveFailed": "Failed to save"
+  },
   "universalProvider": {
     "title": "Universal Provider",
     "description": "Universal providers manage Claude, Codex, and Gemini configurations simultaneously. Changes are automatically synced to all enabled apps.",

src/i18n/locales/zh.json

@@ -1116,7 +1116,12 @@
       "toast": {
         "saved": "代理配置已保存",
         "saveFailed": "保存失败: {{error}}"
-      }
+      },
+      "invalidPort": "端口无效，请输入 1024-65535 之间的数字",
+      "invalidAddress": "地址无效，请输入有效的 IP 地址（如 127.0.0.1）或 localhost",
+      "configSaved": "代理配置已保存",
+      "configSaveFailed": "保存配置失败",
+      "restartRequired": "修改地址或端口后需要重启代理服务才能生效"
     },
     "switchFailed": "切换失败: {{error}}",
     "failover": {
@@ -1143,6 +1148,7 @@
       "info": "当故障转移队列中配置了多个供应商时，系统会在请求失败时按优先级顺序依次尝试。当某个供应商连续失败达到阈值时，熔断器会打开并在一段时间内跳过该供应商。",
       "configSaved": "自动故障转移配置已保存",
       "configSaveFailed": "保存失败",
+      "validationFailed": "以下字段超出有效范围: {{fields}}",
       "retrySettings": "重试与超时设置",
       "failureThreshold": "失败阈值",
       "failureThresholdHint": "连续失败多少次后打开熔断器（建议: 3-10）",
@@ -1194,6 +1200,16 @@
     "streamingIdle": "流式静默超时",
     "nonStreaming": "非流式超时"
   },
+  "circuitBreaker": {
+    "failureThreshold": "失败阈值",
+    "successThreshold": "成功阈值",
+    "timeoutSeconds": "超时时间",
+    "errorRateThreshold": "错误率阈值",
+    "minRequests": "最小请求数",
+    "validationFailed": "以下字段超出有效范围: {{fields}}",
+    "configSaved": "熔断器配置已保存",
+    "saveFailed": "保存失败"
+  },
   "universalProvider": {
     "title": "统一供应商",
     "description": "统一供应商可以同时管理 Claude、Codex 和 Gemini 的配置。修改后会自动同步到所有启用的应用。",