tt-help-cli-ycl 1.4.160 → 1.4.162

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tt-help-cli-ycl",
-  "version": "1.4.160",
+  "version": "1.4.162",
   "description": "TikTok user & video data scraper - extract ttSeller, verified, locationCreated from HTML source",
   "type": "module",
   "bin": {
@@ -48,4 +48,4 @@
   "devDependencies": {
     "better-sqlite3": "^12.10.0"
   }
-}
+}

package/src/clash/daemon.js

@@ -443,6 +443,7 @@ export class ClashDaemon {
       if (r.status === "started") {
         started++;
         this._log(`✓ 实例${idx} (${spec.apiPort}/${spec.mixedPort}) 自愈拉起成功，下轮发现将接管`);
+        await this._rediscover("实例自愈拉起");
       } else if (r.status === "failed" || r.status === "no-vendor") {
         failed++;
         this._log(`⚠ 实例${idx} 自愈拉起失败: ${r.error || r.status}`);
@@ -689,33 +690,60 @@ export class ClashDaemon {
   }
 
   /**
-   * API 连续失败时的控制端重发现
-   * 连续 2 次巡检异常触发一次完整重发现，防止端口漂移后失联
+   * 重新发现控制端（订阅应用/自愈拉起新实例后调用，或 API 连续失败时）
+   * 背景: controllers 是 start() 时的快照，正常运行期新拉起的内置实例（9098+）
+   * 不会自动进入巡检列表 —— 必须主动重发现才能接管（否则新实例永远不被巡检/上报）
+   * 防抖: 30s 内多次触发只执行一次（多实例同时拉起时避免重复探测）
    */
-  async _maybeRediscover(e) {
-    this._apiFailCount = (this._apiFailCount || 0) + 1;
-    if (this._apiFailCount < 2) return;
-    this._apiFailCount = 0;
+  async _rediscover(reason) {
+    const now = Date.now();
+    if (now - (this._lastRediscoverAt || 0) < 30_000) return;
+    this._lastRediscoverAt = now;
     invalidateDiscoverCache();
-    this._log(`API 连续失败，重新发现控制端... (${e?.message || e})`);
     try {
       const discs = await discoverAll(this._discoverOpts);
+      // 按端口迁移旧控制器运行状态（切换历史/冷却锚点/订阅快照等），
+      // 避免重发现后 failover 冷却锚点丢失导致反复切换
+      const prev = new Map(this._controllers.map((c) => [c.port, c]));
       const seen = new Set();
       this._controllers = discs.filter((d) => {
         if (seen.has(d.port)) return false;
         seen.add(d.port);
+        const old = prev.get(d.port);
+        if (old) {
+          d._meta = old._meta;
+          d._switchHistory = old._switchHistory;
+          d._lastSwitchAt = old._lastSwitchAt;
+          d._restartSeq = old._restartSeq;
+          d._trafficLast = old._trafficLast;
+          d._traffic = old._traffic;
+          d._subsSnapshot = old._subsSnapshot;
+          d._applyResult = old._applyResult;
+          d._lastProbeAt = old._lastProbeAt;
+        }
         return true;
       });
       this._primary = this._controllers[0] || null;
-      this._lastDiscoverKey = "";
+      this._lastDiscoverKey = ""; // 强制下轮日志重新打印控制端列表
       this._log(
-        `✓ 重新选定 ${this._controllers.length} 个控制端: ${this._controllers.map((c) => `${c.clientName}@${c.port}`).join(", ") || "无"}`,
+        `✓ ${reason}: 重新发现 ${this._controllers.length} 个控制端: ${this._controllers.map((c) => `${c.clientName}@${c.port}`).join(", ") || "无"}`,
       );
     } catch (err) {
-      this._log(`重新发现控制端失败: ${err.message}`);
+      this._log(`${reason}: 重新发现控制端失败: ${err.message}`);
     }
   }
 
+  /**
+   * API 连续失败时的控制端重发现
+   * 连续 2 次巡检异常触发一次完整重发现，防止端口漂移后失联
+   */
+  async _maybeRediscover(e) {
+    this._apiFailCount = (this._apiFailCount || 0) + 1;
+    if (this._apiFailCount < 2) return;
+    this._apiFailCount = 0;
+    await this._rediscover(`API 连续失败 (${e?.message || e})`);
+  }
+
   /**
    * 白名单守卫：当前 Clash Verge 正在使用的节点必须 ∈ 候选集（咱们节点列表）
    *
@@ -1048,6 +1076,8 @@ export class ClashDaemon {
         c._applyResult = { ok: true, changed: true, cleared: true, at: Date.now() };
         this._log(`📋 订阅已清空: 回收内置 mihomo ${killed} 个进程，不再接管端口`);
         this._writeHealth(c, { node: "?", healthy: null });
+        // 实例已回收 → 重发现让死实例退出巡检列表（否则每轮巡检持续报"未运行"）
+        await this._rediscover("订阅清空");
         return;
       }
       this._log(`📋 收到订阅配置: ${subs.length} 条，按条启动独立实例（9097+每条递增）...`);
@@ -1077,6 +1107,9 @@ export class ClashDaemon {
       } else {
         this._log(`⚠ ${failed.length}/${subs.length} 个实例应用失败（未持久化，待下轮心跳重试）: ${failed.map((f) => `实例${f.index}`).join(",")}`);
       }
+      // 实例集可能已变化（成功拉起新实例/回收多余实例，含部分失败场景）→ 重发现同步巡检列表
+      // （controllers 是启动快照；不重发现则新实例永远不被巡检/上报，214 实采踩坑）
+      await this._rediscover("订阅应用");
       c._subsSnapshot = await api.getSubscriptionSummaries().catch(() => null);
       c._applyResult = {
         ok: allOk,

package/src/watch/public/app.js

@@ -5278,16 +5278,53 @@ async function wdSetErrorTrigger() {
 
 // ── 代理节点区域（看门狗面板中每个客户端卡片，支持多控制端通道） ──
 
+/** 内置实例端口段（与 discover.js RUNTIME_MAX_INSTANCES=8 对齐）：代理 7897+n / API 9097+n */
+var _SUBS_BASE_PROXY_PORT = 7897;
+var _SUBS_BASE_API_PORT = 9097;
+var _SUBS_MAX_INSTANCES = 8;
+
+/** 服务端配置的订阅列表（proxySettings[userId].subscriptions） */
+function wdSubsConfigured(userId) {
+  if (_wdData && _wdData.proxySettings && _wdData.proxySettings[userId]) {
+    return _wdData.proxySettings[userId].subscriptions || [];
+  }
+  return [];
+}
+
+/**
+ * 代理区域入口:
+ *   内置实例通道（7897+n）→ 订阅总览表（一行 = 一条订阅 = 一个实例）
+ *   外部通道（Verge 等）   → 独立通道行（节点 + 自身订阅摘要）
+ *   无通道                 → 配置过订阅显示总览（实例离线态）；否则单控制端旧视图
+ */
 function renderProxySection(c, userId) {
-  var channels = c.clashHealthChannels || [];
+  var channels = (c.clashHealthChannels || []).slice();
+  channels.sort(function (a, b) {
+    return (a.port || 0) - (b.port || 0);
+  });
   if (channels.length > 0) {
-    var html = "";
+    var builtin = [];
+    var external = [];
     for (var i = 0; i < channels.length; i++) {
-      html += renderProxyChannel(channels[i], userId);
+      var idx = (channels[i].port || 0) - _SUBS_BASE_PROXY_PORT;
+      if (idx >= 0 && idx < _SUBS_MAX_INSTANCES) builtin.push(channels[i]);
+      else external.push(channels[i]);
+    }
+    var html = renderSubsOverview(c, userId, builtin, channels);
+    for (var j = 0; j < external.length; j++) {
+      // 外部通道的订阅配置入口：仅当没有总览区时显示（配置入口全局收敛为一个）
+      html += renderExternalChannel(external[j], userId, !html);
     }
     return html;
   }
-  // 兼容旧版：仅主控制端（legacy clashHealth）
+  if (wdSubsConfigured(userId).length > 0) {
+    return renderSubsOverview(c, userId, [], []);
+  }
+  return renderProxyLegacy(c, userId);
+}
+
+/** 兼容旧版：仅主控制端（legacy clashHealth） */
+function renderProxyLegacy(c, userId) {
   var h = c.clashHealth;
   if (!h || !h.node) return "";
   var nodes = (h.meta && h.meta.healthyNodes) || [];
@@ -5300,8 +5337,8 @@ function renderProxySection(c, userId) {
   );
 }
 
-/** 单个控制端通道的代理区域 */
-function renderProxyChannel(ch, userId) {
+/** 外部代理通道（Verge 等非内置实例）：节点行 + 节点列表 + 自身订阅摘要 */
+function renderExternalChannel(ch, userId, withConfig) {
   if (!ch || !ch.node) return "";
   var nodes = (ch.meta && ch.meta.healthyNodes) || [];
   var delays = (ch.meta && ch.meta.healthyNodeDelays) || {};
@@ -5309,10 +5346,284 @@ function renderProxyChannel(ch, userId) {
   return (
     renderProxyLine(ch, nodes, userId, ch.port || 0, hasNodes) +
     renderNodeList(nodes, ch.node, userId, ch.port || 0, delays) +
-    renderSubscriptions(ch.meta && ch.meta.proxy, userId)
+    renderSubscriptions(ch.meta && ch.meta.proxy, userId, withConfig !== false)
+  );
+}
+
+// ── 订阅总览区（每客户端一个） ──
+
+/** 订阅应用结果提示（daemon 最近一次 setSubscription 执行反馈） */
+function renderApplyResult(ar) {
+  if (!ar || !ar.at) return "";
+  if (ar.ok === false) {
+    return styled(
+      "div",
+      "font-size:11px;margin:2px 0 4px;padding:4px 6px;background:#3b1d1d;border:1px solid #7f1d1d;border-radius:4px;color:#f87171;line-height:1.4;width:100%;box-sizing:border-box",
+      "❌ 订阅应用失败: " + (ar.error || "未知错误") +
+        styled("span", "color:#94a3b8;margin-left:6px;font-size:10px", new Date(ar.at).toLocaleTimeString()),
+    );
+  }
+  if (ar.changed) {
+    return styled(
+      "div",
+      "font-size:11px;color:#4ade80;width:100%",
+      "✓ 订阅应用成功 (" + (ar.count || "?") + " 条，" + new Date(ar.at).toLocaleTimeString() + ")",
+    );
+  }
+  return "";
+}
+
+
+/**
+ * 订阅总览表:
+ *   订阅名 | 实例 | 代理端口(业务 --proxy 用) | 当前节点(可展开切换) | 用量/到期/速率
+ *   一行 = 一条订阅 = 一个内置 mihomo 实例；通道离线时显示占位行（配置可见，实例自愈中）
+ */
+function renderSubsOverview(c, userId, builtinChannels, allChannels) {
+  var configured = wdSubsConfigured(userId);
+  var byPort = {};
+  for (var i = 0; i < builtinChannels.length; i++) {
+    byPort[builtinChannels[i].port] = builtinChannels[i];
+  }
+  var count = configured.length;
+  for (var p in byPort) {
+    var n = parseInt(p, 10) - _SUBS_BASE_PROXY_PORT + 1;
+    if (n > count) count = n;
+  }
+  if (!count) return "";
+
+  // 订阅应用结果（主控制端默认健康文件优先，回退任一通道快照）
+  var ar = null;
+  if (c.clashHealth && c.clashHealth.meta && c.clashHealth.meta.proxy) {
+    ar = c.clashHealth.meta.proxy.applyResult;
+  }
+  if (!ar || !ar.at) {
+    for (var k = 0; k < (allChannels || []).length; k++) {
+      var pp = allChannels[k].meta && allChannels[k].meta.proxy;
+      if (pp && pp.applyResult && pp.applyResult.at) {
+        ar = pp.applyResult;
+        break;
+      }
+    }
+  }
+
+  // 标题行：入口收敛为全局唯一一个配置按钮
+  var head = styled(
+    "div",
+    "padding:6px 8px;background:#111;display:flex;align-items:center;gap:8px;font-size:12px;flex-wrap:wrap",
+    styled("span", "font-size:14px", "🛜") +
+      styled("span", "color:#e0e0e0;font-weight:bold", "代理订阅") +
+      styled("span", "color:#94a3b8", count + " 条") +
+      tag(
+        "button",
+        {
+          onclick: "wdShowProxyModal('" + esc(userId) + "')",
+          style:
+            "padding:2px 8px;font-size:11px;background:#333;color:#fbbf24;" +
+            "border:1px solid #444;border-radius:3px;cursor:pointer",
+          title: "配置该客户端的代理订阅（每行一个地址，保存后自动热应用，无需重启）",
+        },
+        "配置 ⚙️",
+      ) +
+      styled(
+        "span",
+        "color:#555;font-size:10px;margin-left:auto",
+        "一条订阅 = 一个独立 mihomo 实例",
+      ) +
+      renderApplyResult(ar),
+  );
+
+  // tab 栏（即概览: 状态点+订阅名+端口；临期/超量红标、离线灰）+ 详情区（仅激活显示）
+  // 选中态跨刷新保留（_wdSubsActiveTab），点击纯 DOM 切换不重渲染
+  var activePort = _wdSubsActiveTab[wdEscId(userId)] || _SUBS_BASE_PROXY_PORT;
+  var tabsBar = styled(
+    "div",
+    "display:flex;gap:2px;padding:0 8px;background:#16161e;border-bottom:1px solid #2a2a3a;overflow-x:auto;flex-wrap:wrap",
+    (function () {
+      var out = "";
+      for (var m = 1; m <= count; m++) {
+        out += renderSubsTab(m, configured[m - 1], byPort[_SUBS_BASE_PROXY_PORT + m - 1], userId,
+          _SUBS_BASE_PROXY_PORT + m - 1 === activePort);
+      }
+      return out;
+    })(),
+  );
+  var bodies = "";
+  for (var m2 = 1; m2 <= count; m2++) {
+    bodies += renderSubsBody(m2, configured[m2 - 1], byPort[_SUBS_BASE_PROXY_PORT + m2 - 1], userId,
+      _SUBS_BASE_PROXY_PORT + m2 - 1 === activePort);
+  }
+  return styled(
+    "div",
+    "margin-top:6px;border:1px solid #2a2a3a;border-radius:8px;overflow:hidden",
+    head + tabsBar + bodies,
+  );
+}
+
+/** 订阅选中 tab（userId → 代理端口），跨刷新保留 */
+var _wdSubsActiveTab = {};
+
+/** tab 点击切换（纯 DOM 操作，不重渲染；与节点展开/切换命令同用代理端口路由） */
+function wdSubsTab(userId, port) {
+  _wdSubsActiveTab[wdEscId(userId)] = port;
+  for (var i = 0; i < _SUBS_MAX_INSTANCES; i++) {
+    var p = _SUBS_BASE_PROXY_PORT + i;
+    var tab = document.getElementById("wdSubsTab-" + wdEscId(userId) + "-" + p);
+    var body = document.getElementById("wdSubsBody-" + wdEscId(userId) + "-" + p);
+    if (!tab || !body) continue;
+    var active = p === port;
+    tab.style.background = active ? "#2a2a3a" : "transparent";
+    tab.style.color = active ? "#fff" : "#94a3b8";
+    tab.style.borderBottom = active ? "2px solid #60a5fa" : "2px solid transparent";
+    body.style.display = active ? "block" : "none";
+  }
+}
+
+/** tab 按钮（即概览条目）: 状态点 + 订阅名 + 端口；临期/超量红标、离线灰 */
+function renderSubsTab(n, conf, ch, userId, active) {
+  var port = _SUBS_BASE_PROXY_PORT + n - 1;
+  var meta = (ch && ch.meta) || {};
+  var sub = ((meta.proxy || {}).subscriptions || [])[0] || null;
+  var online = !!(ch && ch.node);
+  var name = (sub && sub.name) || (conf && conf.name) || "实例" + n;
+  // 临期/超量判定（与详情区同口径）
+  var danger = false;
+  if (sub) {
+    var used = (sub.upload || 0) + (sub.download || 0);
+    var total = sub.total || 0;
+    var pct = total > 0 ? Math.round(((total - used) / total) * 100) : null;
+    var daysLeft = sub.expire ? Math.round((sub.expire * 1000 - Date.now()) / 86400000) : null;
+    danger = (pct !== null && pct < 10) || (daysLeft !== null && daysLeft < 7);
+  }
+  var dot = !online ? "○" : ch.healthy ? "●" : "●";
+  var dotColor = !online ? "#555" : ch.healthy ? "#4ade80" : "#f87171";
+  return tag(
+    "button",
+    {
+      id: "wdSubsTab-" + wdEscId(userId) + "-" + port,
+      onclick: "wdSubsTab('" + esc(userId) + "'," + port + ")",
+      style:
+        "padding:5px 10px;font-size:11px;cursor:pointer;white-space:nowrap;border:none;flex-shrink:0;" +
+        "background:" + (active ? "#2a2a3a" : "transparent") + ";" +
+        "color:" + (active ? "#fff" : "#94a3b8") + ";" +
+        "border-bottom:2px solid " + (active ? "#60a5fa" : "transparent") + ";" +
+        (online ? "" : "opacity:0.6;"),
+      title: "实例" + n + " · 代理 " + port + " · API " + (_SUBS_BASE_API_PORT + n - 1) + (online ? (ch.healthy ? " · 健康" : " · 异常") : " · 未上线"),
+    },
+    styled("span", "color:" + dotColor, dot) +
+      " " + name + styled("span", "color:#60a5fa;font-size:10px", " :" + port) +
+      (danger ? styled("span", "color:#f87171;margin-left:2px", "⚠️") : ""),
   );
 }
 
+/** tab 详情区: 当前节点 + 端口/实例 + 用量/到期 + 速率 + 节点列表（可展开） */
+function renderSubsBody(n, conf, ch, userId, active) {
+  var port = _SUBS_BASE_PROXY_PORT + n - 1;
+  var apiPort = _SUBS_BASE_API_PORT + n - 1;
+  var meta = (ch && ch.meta) || {};
+  var proxy = meta.proxy || {};
+  var sub = (proxy.subscriptions || [])[0] || null;
+  var online = !!(ch && ch.node);
+  var nodes = meta.healthyNodes || [];
+  var delays = meta.healthyNodeDelays || {};
+
+  // 行1: 当前节点 + 健康状态 + 节点列表展开
+  var line1;
+  if (online) {
+    var dotColor = ch.healthy ? "#4ade80" : "#f87171";
+    var status = ch.healthy
+      ? (ch.timeTotal || 0).toFixed(1) + "s " + ((ch.sizeDownload || 0) / 1024).toFixed(0) + "KB"
+      : ch.error || "异常";
+    line1 = styled(
+      "div",
+      "display:flex;align-items:center;gap:8px;padding:8px 10px 4px;font-size:13px;flex-wrap:wrap",
+      styled("span", "color:" + dotColor, "●") +
+        styled("span", "color:#e0e0e0;font-weight:bold;word-break:break-all", ch.node) +
+        styled("span", "color:#666;font-size:11px", "| " + status) +
+        (ch.stale ? styled("span", "color:#fbbf24;font-size:10px", "数据过期" + ch.ageSeconds + "s") : "") +
+        (nodes.length
+          ? tag(
+              "button",
+              {
+                onclick: "wdToggleNodes('" + esc(userId) + "'," + port + ")",
+                style:
+                  "margin-left:auto;padding:2px 8px;font-size:11px;background:#333;color:#60a5fa;" +
+                  "border:1px solid #444;border-radius:3px;cursor:pointer;flex-shrink:0",
+                title: "查看/切换该实例的可用节点",
+              },
+              nodes.length + " 个节点 ▸",
+            )
+          : ""),
+    );
+  } else {
+    line1 = styled(
+      "div",
+      "display:flex;align-items:center;gap:8px;padding:8px 10px 4px;font-size:12px",
+      styled("span", "color:#555", "○") +
+        styled("span", "color:#888", "实例未运行（等待自愈拉起，配置保留）"),
+    );
+  }
+
+  // 行2: 实例/端口（业务 --proxy 用代理端口）
+  var line2 = styled(
+    "div",
+    "padding:2px 10px;font-size:11px;color:#888;display:flex;gap:10px;flex-wrap:wrap",
+    styled("span", null, "实例 #" + n) +
+      tag(
+        "span",
+        {
+          style: "color:#60a5fa;font-family:monospace",
+          title: "业务命令 --proxy 用此端口",
+        },
+        "代理 127.0.0.1:" + port,
+      ) +
+      styled("span", "color:#555;font-family:monospace", "API " + apiPort) +
+      (proxy.runtime && proxy.runtime.status ? styled("span", "color:#555", "内核" + (proxy.runtime.status || "")) : ""),
+  );
+
+  // 行3: 用量/到期 + 行4: 速率
+  var line34 = "";
+  if (sub) {
+    var used = (sub.upload || 0) + (sub.download || 0);
+    var total = sub.total || 0;
+    var remain = total > 0 ? total - used : 0;
+    var pct = total > 0 ? Math.round((remain / total) * 100) : null;
+    var daysLeft = sub.expire ? Math.round((sub.expire * 1000 - Date.now()) / 86400000) : null;
+    var danger = (pct !== null && pct < 10) || (daysLeft !== null && daysLeft < 7);
+    var parts = [];
+    if (sub.proxies) parts.push(sub.proxies + " 节点");
+    parts.push(total > 0 ? "剩 " + fmtGB(remain) + (pct !== null ? " (" + pct + "%)" : "") : "用量未知");
+    if (sub.expire) {
+      parts.push("到 " + new Date(sub.expire * 1000).toLocaleDateString() + (daysLeft !== null ? "（剩" + daysLeft + "天）" : ""));
+    }
+    line34 = styled(
+      "div",
+      "padding:2px 10px 4px;font-size:11px" + (danger ? ";background:#3b1d1d" : ""),
+      styled("span", "color:" + (danger ? "#f87171" : "#94a3b8"), "📡 " + parts.join(" · ") + (danger ? " ⚠️" : "")),
+    );
+  }
+  var t = proxy.traffic;
+  if (t && (t.downRate > 0 || t.upRate > 0)) {
+    line34 += styled(
+      "div",
+      "padding:2px 10px 6px;font-size:11px;color:#666",
+      "⚡ ↓" + fmtSpeed(t.downRate) + " / ↑" + fmtSpeed(t.upRate),
+    );
+  }
+
+  var bodyInner = line1 + line2 + line34 +
+    (online && nodes.length ? renderNodeList(nodes, ch.node, userId, port, delays) : "");
+  return tag(
+    "div",
+    {
+      id: "wdSubsBody-" + wdEscId(userId) + "-" + port,
+      style: "display:" + (active ? "block" : "none") + ";border-top:1px solid #22222f",
+    },
+    bodyInner,
+  );
+}
+
+
 function fmtGB(bytes) {
   if (!bytes || bytes <= 0) return "0";
   var gb = bytes / 1073741824;
@@ -5328,31 +5639,14 @@ function fmtSpeed(bytesPerSec) {
 /**
  * 订阅用量/到期 + 实时速率 + 订阅配置入口（数据: clashHealth.meta.proxy）
  * 临期（<7天）或超量（剩余<10%）标红
+ * @param {boolean} [withConfig] 是否渲染配置入口按钮（默认 true；多实例总览区已收敛唯一入口时传 false）
  */
-function renderSubscriptions(proxy, userId) {
+function renderSubscriptions(proxy, userId, withConfig) {
   proxy = proxy || {};
   var subs = proxy.subscriptions || [];
   var rows = "";
   // 订阅应用结果（daemon 最近一次 setSubscription 执行反馈；随下次应用/daemon 重启刷新）
-  var ar = proxy.applyResult;
-  if (ar && ar.at) {
-    if (ar.ok === false) {
-      rows +=
-        styled(
-          "div",
-          "font-size:11px;margin:2px 0 4px;padding:4px 6px;background:#3b1d1d;border:1px solid #7f1d1d;border-radius:4px;color:#f87171;line-height:1.4",
-          "❌ 订阅应用失败: " + esc(ar.error || "未知错误") +
-            styled("span", "color:#94a3b8;margin-left:6px;font-size:10px", new Date(ar.at).toLocaleTimeString()),
-        );
-    } else if (ar.changed) {
-      rows +=
-        styled(
-          "div",
-          "font-size:11px;margin:2px 0 4px;color:#4ade80",
-          "✓ 订阅应用成功 (" + (ar.count || "?") + " 条，" + new Date(ar.at).toLocaleTimeString() + ")",
-        );
-    }
-  }
+  rows += renderApplyResult(proxy.applyResult);
   // 实时速率
   var t = proxy.traffic;
   if (t && (t.downRate > 0 || t.upRate > 0)) {
@@ -5389,7 +5683,8 @@ function renderSubscriptions(proxy, userId) {
       );
   }
   // 配置入口（摘要双来源: 后台配置优先，回退 daemon 实际生效快照；显示条数+订阅名）
-  var configured = (window._wdData && _wdData.proxySettings && _wdData.proxySettings[userId] && _wdData.proxySettings[userId].subscriptions) || proxy.subscriptions || [];
+  if (withConfig !== false) {
+    var configured = (window._wdData && _wdData.proxySettings && _wdData.proxySettings[userId] && _wdData.proxySettings[userId].subscriptions) || proxy.subscriptions || [];
   var cfgNames = configured
     .map(function (s) {
       return s.name || String(s.url || "").replace(/^https?:\/\//, "").split("/")[0];
@@ -5416,6 +5711,7 @@ function renderSubscriptions(proxy, userId) {
           "配置 ⚙️",
         ),
     );
+  }
   return rows;
 }
 

package/src/watch/public/index.html

@@ -786,7 +786,7 @@
     style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(0,0,0,0.6);z-index:9999;align-items:center;justify-content:center">
     <div style="background:#1e1e2e;border:1px solid #333;border-radius:12px;padding:24px;width:90%;max-width:560px">
       <div style="font-size:16px;color:#fbbf24;margin-bottom:4px">🛜 代理订阅配置 — <span id="wdProxyUserId"></span></div>
-      <div style="color:#888;font-size:12px;margin-bottom:12px">每行一个订阅地址（http/https），<b style="color:#fbbf24">一条订阅 = 一个独立 mihomo 实例</b>：代理端口依次 127.0.0.1:7897、7898、7899…（API 端口 9097 起，同步 +1），各命令用 --proxy 参数指定使用哪个。<br>保存后客户端下次心跳时自动热应用（无需重启），应用成功后此处可看到剩余流量与到期时间；临期（&lt;7天）或超量（剩余&lt;10%）会标红。</div>
+      <div style="color:#888;font-size:12px;margin-bottom:12px">每行一个订阅地址（http/https），<b style="color:#fbbf24">一行 = 一个独立 mihomo 实例</b>：按行序分配实例 1/2/3…，代理端口依次 127.0.0.1:7897、7898、7899…（API 管理端口 9097 起，同步 +1），业务命令用 --proxy 指定使用哪个端口（客户端卡片“代理订阅”总览表可查映射）。<br>保存后客户端下次心跳时自动热应用（约 15～30 秒）；订阅名按行序自动编号 sub-1、sub-2…，<b style="color:#f87171">在中间插入/删除行会使后续实例重新编号并重载配置</b>，建议只在末尾追加。临期（&lt;7天）或超量（剩余&lt;10%）在总览表中标红。</div>
       <textarea id="wdProxySubsText" rows="6" placeholder="https://example.com/api/v1/client/subscribe?token=xxxx\nhttps://another-airport.com/sub?token=yyyy"
         style="width:100%;box-sizing:border-box;padding:10px;background:#16161e;border:1px solid #333;border-radius:8px;color:#e0e0e0;font-size:12px;font-family:monospace;resize:vertical"></textarea>
       <div style="display:flex;justify-content:flex-end;gap:8px;margin-top:16px">

package/src/watchdog/env-init.js

@@ -146,11 +146,24 @@ async function killTree(pid) {
  */
 export async function takeoverEnvironment({ spawnDaemon, selfPid, log = () => {} } = {}) {
   const procs = listProcesses();
+  // 自身祖先链一律跳过: 启动包装层（schtasks 的 cmd /c node cli.js watchdog…、
+  // Start-Process 的 powershell 等）命令行同样命中 agent 签名，若误判为"旧 agent"
+  // 会 taskkill /T 树杀连坐树内的自己（214 实采踩坑：watchdog 启动后即自杀）。
+  // 祖先链只可能是本次启动的包装层，绝不可能是需要接管的"旧实例"。
+  const byPid = new Map(procs.map((p) => [p.pid, p]));
+  const ancestors = new Set();
+  let cur = byPid.get(selfPid)?.ppid;
+  while (cur && cur > 1 && !ancestors.has(cur) && ancestors.size < 32) {
+    ancestors.add(cur);
+    cur = byPid.get(cur)?.ppid;
+  }
+
   const agents = [];
   const daemons = [];
 
   for (const p of procs) {
     if (p.pid === selfPid) continue;
+    if (ancestors.has(p.pid)) continue; // 祖先链跳过（防树杀自杀）
     if (isAgentCmd(p.cmd)) agents.push(p);
     else if (spawnDaemon && isDaemonCmd(p.cmd)) daemons.push(p);
   }

package/src/watchdog/upgrader.js

@@ -705,10 +705,22 @@ export async function runUpgradeMode(argv) {
     `[upgrade-proc] 开始下载新版: npm install -g ${PACKAGE}@latest ...`,
   );
   const beforeVersion = getVersion(); // 下载前版本，用于验证 npm install 真正生效
-  const result = await performUpgrade();
+  let result = await performUpgrade();
+  if (!result.success && /EBUSY|resource busy/i.test(result.output)) {
+    // Windows 实测：运行中的 node/watchdog 或其 cwd 在包目录内时，npm 覆盖文件报 EBUSY。
+    // 此刻升级已势在必行（版本差已确认），终止旧 watchdog 释放文件锁后重试安装。
+    console.error(
+      `[upgrade-proc] 包目录被运行进程锁定（EBUSY），终止旧 watchdog 释放锁后重试安装...`,
+    );
+    const lockSnapshot = await snapshotAllProcesses();
+    const lockDescPids = listDescendantPids(lockSnapshot, oldPid, process.pid);
+    await terminateProcess(oldPid, 5000);
+    await killPidList(lockDescPids, "[upgrade-proc] 已停止旧 watchdog 释放包目录锁");
+    result = await performUpgrade();
+  }
   if (!result.success) {
     const err = result.output.substring(0, 300);
-    console.error(`[upgrade-proc] 下载失败，保持当前版本运行: ${err}`);
+    console.error(`[upgrade-proc] 下载失败，保持当前状态: ${err}`);
     process.exit(1);
   }