tt-help-cli-ycl 1.4.79 → 1.4.82

package/src/clash/daemon.js

@@ -1,10 +1,10 @@
 /**
  * ClashDaemon — 代理节点健康守护
  *
- * 定时巡检当前节点 TikTok 可达性，异常时自动故障切换。
- * 定期执行全量基准测速刷新健康节点列表。
- * 通过 IPC 文件向 watchdog 上报状态。
+ * 职责: 定时巡检 → 异常切换 → 基准测速 → IPC 上报
+ * 看门狗通过 /tmp/clash-cmd.json 下发命令，每 10s 轮询
  */
+
 import { spawn } from "child_process";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
@@ -15,52 +15,61 @@ import * as ipc from "./ipc.js";
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
-function findBenchmarkScript() {
-  const candidates = [
-    join(
-      __dirname,
-      "..",
-      "..",
-      "..",
-      "clash-verge-explore",
-      "speedtest-tiktok.mjs",
-    ),
-    join(__dirname, "speedtest-tiktok.mjs"),
-  ];
-  for (const p of candidates) if (existsSync(p)) return p;
-  return null;
-}
+// ══════════════════════════════════════════════
+// ClashDaemon
+// ══════════════════════════════════════════════
 
 export class ClashDaemon {
   constructor(opts = {}) {
     this.intervalMs = (opts.intervalSec || 30) * 1000;
     this.benchmarkMs = (opts.benchmarkMin || 40) * 60 * 1000;
     this.dryRun = !!opts.dryRun;
-    this.benchmarkScript = findBenchmarkScript();
+    this.benchmarkScript = _findBenchmark();
     this._running = false;
     this._timers = [];
     this._benchmarkRunning = false;
+    if (opts.country) checker.CONFIG.nodeCountryFilter = opts.country;
+    this._meta = {
+      groupName: checker.CONFIG.groupName,
+      proxyUrl: checker.CONFIG.proxyUrl,
+      testUrl: checker.CONFIG.testUrl,
+      countryFilter: checker.CONFIG.nodeCountryFilter,
+      healthyNodesCount: 0,
+      healthyNodesTotal: 0,
+      lastBenchmark: null,
+    };
+    this._cmdHandlers = _buildCmdHandlers(this);
   }
 
+  // ── 生命周期 ──
+
   async start() {
     if (this._running) return;
     this._running = true;
     this._logBanner();
     this._setupSignals();
 
+    const { alive, reason } = checker.checkClashAliveWithReason();
+    if (!alive) {
+      this._log(
+        `⚠ 代理不可用：${reason}\n请先启动 Clash Verge 并确保 API 端口 9097 已开启`,
+      );
+      this._running = false;
+      return;
+    }
+    const proxyUrl = await checker.resolveAndSetProxyUrl();
+    this._log(
+      `✓ Clash 已连接 (${reason}), 代理端口: ${proxyUrl.replace("http://", "")}`,
+    );
+
     const list = checker.loadHealthyList();
     const ageMin = list.updated
       ? Math.round((Date.now() - new Date(list.updated).getTime()) / 60000)
       : Infinity;
     const isStale = !list.nodes.length || ageMin >= this.benchmarkMs / 60000;
-
-    if (list.nodes.length) {
-      this._log(
-        `已加载 ${list.nodes.length} 个健康节点${isStale ? ` (已过期 ${ageMin}min，立即刷新)` : ""}`,
-      );
-    } else {
-      this._log("健康列表为空，将立即执行基准测速");
-    }
+    this._log(
+      `${list.nodes.length ? `已加载 ${list.nodes.length} 个健康节点${isStale ? ` (已过期 ${ageMin}min，立即刷新)` : ""}` : "健康列表为空，将立即执行基准测速"}`,
+    );
 
     await this._healthCheck();
     this._timers.push(setInterval(() => this._healthCheck(), this.intervalMs));
@@ -74,6 +83,8 @@ export class ClashDaemon {
     }, initial);
 
     this._log("守护进程已启动");
+    this._pollCommands();
+    this._timers.push(setInterval(() => this._pollCommands(), 10000));
   }
 
   async stop() {
@@ -83,14 +94,18 @@ export class ClashDaemon {
     this._log("守护进程已停止");
   }
 
-  // ---- 巡检 ----
+  // ── 巡检 ──
 
   async _healthCheck() {
     if (!this._running || this._benchmarkRunning) return;
     try {
       if (!checker.checkClashAlive()) {
-        ipc.writeHealth({ node: "?", healthy: false, error: "Clash 未运行" });
-        return;
+        return ipc.writeHealth({
+          node: "?",
+          healthy: false,
+          error: "Clash 未运行",
+          meta: this._buildMeta(),
+        });
       }
       const node = await api
         .getCurrentNode(checker.CONFIG.groupName)
@@ -103,6 +118,7 @@ export class ClashDaemon {
         timeTotal: h.timeTotal,
         sizeDownload: h.sizeDownload,
         title: h.title,
+        meta: this._buildMeta(),
       });
 
       if (h.healthy) {
@@ -126,8 +142,12 @@ export class ClashDaemon {
         return;
       }
 
-      await api.switchProxy(checker.CONFIG.groupName, target);
-      await new Promise((r) => setTimeout(r, 600));
+      const switched = await checker.switchToNode(target);
+      if (!switched) {
+        this._log(`✗ ${reason} → 切换到 ${target} 失败`);
+        return;
+      }
+
       const h2 = checker.checkNodeHealth();
       this._log(
         `⚠ ${node} → ${target} (${h2.timeTotal.toFixed(1)}s ${(h2.sizeDownload / 1024).toFixed(0)}KB)`,
@@ -140,14 +160,20 @@ export class ClashDaemon {
         sizeDownload: h2.sizeDownload,
         title: h2.title,
         lastSwitch: `${node} → ${target}`,
+        meta: this._buildMeta(),
       });
     } catch (e) {
       this._log(`巡检异常: ${e.message}`);
-      ipc.writeHealth({ node: "?", healthy: false, error: e.message });
+      ipc.writeHealth({
+        node: "?",
+        healthy: false,
+        error: e.message,
+        meta: this._buildMeta(),
+      });
     }
   }
 
-  // ---- 基准 ----
+  // ── 基准测速 ──
 
   _runBenchmark() {
     if (!this.benchmarkScript || this._benchmarkRunning) return;
@@ -157,11 +183,9 @@ export class ClashDaemon {
     const child = spawn(
       process.execPath,
       [this.benchmarkScript, "--timeout", "12"],
-      {
-        cwd: dirname(this.benchmarkScript),
-        stdio: ["ignore", "pipe", "pipe"],
-      },
+      { cwd: dirname(this.benchmarkScript), stdio: ["ignore", "pipe", "pipe"] },
     );
+
     let stderr = "";
     child.stderr.on("data", (d) => {
       stderr += d.toString();
@@ -169,29 +193,39 @@ export class ClashDaemon {
     child.on("close", (code) => {
       this._benchmarkRunning = false;
       const elapsed = ((Date.now() - start) / 1000).toFixed(0);
-      if (code === 0) {
-        try {
-          const rp = join(
-            dirname(this.benchmarkScript),
-            "speedtest-result.json",
-          );
-          if (existsSync(rp)) {
-            const nodes =
-              JSON.parse(readFileSync(rp, "utf-8")).realNodes?.map(
-                (r) => r.node,
-              ) || [];
-            if (nodes.length) {
-              checker.saveHealthyList(nodes);
-              this._log(
-                `=== 基准测速完成 (${elapsed}s): ${nodes.length} 个健康节点 ===`,
-              );
-            } else this._log(`=== 基准测速完成: 0 个健康节点 ===`);
-          }
-        } catch (e) {
-          this._log(`解析结果失败: ${e.message}`);
-        }
-      } else {
+      if (code !== 0) {
         this._log(`=== 基准测速失败 (exit ${code}, ${elapsed}s) ===`);
+        return;
+      }
+      try {
+        const rp = join(dirname(this.benchmarkScript), "speedtest-result.json");
+        if (!existsSync(rp)) {
+          this._log("=== 基准测速完成但未找到结果文件 ===");
+          return;
+        }
+        const allNodes = (
+          JSON.parse(readFileSync(rp, "utf-8")).realNodes || []
+        ).map((r) => r.node);
+        if (!allNodes.length) {
+          this._log("=== 基准测速完成: 0 个健康节点 ===");
+          return;
+        }
+        checker.saveHealthyList(allNodes);
+        const { filtered, excluded } = checker.filterNodesByCountry(
+          allNodes,
+          checker.CONFIG.nodeCountryFilter,
+        );
+        this._meta.lastBenchmark = new Date().toISOString();
+        this._meta.healthyNodesTotal = allNodes.length;
+        this._meta.healthyNodesCount = filtered.length;
+        const tag = checker.CONFIG.nodeCountryFilter
+          ? ` (${checker.CONFIG.nodeCountryFilter}节点 ${filtered.length}个, 排除 ${excluded}个)`
+          : "";
+        this._log(
+          `=== 基准测速完成 (${elapsed}s): ${allNodes.length} 个健康节点${tag} ===`,
+        );
+      } catch (e) {
+        this._log(`解析结果失败: ${e.message}`);
       }
     });
     child.on("error", (err) => {
@@ -200,7 +234,71 @@ export class ClashDaemon {
     });
   }
 
-  // ---- helpers ----
+  // ── 命令轮询 ──
+
+  _pollCommands() {
+    if (!this._running) return;
+    try {
+      const cmd = ipc.readCommand();
+      if (!cmd) return;
+      const handler = this._cmdHandlers[cmd.action];
+      if (handler) {
+        handler(cmd);
+      } else {
+        this._log(`📋 未知命令: ${JSON.stringify(cmd)}`);
+      }
+      ipc.clearCommand();
+    } catch {}
+  }
+
+  async _handleSwitchNode(cmd) {
+    try {
+      const before = await api
+        .getCurrentNode(checker.CONFIG.groupName)
+        .catch(() => "?");
+      this._log(`🔄 看门狗指令: 切换节点 → ${cmd.node} (当前: ${before})`);
+      if (!(await checker.switchToNode(cmd.node))) {
+        this._log("🔄 看门狗指令: 切换失败");
+        return ipc.writeHealth({
+          node: before,
+          healthy: null,
+          lastSwitch: `manual → ${cmd.node} (失败)`,
+          meta: this._buildMeta(),
+        });
+      }
+      const h = checker.checkNodeHealth();
+      this._log(
+        `🔄 看门狗指令: 切换完成 (${h.timeTotal.toFixed(1)}s ${(h.sizeDownload / 1024).toFixed(0)}KB, ${h.healthy ? "健康" : "异常"})`,
+      );
+      ipc.writeHealth({
+        node: cmd.node,
+        healthy: h.healthy,
+        httpCode: h.httpCode,
+        timeTotal: h.timeTotal,
+        sizeDownload: h.sizeDownload,
+        title: h.title,
+        lastSwitch: `manual: ${before} → ${cmd.node}`,
+        meta: this._buildMeta(),
+      });
+    } catch (e) {
+      this._log(`🔄 看门狗指令异常: ${e.message}`);
+    }
+  }
+
+  // ── helpers ──
+
+  _buildMeta() {
+    const list = checker.loadHealthyList();
+    Object.assign(this._meta, {
+      proxyUrl: checker.CONFIG.proxyUrl,
+      testUrl: checker.CONFIG.testUrl,
+      countryFilter: checker.CONFIG.nodeCountryFilter,
+      healthyNodesCount: list.nodes.length,
+      healthyNodesTotal: list.totalNodes,
+      healthyNodes: list.nodes.slice(0, 50),
+    });
+    return this._meta;
+  }
 
   _log(msg) {
     console.error(
@@ -209,10 +307,13 @@ export class ClashDaemon {
   }
 
   _logBanner() {
+    const filterTag = checker.CONFIG.nodeCountryFilter
+      ? ` | 节点: ${checker.CONFIG.nodeCountryFilter}`
+      : "";
     console.error("═".repeat(50));
     console.error("  Clash Verge 节点健康守护");
     console.error(
-      `  检测: ${checker.CONFIG.testUrl}  |  巡检: ${this.intervalMs / 1000}s  |  基准: ${this.benchmarkMs / 60000}min`,
+      `  检测: ${checker.CONFIG.testUrl}  |  巡检: ${this.intervalMs / 1000}s  |  基准: ${this.benchmarkMs / 60000}min${filterTag}`,
     );
     console.error(
       `  基准脚本: ${this.benchmarkScript || "(不可用)"}  |  模式: ${this.dryRun ? "DRY-RUN" : "正常"}`,
@@ -221,22 +322,83 @@ export class ClashDaemon {
   }
 
   _setupSignals() {
-    const s = (sig) => {
+    const shutdown = (sig) => {
       this._log(`收到 ${sig}，退出`);
       this.stop();
       process.exit(0);
     };
-    process.on("SIGINT", () => s("SIGINT"));
-    process.on("SIGTERM", () => s("SIGTERM"));
+    process.on("SIGINT", () => shutdown("SIGINT"));
+    process.on("SIGTERM", () => shutdown("SIGTERM"));
   }
 }
 
-// 直接运行时（watchdog spawn 或 node daemon.js），自动启动
+// ══════════════════════════════════════════════
+// 命令处理器表
+// ══════════════════════════════════════════════
+
+function _buildCmdHandlers(daemon) {
+  return {
+    setCountryFilter(cmd) {
+      const prev = checker.CONFIG.nodeCountryFilter;
+      checker.CONFIG.nodeCountryFilter = cmd.country || null;
+      daemon._meta.countryFilter = checker.CONFIG.nodeCountryFilter;
+      daemon._log(
+        `📋 节点过滤: ${prev || "无"} → ${checker.CONFIG.nodeCountryFilter || "无"}`,
+      );
+    },
+    setTestUrl(cmd) {
+      if (cmd.url) {
+        checker.CONFIG.testUrl = cmd.url;
+        daemon._meta.testUrl = cmd.url;
+        daemon._log(`📋 检测URL: → ${cmd.url}`);
+      }
+    },
+    runBenchmark() {
+      daemon._log("📋 收到手动触发基准测速命令");
+      daemon._runBenchmark();
+    },
+    setInterval(cmd) {
+      if (cmd.seconds > 0) {
+        daemon.intervalMs = cmd.seconds * 1000;
+        daemon._log(`📋 巡检间隔: → ${cmd.seconds}s`);
+      }
+    },
+    switchNode: (cmd) => daemon._handleSwitchNode(cmd),
+  };
+}
+
+// ══════════════════════════════════════════════
+// 工具
+// ══════════════════════════════════════════════
+
+function _findBenchmark() {
+  for (const p of [
+    // 1. 包内 benchmark（npm publish 后 src/clash/benchmark/speedtest-tiktok.mjs）
+    join(__dirname, "benchmark", "speedtest-tiktok.mjs"),
+    // 2. 开发模式：clash-verge-explore 同级目录
+    join(
+      __dirname,
+      "..",
+      "..",
+      "..",
+      "clash-verge-explore",
+      "speedtest-tiktok.mjs",
+    ),
+    join(__dirname, "speedtest-tiktok.mjs"),
+  ])
+    if (existsSync(p)) return p;
+  return null;
+}
+
+// 直接运行时自动启动
 if (process.argv[1] && fileURLToPath(import.meta.url) === process.argv[1]) {
   const args = process.argv.slice(2);
+  const getArg = (flag) =>
+    args.includes(flag) ? args[args.indexOf(flag) + 1] : undefined;
   new ClashDaemon({
-    intervalSec: parseInt(args[args.indexOf("--interval") + 1]) || undefined,
-    benchmarkMin: parseInt(args[args.indexOf("--benchmark") + 1]) || undefined,
+    intervalSec: parseInt(getArg("--interval")) || undefined,
+    benchmarkMin: parseInt(getArg("--benchmark")) || undefined,
+    country: getArg("--country") || undefined,
     dryRun: args.includes("--dry-run"),
   }).start();
 }

package/src/clash/ipc.js

@@ -3,8 +3,8 @@
  *
  * 与 watchdog 进程间通信，通过 tmpdir 下的 JSON 文件。
  *
- *   clash-health.json  — daemon → watchdog（代理健康状态）
- *   clash-cmd.json     — watchdog → daemon（远程命令，预留）
+ *   clash-health.json  — daemon → watchdog（代理健康状态 + 运行元数据）
+ *   clash-cmd.json     — watchdog → daemon（远程命令）
  */
 import { readFileSync, writeFileSync, existsSync } from "fs";
 import { join } from "path";
@@ -15,6 +15,19 @@ const CMD_FILE = join(tmpdir(), "clash-cmd.json");
 
 // ---- health（daemon → watchdog） ----
 
+/**
+ * 写入健康状态到 IPC 文件
+ * @param {object} state
+ * @param {string} state.node - 当前节点名
+ * @param {boolean} state.healthy - 是否健康
+ * @param {number} [state.httpCode] - HTTP 状态码
+ * @param {number} [state.timeTotal] - 响应时间（秒）
+ * @param {number} [state.sizeDownload] - 下载大小（字节）
+ * @param {string} [state.title] - 页面标题
+ * @param {string} [state.error] - 错误信息
+ * @param {string} [state.lastSwitch] - 最近一次切换记录
+ * @param {object} [state.meta] - 运行元数据（groupName, proxyUrl, testUrl, healthyNodesCount 等）
+ */
 export function writeHealth(state) {
   try {
     writeFileSync(
@@ -49,8 +62,12 @@ export function readHealth() {
   }
 }
 
-// ---- command（watchdog → daemon，预留） ----
+// ---- command（watchdog → daemon） ----
 
+/**
+ * 写入命令（watchdog 调用，daemon 轮询读取）
+ * @param {object} cmd - 命令对象，如 { action: "setCountryFilter", country: "US" }
+ */
 export function writeCommand(cmd) {
   try {
     writeFileSync(CMD_FILE, JSON.stringify(cmd, null, 2), "utf-8");
@@ -62,7 +79,9 @@ export function writeCommand(cmd) {
 export function readCommand() {
   try {
     if (!existsSync(CMD_FILE)) return null;
-    return JSON.parse(readFileSync(CMD_FILE, "utf-8"));
+    const text = readFileSync(CMD_FILE, "utf-8").trim();
+    if (!text || text === "{}") return null;
+    return JSON.parse(text);
   } catch {
     return null;
   }

package/src/cli/clash-daemon.js

@@ -1,7 +1,7 @@
 /**
  * clash-daemon CLI 命令入口
  *
- * 用法: tt-help clash-daemon [--interval 30] [--benchmark 40] [--dry-run]
+ * 用法: tt-help clash-daemon [--interval 30] [--benchmark 40] [--country US] [--dry-run]
  */
 import { ClashDaemon } from "../clash/daemon.js";
 
@@ -9,6 +9,7 @@ export async function handleClashDaemon(options) {
   const d = new ClashDaemon({
     intervalSec: parseInt(options.interval) || undefined,
     benchmarkMin: parseInt(options.benchmark) || undefined,
+    country: options.country || undefined,
     dryRun:
       options["dry-run"] === "" ||
       options["dry-run"] === true ||

package/src/cli/explore.js

@@ -27,6 +27,7 @@ import { showResourceUsage } from "../utils/index.js";
 import { HealthChecker } from "../lib/browser/health-checker.js";
 import { createApiClient } from "../lib/api-client.js";
 import { createCDNHandler } from "../lib/cdn-handler.js";
+import { requireClashOrExit } from "../clash/checker.js";
 import path from "path";
 import os from "os";
 
@@ -140,10 +141,20 @@ export async function handleExplore(options) {
 
     const effectiveProxy = exploreProxy || configuredProxy;
     if (effectiveProxy) {
-      cdpOptions.proxyServer = effectiveProxy;
-      console.error(
-        `代理: ${effectiveProxy}${exploreProxy ? " (命令行指定)" : " (配置文件)"}`,
-      );
+      // 如果配置了本地代理，自动发现端口并确保 Clash 可用
+      if (
+        effectiveProxy.includes("127.0.0.1") ||
+        effectiveProxy.includes("localhost")
+      ) {
+        const detected = await requireClashOrExit("Explore");
+        cdpOptions.proxyServer = detected;
+        console.error(`代理: ${detected} (自动发现)`);
+      } else {
+        cdpOptions.proxyServer = effectiveProxy;
+        console.error(
+          `代理: ${effectiveProxy}${exploreProxy ? " (命令行指定)" : " (配置文件)"}`,
+        );
+      }
     } else {
       console.error(`代理: 未配置`);
     }

package/src/cli/refresh.js

@@ -26,6 +26,7 @@ import {
 import { HealthChecker } from "../lib/browser/health-checker.js";
 import { createApiClient } from "../lib/api-client.js";
 import { createCDNHandler } from "../lib/cdn-handler.js";
+import { requireClashOrExit } from "../clash/checker.js";
 import path from "path";
 import os from "os";
 
@@ -70,6 +71,14 @@ export async function handleRefresh(options) {
     exploreWebserver,
   } = options;
   const effectiveProxy = exploreProxy || configuredProxy;
+  let resolvedProxy = effectiveProxy;
+  if (
+    effectiveProxy &&
+    (effectiveProxy.includes("127.0.0.1") ||
+      effectiveProxy.includes("localhost"))
+  ) {
+    resolvedProxy = await requireClashOrExit("Refresh");
+  }
 
   let userId = exploreUserId || configuredUserId;
   let browser = null;
@@ -117,9 +126,9 @@ export async function handleRefresh(options) {
     console.error(`国家筛选: ${exploreLocation}`);
     if (exploreJobLocations) console.error(`任务国家: ${exploreJobLocations}`);
     console.error(`空闲间隔: ${exploreInterval || 30} 秒`);
-    if (effectiveProxy) {
+    if (resolvedProxy) {
       console.error(
-        `代理: ${effectiveProxy}${exploreProxy ? " (命令行指定)" : " (配置文件)"}`,
+        `代理: ${resolvedProxy}${effectiveProxy !== resolvedProxy ? " (自动发现)" : exploreProxy ? " (命令行指定)" : " (配置文件)"}`,
       );
     }
     if (exploreMaxUsers > 0) console.error(`上限: ${exploreMaxUsers} 个用户`);
@@ -152,8 +161,8 @@ export async function handleRefresh(options) {
       cdpOptions.userDataDir = currentAccount.userDataDir;
     }
 
-    if (effectiveProxy) {
-      cdpOptions.proxyServer = effectiveProxy;
+    if (resolvedProxy) {
+      cdpOptions.proxyServer = resolvedProxy;
     }
 
     console.error(`CDP 端口: ${cdpOptions.port}, 用户编号: ${userId}`);
@@ -230,8 +239,8 @@ export async function handleRefresh(options) {
         port: nextAccount.port,
         userDataDir: nextAccount.userDataDir,
       });
-      if (effectiveProxy) {
-        cdpOptions.proxyServer = effectiveProxy;
+      if (resolvedProxy) {
+        cdpOptions.proxyServer = resolvedProxy;
       }
       console.error(`[健康检查] 已切换到端口 ${nextAccount.port}`);
       await withRetry("账户切换后页面导航", async () => {

package/src/cli/search.js

@@ -40,6 +40,7 @@ import {
 } from "../scraper/modules/captcha-handler.js";
 import { createApiClient } from "../lib/api-client.js";
 import { HealthChecker } from "../lib/browser/health-checker.js";
+import { requireClashOrExit } from "../clash/checker.js";
 import {
   server as cfgServer,
   proxy as configuredProxy,
@@ -79,6 +80,14 @@ export async function handleSearch(parsed) {
   } = searchOpts || {};
 
   const effectiveProxy = cliProxy || configuredProxy;
+  let resolvedProxy = effectiveProxy;
+  if (
+    effectiveProxy &&
+    (effectiveProxy.includes("127.0.0.1") ||
+      effectiveProxy.includes("localhost"))
+  ) {
+    resolvedProxy = await requireClashOrExit("Search");
+  }
 
   const log = (...args) => process.stderr.write(args.join(" ") + "\n");
 
@@ -95,7 +104,7 @@ export async function handleSearch(parsed) {
       portCount +
       " 个）",
   );
-  log("║    代理: " + (effectiveProxy || "无"));
+  log("║    代理: " + (resolvedProxy || "无"));
   log("╚════════════════════════════════════╝");
   log("");
 
@@ -110,8 +119,8 @@ export async function handleSearch(parsed) {
   const cdpOptions = {};
   cdpOptions.port = currentAccount.port;
   cdpOptions.userDataDir = currentAccount.userDataDir;
-  if (effectiveProxy) {
-    cdpOptions.proxyServer = effectiveProxy;
+  if (resolvedProxy) {
+    cdpOptions.proxyServer = resolvedProxy;
   }
 
   let browser = null;
@@ -161,7 +170,7 @@ export async function handleSearch(parsed) {
         Object.assign(cdpOptions, {
           port: currentAccount.port,
           userDataDir: currentAccount.userDataDir,
-          ...(effectiveProxy ? { proxyServer: effectiveProxy } : {}),
+          ...(resolvedProxy ? { proxyServer: resolvedProxy } : {}),
         });
       }
 
@@ -264,7 +273,7 @@ export async function handleSearch(parsed) {
       const newBrowser = await switchAccount(
         { port: oldAccount.port, userDataDir: oldAccount.userDataDir },
         { port: nextAccount.port, userDataDir: nextAccount.userDataDir },
-        effectiveProxy,
+        resolvedProxy,
       );
       browser = newBrowser;
       const newPage = await setupNewPage(browser);
@@ -272,10 +281,10 @@ export async function handleSearch(parsed) {
       Object.assign(cdpOptions, {
         port: nextAccount.port,
         userDataDir: nextAccount.userDataDir,
-        ...(effectiveProxy ? { proxyServer: effectiveProxy } : {}),
+        ...(resolvedProxy ? { proxyServer: resolvedProxy } : {}),
       });
       log(
-        `[健康检查] 已切换到端口 ${nextAccount.port}${effectiveProxy ? ", 代理: " + effectiveProxy : ""}`,
+        `[健康检查] 已切换到端口 ${nextAccount.port}${resolvedProxy ? ", 代理: " + resolvedProxy : ""}`,
       );
       // 重新导航并检测登录
       await withRetry("账户切换后页面导航", async () => {

package/src/cli/watchdog.js

@@ -7,6 +7,7 @@
  *   --server <URL>       服务端地址（默认使用 ~/.tt-help.json 中的 server）
  *   --interval <秒>      心跳间隔，默认 15 秒
  *   --client-id <ID>     客户端标识（默认本机 hostname）
+ *   --no-daemon          不启动 clash daemon（默认启动）
  */
 
 import os from "os";
@@ -14,7 +15,12 @@ import { WatchdogAgent } from "../watchdog/agent.js";
 import { getClientConfig } from "../watchdog/reporter.js";
 
 export async function handleWatchdog(options) {
-  const { watchdogServer, watchdogInterval, watchdogClientId } = options;
+  const {
+    watchdogServer,
+    watchdogInterval,
+    watchdogClientId,
+    watchdogNoDaemon,
+  } = options;
 
   // 服务端地址：--server 参数 > ~/.tt-help.json server > 默认值
   const clientConfig = getClientConfig();
@@ -48,6 +54,7 @@ export async function handleWatchdog(options) {
     serverUrl,
     clientId,
     intervalMs: intervalSec * 1000,
+    spawnDaemon: !watchdogNoDaemon,
   });
 
   await agent.start();