@yina-npm/openrouterx 0.4.31 → 0.4.33

package/app/node_modules/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "next",
-  "version": "16.2.4",
+  "version": "16.2.6",
   "description": "The React Framework",
   "main": "./dist/server/next.js",
   "license": "MIT",
@@ -97,7 +97,7 @@
     ]
   },
   "dependencies": {
-    "@next/env": "16.2.4",
+    "@next/env": "16.2.6",
     "@swc/helpers": "0.5.15",
     "baseline-browser-mapping": "^2.9.19",
     "caniuse-lite": "^1.0.30001579",
@@ -128,14 +128,14 @@
   },
   "optionalDependencies": {
     "sharp": "^0.34.5",
-    "@next/swc-darwin-arm64": "16.2.4",
-    "@next/swc-darwin-x64": "16.2.4",
-    "@next/swc-linux-arm64-gnu": "16.2.4",
-    "@next/swc-linux-arm64-musl": "16.2.4",
-    "@next/swc-linux-x64-gnu": "16.2.4",
-    "@next/swc-linux-x64-musl": "16.2.4",
-    "@next/swc-win32-arm64-msvc": "16.2.4",
-    "@next/swc-win32-x64-msvc": "16.2.4"
+    "@next/swc-darwin-arm64": "16.2.6",
+    "@next/swc-darwin-x64": "16.2.6",
+    "@next/swc-linux-arm64-gnu": "16.2.6",
+    "@next/swc-linux-arm64-musl": "16.2.6",
+    "@next/swc-linux-x64-gnu": "16.2.6",
+    "@next/swc-linux-x64-musl": "16.2.6",
+    "@next/swc-win32-arm64-msvc": "16.2.6",
+    "@next/swc-win32-x64-msvc": "16.2.6"
   },
   "devDependencies": {
     "@babel/core": "7.26.10",
@@ -169,11 +169,11 @@
     "@modelcontextprotocol/sdk": "1.18.1",
     "@mswjs/interceptors": "0.23.0",
     "@napi-rs/triples": "1.2.0",
-    "@next/font": "16.2.4",
-    "@next/polyfill-module": "16.2.4",
-    "@next/polyfill-nomodule": "16.2.4",
-    "@next/react-refresh-utils": "16.2.4",
-    "@next/swc": "16.2.4",
+    "@next/font": "16.2.6",
+    "@next/polyfill-module": "16.2.6",
+    "@next/polyfill-nomodule": "16.2.6",
+    "@next/react-refresh-utils": "16.2.6",
+    "@next/swc": "16.2.6",
     "@opentelemetry/api": "1.6.0",
     "@playwright/test": "1.58.2",
     "@rspack/core": "1.6.7",

package/app/node_modules/sharp/node_modules/semver/internal/re.js

@@ -136,7 +136,7 @@ createToken('LOOSE', `^${src[t.LOOSEPLAIN]}$`)
 createToken('GTLT', '((?:<|>)?=?)')
 
 // Something like "2.*" or "1.2.x".
-// Note that "x.x" is a valid xRange identifer, meaning "any version"
+// Note that "x.x" is a valid xRange identifier, meaning "any version"
 // Only the first item is strictly required.
 createToken('XRANGEIDENTIFIERLOOSE', `${src[t.NUMERICIDENTIFIERLOOSE]}|x|X|\\*`)
 createToken('XRANGEIDENTIFIER', `${src[t.NUMERICIDENTIFIER]}|x|X|\\*`)

package/app/node_modules/sharp/node_modules/semver/package.json

@@ -1,6 +1,6 @@
 {
   "name": "semver",
-  "version": "7.7.4",
+  "version": "7.8.0",
   "description": "The semantic version parser used by npm.",
   "main": "index.js",
   "scripts": {
@@ -15,7 +15,7 @@
   },
   "devDependencies": {
     "@npmcli/eslint-config": "^6.0.0",
-    "@npmcli/template-oss": "4.29.0",
+    "@npmcli/template-oss": "5.0.0",
     "benchmark": "^2.1.4",
     "tap": "^16.0.0"
   },
@@ -52,7 +52,7 @@
   "author": "GitHub Inc.",
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.29.0",
+    "version": "5.0.0",
     "engines": ">=10",
     "distPaths": [
       "classes/",

package/app/package.json

@@ -1,13 +1,13 @@
 {
   "name": "9router-app",
-  "version": "0.4.31",
+  "version": "0.4.33",
   "description": "9Router web dashboard",
   "private": true,
   "scripts": {
-    "dev": "next dev --webpack --port 20128",
+    "dev": "next dev --webpack --port 20502",
     "build": "NODE_ENV=production next build --webpack",
     "start": "NODE_ENV=production next start",
-    "dev:bun": "bun --bun next dev --webpack --port 20128",
+    "dev:bun": "bun --bun next dev --webpack --port 20502",
     "build:bun": "NODE_ENV=production bun --bun next build --webpack",
     "start:bun": "NODE_ENV=production bun ./.next/standalone/server.js"
   },

package/app/server.js

@@ -9,7 +9,7 @@ const currentPort = parseInt(process.env.PORT, 10) || 3000
 const hostname = process.env.HOSTNAME || '0.0.0.0'
 
 let keepAliveTimeout = parseInt(process.env.KEEP_ALIVE_TIMEOUT, 10)
-const nextConfig = {"env":{},"typescript":{"ignoreBuildErrors":false},"typedRoutes":false,"distDir":"./.next","cleanDistDir":true,"assetPrefix":"","cacheMaxMemorySize":52428800,"configOrigin":"next.config.mjs","useFileSystemPublicRoutes":true,"generateEtags":true,"pageExtensions":["tsx","ts","jsx","js"],"poweredByHeader":true,"compress":true,"images":{"deviceSizes":[640,750,828,1080,1200,1920,2048,3840],"imageSizes":[32,48,64,96,128,256,384],"path":"/_next/image","loader":"default","loaderFile":"","domains":[],"disableStaticImages":false,"minimumCacheTTL":14400,"formats":["image/webp"],"maximumRedirects":3,"maximumResponseBody":50000000,"dangerouslyAllowLocalIP":false,"dangerouslyAllowSVG":false,"contentSecurityPolicy":"script-src 'none'; frame-src 'none'; sandbox;","contentDispositionType":"attachment","localPatterns":[{"pathname":"**","search":""}],"remotePatterns":[],"qualities":[75],"unoptimized":true,"customCacheHandler":false},"devIndicators":{"position":"bottom-left"},"onDemandEntries":{"maxInactiveAge":60000,"pagesBufferLength":5},"basePath":"","sassOptions":{},"trailingSlash":false,"i18n":null,"productionBrowserSourceMaps":false,"excludeDefaultMomentLocales":true,"reactProductionProfiling":false,"reactStrictMode":null,"reactMaxHeadersLength":6000,"httpAgentOptions":{"keepAlive":true},"logging":{"serverFunctions":true,"browserToTerminal":"warn"},"compiler":{},"expireTime":31536000,"staticPageGenerationTimeout":60,"output":"standalone","modularizeImports":{"@mui/icons-material":{"transform":"@mui/icons-material/{{member}}"},"lodash":{"transform":"lodash/{{member}}"}},"outputFileTracingRoot":"/Users/bytedance/Documents/9router/","cacheComponents":false,"cacheLife":{"default":{"stale":300,"revalidate":900,"expire":4294967294},"seconds":{"stale":30,"revalidate":1,"expire":60},"minutes":{"stale":300,"revalidate":60,"expire":3600},"hours":{"stale":300,"revalidate":3600,"expire":86400},"days":{"stale":300,"revalidate":86400,"expire":604800},"weeks":{"stale":300,"revalidate":604800,"expire":2592000},"max":{"stale":300,"revalidate":2592000,"expire":31536000}},"cacheHandlers":{},"experimental":{"appNewScrollHandler":false,"useSkewCookie":false,"cssChunking":true,"multiZoneDraftMode":false,"appNavFailHandling":false,"prerenderEarlyExit":true,"serverMinification":true,"linkNoTouchStart":false,"caseSensitiveRoutes":false,"cachedNavigations":false,"partialFallbacks":false,"dynamicOnHover":false,"varyParams":false,"prefetchInlining":false,"preloadEntriesOnStart":true,"clientRouterFilter":true,"clientRouterFilterRedirects":false,"fetchCacheKeyPrefix":"","proxyPrefetch":"flexible","optimisticClientCache":true,"manualClientBasePath":false,"cpus":9,"memoryBasedWorkersCount":false,"imgOptConcurrency":null,"imgOptTimeoutInSeconds":7,"imgOptMaxInputPixels":268402689,"imgOptSequentialRead":null,"imgOptSkipMetadata":null,"isrFlushToDisk":true,"workerThreads":false,"optimizeCss":false,"nextScriptWorkers":false,"scrollRestoration":false,"externalDir":false,"disableOptimizedLoading":false,"gzipSize":true,"craCompat":false,"esmExternals":true,"fullySpecified":false,"swcTraceProfiling":false,"forceSwcTransforms":false,"largePageDataBytes":128000,"typedEnv":false,"parallelServerCompiles":false,"parallelServerBuildTraces":false,"ppr":false,"authInterrupts":false,"webpackMemoryOptimizations":false,"optimizeServerReact":true,"strictRouteTypes":false,"viewTransition":false,"removeUncaughtErrorAndRejectionListeners":false,"validateRSCRequestHeaders":false,"staleTimes":{"dynamic":0,"static":300},"reactDebugChannel":true,"serverComponentsHmrCache":true,"staticGenerationMaxConcurrency":8,"staticGenerationMinPagesPerWorker":25,"transitionIndicator":false,"gestureTransition":false,"inlineCss":false,"useCache":false,"globalNotFound":false,"browserDebugInfoInTerminal":"warn","lockDistDir":true,"proxyClientMaxBodySize":10485760,"hideLogsAfterAbort":false,"mcpServer":true,"turbopackFileSystemCacheForDev":true,"turbopackFileSystemCacheForBuild":false,"turbopackInferModuleSideEffects":true,"turbopackPluginRuntimeStrategy":"childProcesses","optimizePackageImports":["lucide-react","date-fns","lodash-es","ramda","antd","react-bootstrap","ahooks","@ant-design/icons","@headlessui/react","@headlessui-float/react","@heroicons/react/20/solid","@heroicons/react/24/solid","@heroicons/react/24/outline","@visx/visx","@tremor/react","rxjs","@mui/material","@mui/icons-material","recharts","react-use","effect","@effect/schema","@effect/platform","@effect/platform-node","@effect/platform-browser","@effect/platform-bun","@effect/sql","@effect/sql-mssql","@effect/sql-mysql2","@effect/sql-pg","@effect/sql-sqlite-node","@effect/sql-sqlite-bun","@effect/sql-sqlite-wasm","@effect/sql-sqlite-react-native","@effect/rpc","@effect/rpc-http","@effect/typeclass","@effect/experimental","@effect/opentelemetry","@material-ui/core","@material-ui/icons","@tabler/icons-react","mui-core","react-icons/ai","react-icons/bi","react-icons/bs","react-icons/cg","react-icons/ci","react-icons/di","react-icons/fa","react-icons/fa6","react-icons/fc","react-icons/fi","react-icons/gi","react-icons/go","react-icons/gr","react-icons/hi","react-icons/hi2","react-icons/im","react-icons/io","react-icons/io5","react-icons/lia","react-icons/lib","react-icons/lu","react-icons/md","react-icons/pi","react-icons/ri","react-icons/rx","react-icons/si","react-icons/sl","react-icons/tb","react-icons/tfi","react-icons/ti","react-icons/vsc","react-icons/wi"],"trustHostHeader":false,"isExperimentalCompile":false},"htmlLimitedBots":"[\\w-]+-Google|Google-[\\w-]+|Chrome-Lighthouse|Slurp|DuckDuckBot|baiduspider|yandex|sogou|bitlybot|tumblr|vkShare|quora link preview|redditbot|ia_archiver|Bingbot|BingPreview|applebot|facebookexternalhit|facebookcatalog|Twitterbot|LinkedInBot|Slackbot|Discordbot|WhatsApp|SkypeUriPreview|Yeti|googleweblight","bundlePagesRouterDependencies":false,"configFileName":"next.config.mjs","serverExternalPackages":["better-sqlite3"],"turbopack":{"root":"/Users/bytedance/Documents/9router/"},"distDirRoot":".next","_originalRewrites":{"beforeFiles":[],"afterFiles":[{"source":"/v1/v1/:path*","destination":"/api/v1/:path*"},{"source":"/v1/v1","destination":"/api/v1"},{"source":"/codex/:path*","destination":"/api/v1/responses"},{"source":"/v1/:path*","destination":"/api/v1/:path*"},{"source":"/v1","destination":"/api/v1"}],"fallback":[]}}
+const nextConfig = {"env":{},"typescript":{"ignoreBuildErrors":false},"typedRoutes":false,"distDir":"./.next","cleanDistDir":true,"assetPrefix":"","cacheMaxMemorySize":52428800,"configOrigin":"next.config.mjs","useFileSystemPublicRoutes":true,"generateEtags":true,"pageExtensions":["tsx","ts","jsx","js"],"poweredByHeader":true,"compress":true,"images":{"deviceSizes":[640,750,828,1080,1200,1920,2048,3840],"imageSizes":[32,48,64,96,128,256,384],"path":"/_next/image","loader":"default","loaderFile":"","domains":[],"disableStaticImages":false,"minimumCacheTTL":14400,"formats":["image/webp"],"maximumRedirects":3,"maximumResponseBody":50000000,"dangerouslyAllowLocalIP":false,"dangerouslyAllowSVG":false,"contentSecurityPolicy":"script-src 'none'; frame-src 'none'; sandbox;","contentDispositionType":"attachment","localPatterns":[{"pathname":"**","search":""}],"remotePatterns":[],"qualities":[75],"unoptimized":true,"customCacheHandler":false},"devIndicators":{"position":"bottom-left"},"onDemandEntries":{"maxInactiveAge":60000,"pagesBufferLength":5},"basePath":"","sassOptions":{},"trailingSlash":false,"i18n":null,"productionBrowserSourceMaps":false,"excludeDefaultMomentLocales":true,"reactProductionProfiling":false,"reactStrictMode":null,"reactMaxHeadersLength":6000,"httpAgentOptions":{"keepAlive":true},"logging":{"serverFunctions":true,"browserToTerminal":"warn"},"compiler":{},"expireTime":31536000,"staticPageGenerationTimeout":60,"output":"standalone","modularizeImports":{"@mui/icons-material":{"transform":"@mui/icons-material/{{member}}"},"lodash":{"transform":"lodash/{{member}}"}},"outputFileTracingRoot":"/Users/bytedance/Documents/Projects/9router/","cacheComponents":false,"cacheLife":{"default":{"stale":300,"revalidate":900,"expire":4294967294},"seconds":{"stale":30,"revalidate":1,"expire":60},"minutes":{"stale":300,"revalidate":60,"expire":3600},"hours":{"stale":300,"revalidate":3600,"expire":86400},"days":{"stale":300,"revalidate":86400,"expire":604800},"weeks":{"stale":300,"revalidate":604800,"expire":2592000},"max":{"stale":300,"revalidate":2592000,"expire":31536000}},"cacheHandlers":{},"experimental":{"appNewScrollHandler":false,"useSkewCookie":false,"cssChunking":true,"multiZoneDraftMode":false,"appNavFailHandling":false,"prerenderEarlyExit":true,"serverMinification":true,"linkNoTouchStart":false,"caseSensitiveRoutes":false,"cachedNavigations":false,"partialFallbacks":false,"dynamicOnHover":false,"varyParams":false,"prefetchInlining":false,"preloadEntriesOnStart":true,"clientRouterFilter":true,"clientRouterFilterRedirects":false,"fetchCacheKeyPrefix":"","proxyPrefetch":"flexible","optimisticClientCache":true,"manualClientBasePath":false,"cpus":17,"memoryBasedWorkersCount":false,"imgOptConcurrency":null,"imgOptTimeoutInSeconds":7,"imgOptMaxInputPixels":268402689,"imgOptSequentialRead":null,"imgOptSkipMetadata":null,"isrFlushToDisk":true,"workerThreads":false,"optimizeCss":false,"nextScriptWorkers":false,"scrollRestoration":false,"externalDir":false,"disableOptimizedLoading":false,"gzipSize":true,"craCompat":false,"esmExternals":true,"fullySpecified":false,"swcTraceProfiling":false,"forceSwcTransforms":false,"largePageDataBytes":128000,"typedEnv":false,"parallelServerCompiles":false,"parallelServerBuildTraces":false,"ppr":false,"authInterrupts":false,"webpackMemoryOptimizations":false,"optimizeServerReact":true,"strictRouteTypes":false,"viewTransition":false,"removeUncaughtErrorAndRejectionListeners":false,"validateRSCRequestHeaders":false,"staleTimes":{"dynamic":0,"static":300},"reactDebugChannel":true,"serverComponentsHmrCache":true,"staticGenerationMaxConcurrency":8,"staticGenerationMinPagesPerWorker":25,"transitionIndicator":false,"gestureTransition":false,"inlineCss":false,"useCache":false,"globalNotFound":false,"browserDebugInfoInTerminal":"warn","lockDistDir":true,"proxyClientMaxBodySize":10485760,"hideLogsAfterAbort":false,"mcpServer":true,"turbopackFileSystemCacheForDev":true,"turbopackFileSystemCacheForBuild":false,"turbopackInferModuleSideEffects":true,"turbopackPluginRuntimeStrategy":"childProcesses","optimizePackageImports":["lucide-react","date-fns","lodash-es","ramda","antd","react-bootstrap","ahooks","@ant-design/icons","@headlessui/react","@headlessui-float/react","@heroicons/react/20/solid","@heroicons/react/24/solid","@heroicons/react/24/outline","@visx/visx","@tremor/react","rxjs","@mui/material","@mui/icons-material","recharts","react-use","effect","@effect/schema","@effect/platform","@effect/platform-node","@effect/platform-browser","@effect/platform-bun","@effect/sql","@effect/sql-mssql","@effect/sql-mysql2","@effect/sql-pg","@effect/sql-sqlite-node","@effect/sql-sqlite-bun","@effect/sql-sqlite-wasm","@effect/sql-sqlite-react-native","@effect/rpc","@effect/rpc-http","@effect/typeclass","@effect/experimental","@effect/opentelemetry","@material-ui/core","@material-ui/icons","@tabler/icons-react","mui-core","react-icons/ai","react-icons/bi","react-icons/bs","react-icons/cg","react-icons/ci","react-icons/di","react-icons/fa","react-icons/fa6","react-icons/fc","react-icons/fi","react-icons/gi","react-icons/go","react-icons/gr","react-icons/hi","react-icons/hi2","react-icons/im","react-icons/io","react-icons/io5","react-icons/lia","react-icons/lib","react-icons/lu","react-icons/md","react-icons/pi","react-icons/ri","react-icons/rx","react-icons/si","react-icons/sl","react-icons/tb","react-icons/tfi","react-icons/ti","react-icons/vsc","react-icons/wi"],"trustHostHeader":false,"isExperimentalCompile":false},"htmlLimitedBots":"[\\w-]+-Google|Google-[\\w-]+|Chrome-Lighthouse|Slurp|DuckDuckBot|baiduspider|yandex|sogou|bitlybot|tumblr|vkShare|quora link preview|redditbot|ia_archiver|Bingbot|BingPreview|applebot|facebookexternalhit|facebookcatalog|Twitterbot|LinkedInBot|Slackbot|Discordbot|WhatsApp|SkypeUriPreview|Yeti|googleweblight","bundlePagesRouterDependencies":false,"configFileName":"next.config.mjs","serverExternalPackages":["better-sqlite3"],"turbopack":{"root":"/Users/bytedance/Documents/Projects/9router/"},"distDirRoot":".next","_originalRewrites":{"beforeFiles":[],"afterFiles":[{"source":"/v1/v1/:path*","destination":"/api/v1/:path*"},{"source":"/v1/v1","destination":"/api/v1"},{"source":"/codex/:path*","destination":"/api/v1/responses"},{"source":"/v1/:path*","destination":"/api/v1/:path*"},{"source":"/v1","destination":"/api/v1"}],"fallback":[]}}
 
 process.env.__NEXT_PRIVATE_STANDALONE_CONFIG = JSON.stringify(nextConfig)
 

package/app/src/lib/updater/updater.js

@@ -19,7 +19,7 @@ const lingerMs = parseInt(process.env.UPDATER_LINGER_MS || "30000", 10);
 const waitMinMs = parseInt(process.env.UPDATER_WAIT_MIN_MS || "3000", 10);
 const waitMaxMs = parseInt(process.env.UPDATER_WAIT_MAX_MS || "15000", 10);
 const waitCheckMs = parseInt(process.env.UPDATER_WAIT_CHECK_MS || "500", 10);
-const appPort = parseInt(process.env.UPDATER_APP_PORT || "20128", 10);
+const appPort = parseInt(process.env.UPDATER_APP_PORT || "20502", 10);
 
 // Data directory (match mitm/paths.js logic)
 function getDataDir() {

package/app/src/mitm/dns/dnsConfig.js

@@ -2,7 +2,9 @@ const { exec, spawn, execSync } = require("child_process");
 const fs = require("fs");
 const path = require("path");
 const os = require("os");
+const dns = require("dns");
 const { log, err } = require("../logger");
+const { MITM_DIR } = require("../paths");
 const { TOOL_HOSTS } = require("../../shared/constants/mitmToolHosts.js");
 const { runElevatedPowerShell, isAdmin } = require("../winElevated.js");
 
@@ -37,16 +39,19 @@ const HOSTS_FILE = IS_WIN
   ? path.join(process.env.SystemRoot || "C:\\Windows", "System32", "drivers", "etc", "hosts")
   : "/etc/hosts";
 const MAC_PF_ANTIGRAVITY_ANCHOR = "com.apple/openrouterx-mitm-antigravity";
-const MAC_ANTIGRAVITY_FALLBACK_IPS = [
-  "216.239.32.223",
-  "216.239.34.223",
-  "216.239.36.223",
-  "216.239.38.223",
-];
+const MAC_ANTIGRAVITY_REDIRECT_STATE_FILE = path.join(MITM_DIR, "antigravity-redirect-ips.json");
+const MAC_ANTIGRAVITY_DNS_SERVERS = ["8.8.8.8", "1.1.1.1"];
+const MAC_ANTIGRAVITY_DNS_TIMEOUT_MS = 1500;
 const MAC_ANTIGRAVITY_LEGACY_SHARED_IP_PREFIXES = [
+  "64.233.",
+  "66.102.",
+  "74.125.",
   "142.250.",
   "142.251.",
   "172.217.",
+  "172.253.",
+  "216.58.",
+  "216.239.",
 ];
 const REQUIRED_HOST_LOOPBACKS = IS_WIN ? ["127.0.0.1"] : ["127.0.0.1", "::1"];
 
@@ -165,8 +170,55 @@ function getDefaultMacInterface() {
   }
 }
 
-async function getMacAntigravityRedirectIPs() {
-  return [...MAC_ANTIGRAVITY_FALLBACK_IPS];
+async function resolveIPv4WithServer(host, server) {
+  const resolver = new dns.promises.Resolver();
+  resolver.setServers([server]);
+  try {
+    return await withTimeout(resolver.resolve4(host), MAC_ANTIGRAVITY_DNS_TIMEOUT_MS);
+  } catch {
+    return [];
+  }
+}
+
+function withTimeout(promise, timeoutMs) {
+  let timeout;
+  return Promise.race([
+    promise,
+    new Promise((_, reject) => {
+      timeout = setTimeout(() => reject(new Error("DNS query timed out")), timeoutMs);
+    }),
+  ]).finally(() => clearTimeout(timeout));
+}
+
+async function getMacAntigravityRedirectIPs(hosts = TOOL_HOSTS.antigravity, servers = MAC_ANTIGRAVITY_DNS_SERVERS) {
+  if (!IS_MAC) return [];
+  const resolved = await Promise.all(
+    hosts.flatMap((host) => servers.map((server) => resolveIPv4WithServer(host, server)))
+  );
+  return [...new Set(resolved.flat())].filter((ip) => /^\d+\.\d+\.\d+\.\d+$/.test(ip));
+}
+
+function saveMacAntigravityRedirectIPs(ips) {
+  if (!IS_MAC) return;
+  try {
+    fs.mkdirSync(MITM_DIR, { recursive: true });
+    fs.writeFileSync(MAC_ANTIGRAVITY_REDIRECT_STATE_FILE, JSON.stringify({
+      ips: [...new Set(ips || [])],
+      updatedAt: new Date().toISOString(),
+    }, null, 2), "utf8");
+  } catch (e) {
+    err(`PF antigravity: failed to save redirect IP state — ${e.message}`);
+  }
+}
+
+function readMacAntigravityRedirectIPs() {
+  if (!IS_MAC) return [];
+  try {
+    const parsed = JSON.parse(fs.readFileSync(MAC_ANTIGRAVITY_REDIRECT_STATE_FILE, "utf8"));
+    return Array.isArray(parsed.ips) ? parsed.ips.filter((ip) => /^\d+\.\d+\.\d+\.\d+$/.test(ip)) : [];
+  } catch {
+    return [];
+  }
 }
 
 function getMacLoopbackIPv4Aliases() {
@@ -188,9 +240,12 @@ function getMacLegacyAntigravityAliases() {
 async function enableMacAntigravityRedirect(sudoPassword) {
   if (!IS_MAC) return;
   const ips = await getMacAntigravityRedirectIPs();
-  if (ips.length === 0) return;
+  if (ips.length === 0) {
+    throw new Error("Could not resolve antigravity upstream IPs for PF redirect");
+  }
 
   await enableMacAntigravityLoopbackAliases(sudoPassword, ips);
+  saveMacAntigravityRedirectIPs(ips);
 
   const iface = getDefaultMacInterface();
   const rules = [
@@ -210,11 +265,13 @@ async function enableMacAntigravityRedirect(sudoPassword) {
 async function disableMacAntigravityRedirect(sudoPassword) {
   if (!IS_MAC) return;
   const ips = [...new Set([
+    ...readMacAntigravityRedirectIPs(),
     ...await getMacAntigravityRedirectIPs(),
     ...getMacLegacyAntigravityAliases(),
   ])];
   await execWithPassword(`pfctl -a ${shellQuoteSingle(MAC_PF_ANTIGRAVITY_ANCHOR)} -F all >/dev/null 2>&1 || true`, sudoPassword);
   await disableMacAntigravityLoopbackAliases(sudoPassword, ips);
+  try { fs.unlinkSync(MAC_ANTIGRAVITY_REDIRECT_STATE_FILE); } catch { /* none */ }
   log("🌐 PF antigravity: ✅ redirect removed");
 }
 
@@ -369,9 +426,13 @@ function removeAllDNSEntriesSync() {
   try {
     if (IS_MAC) {
       try { execSync(`pfctl -a ${MAC_PF_ANTIGRAVITY_ANCHOR} -F all >/dev/null 2>&1 || true`, { stdio: "ignore" }); } catch { /* ignore */ }
-      for (const ip of MAC_ANTIGRAVITY_FALLBACK_IPS) {
+      for (const ip of [...new Set([
+        ...readMacAntigravityRedirectIPs(),
+        ...getMacLegacyAntigravityAliases(),
+      ])]) {
         try { execSync(`ifconfig lo0 -alias ${ip} 2>/dev/null || true`, { stdio: "ignore" }); } catch { /* ignore */ }
       }
+      try { fs.unlinkSync(MAC_ANTIGRAVITY_REDIRECT_STATE_FILE); } catch { /* ignore */ }
     }
     if (!fs.existsSync(HOSTS_FILE)) return;
     const allHosts = Object.values(TOOL_HOSTS).flat();
@@ -405,4 +466,6 @@ module.exports = {
   checkAllDNSStatus,
   getMissingHostsEntries,
   hostHasRequiredLoopbacks,
+  getMacAntigravityRedirectIPs,
+  readMacAntigravityRedirectIPs,
 };

package/app/src/mitm/handlers/base.js

@@ -1,6 +1,6 @@
 const { log, err } = require("../logger");
 
-const DEFAULT_LOCAL_ROUTER = "http://localhost:20128";
+const DEFAULT_LOCAL_ROUTER = "http://127.0.0.1:20502";
 const ROUTER_BASE = String(process.env.MITM_ROUTER_BASE || DEFAULT_LOCAL_ROUTER)
   .trim()
   .replace(/\/+$/, "") || DEFAULT_LOCAL_ROUTER;
@@ -22,15 +22,24 @@ async function fetchRouter(openaiBody, path = "/v1/chat/completions", clientHead
     if (!STRIP_HEADERS.has(k.toLowerCase())) forwarded[k] = v;
   }
 
-  const response = await fetch(`${ROUTER_BASE}${path}`, {
-    method: "POST",
-    headers: {
-      ...forwarded,
-      "Content-Type": "application/json",
-      ...(API_KEY && { "Authorization": `Bearer ${API_KEY}` })
-    },
-    body: JSON.stringify(openaiBody)
-  });
+  let response;
+  try {
+    response = await fetch(`${ROUTER_BASE}${path}`, {
+      method: "POST",
+      headers: {
+        ...forwarded,
+        "Content-Type": "application/json",
+        ...(API_KEY && { "Authorization": `Bearer ${API_KEY}` })
+      },
+      body: JSON.stringify(openaiBody)
+    });
+  } catch (error) {
+    const cause = error.cause;
+    const causeDetail = cause
+      ? ` (cause: ${cause.code || cause.name || "unknown"}: ${cause.message || cause})`
+      : "";
+    throw new Error(`Router fetch failed for ${ROUTER_BASE}${path}: ${error.message}${causeDetail}`);
+  }
 
   // Forward response as-is (status + body). pipeSSE will propagate status.
   return response;

package/app/src/mitm/manager.js

@@ -16,7 +16,11 @@ const { isCertExpired } = require("./cert/rootCA");
 const { DATA_DIR, MITM_DIR } = require("./paths");
 const { log, err } = require("./logger");
 
-const DEFAULT_MITM_ROUTER_BASE = "http://localhost:20128";
+const DEFAULT_MITM_ROUTER_BASE = "http://127.0.0.1:20502";
+const LEGACY_DEFAULT_MITM_ROUTER_BASES = new Set([
+  "http://localhost:20128",
+  "http://127.0.0.1:20128",
+]);
 
 function shellQuoteSingle(str) {
   if (str == null || str === "") return "''";
@@ -29,6 +33,9 @@ async function resolveMitmRouterBaseUrl() {
     const s = await _getSettings();
     const raw = s && s.mitmRouterBaseUrl != null ? String(s.mitmRouterBaseUrl).trim() : "";
     if (!raw) return DEFAULT_MITM_ROUTER_BASE;
+    if (LEGACY_DEFAULT_MITM_ROUTER_BASES.has(raw.replace(/\/+$/, ""))) {
+      return DEFAULT_MITM_ROUTER_BASE;
+    }
     const u = new URL(raw);
     if (u.protocol !== "http:" && u.protocol !== "https:") return DEFAULT_MITM_ROUTER_BASE;
     return raw.replace(/\/+$/, "");
@@ -398,7 +405,7 @@ async function scheduleMitmRestart(apiKey) {
       mitmIsRestarting = false;
       return;
     }
-    await startServer(apiKey, password);
+    await startServer(apiKey, password, false, { restart: true });
     log("🔄 Restarted successfully");
     mitmRestartCount = 0;
     mitmIsRestarting = false;
@@ -432,7 +439,23 @@ async function killPort443Owner(owner, sudoPassword) {
   await new Promise(r => setTimeout(r, 800));
 }
 
-async function startServer(apiKey, sudoPassword, forceKillPort443 = false) {
+async function adoptHealthyExistingServer(sudoPassword) {
+  const health = await pollMitmHealth(1000, MITM_PORT);
+  if (!health) return null;
+
+  const pid = health.pid || serverPid || (() => {
+    try { return parseInt(fs.readFileSync(PID_FILE, "utf-8").trim(), 10); } catch { return null; }
+  })();
+  if (pid) {
+    serverPid = pid;
+    try { fs.writeFileSync(PID_FILE, String(pid)); } catch { /* ignore */ }
+  }
+  await saveMitmSettings(true, sudoPassword);
+  return { running: true, pid: serverPid || pid };
+}
+
+async function startServer(apiKey, sudoPassword, forceKillPort443 = false, options = {}) {
+  const isRestart = options.restart === true;
   if (!serverProcess || serverProcess.killed) {
     try {
       if (fs.existsSync(PID_FILE)) {
@@ -451,7 +474,13 @@ async function startServer(apiKey, sudoPassword, forceKillPort443 = false) {
   }
 
   if (serverProcess && !serverProcess.killed) {
-    throw new Error("MITM server is already running");
+    const healthy = await adoptHealthyExistingServer(sudoPassword);
+    if (healthy) return healthy;
+    if (isRestart) {
+      await killLeftoverMitm(sudoPassword);
+    } else {
+      throw new Error("MITM server is already running");
+    }
   }
 
   await killLeftoverMitm(sudoPassword);
@@ -644,12 +673,18 @@ async function startServer(apiKey, sudoPassword, forceKillPort443 = false) {
   const health = await pollMitmHealth(8000, MITM_PORT);
   if (!health) {
     if (serverProcess && !serverProcess.killed) { try { serverProcess.kill(); } catch { /* ignore */ } serverProcess = null; }
+    serverPid = null;
     const processUsing443 = getProcessUsingPort443();
     const portInfo = processUsing443 ? ` Port 443 already in use by ${processUsing443}.` : "";
     const reason = startError || `Check sudo password or port 443 access.${portInfo}`;
     throw new Error(`MITM server failed to start. ${reason}`);
   }
 
+  if (health.pid && health.pid !== serverPid) {
+    serverPid = health.pid;
+    try { fs.writeFileSync(PID_FILE, String(serverPid)); } catch { /* ignore */ }
+  }
+
   if (_updateSettings) await _updateSettings({ mitmCertInstalled: true }).catch(() => { });
 
   log(`✅ Server healthy (PID: ${serverPid || health.pid})`);