mihomo-cli 3.6.0 → 3.8.0

package/dist/index.js

@@ -3067,7 +3067,14 @@ var UI_URLS = {
   dash: "https://metacubex.github.io/metacubexd",
   yacd: "https://yacd.metacubex.one"
 };
-var LAUNCH_DAEMON_LABEL = process.env.MIHOMO_CLI_DAEMON_LABEL || "com.mihomo-cli.daemon";
+var DEFAULT_DAEMON_LABEL = "com.mihomo-cli.daemon";
+var DAEMON_LABEL_RE = /^[A-Za-z0-9][A-Za-z0-9._-]*$/;
+function isValidDaemonLabel(label) {
+  return DAEMON_LABEL_RE.test(label) && !label.includes("..");
+}
+var RAW_DAEMON_LABEL = process.env.MIHOMO_CLI_DAEMON_LABEL;
+var RAW_DAEMON_LABEL_INPUT = RAW_DAEMON_LABEL;
+var LAUNCH_DAEMON_LABEL = RAW_DAEMON_LABEL && isValidDaemonLabel(RAW_DAEMON_LABEL) ? RAW_DAEMON_LABEL : DEFAULT_DAEMON_LABEL;
 var CONTROLLER_PORT = 9090;
 var CONTROLLER_ADDR = `127.0.0.1:${CONTROLLER_PORT}`;
 var CONTROLLER_BASE_URL = `http://${CONTROLLER_ADDR}`;
@@ -3120,6 +3127,41 @@ var AUTO_CLEAN_THRESHOLD = 100;
 var AUTO_CLEAN_THRESHOLD_GITHUB = 50;
 var AUTO_CLEAN_COOLDOWN_HOURS = 12;
 
+// src/errors.ts
+var TimeoutError = class extends Error {
+  constructor() {
+    super("timeout");
+    this.name = "TimeoutError";
+  }
+};
+var CliError = class extends Error {
+  hint;
+  label;
+  exitCode;
+  constructor(message, options = {}) {
+    super(message);
+    this.name = "CliError";
+    this.label = options.label ?? "\u9519\u8BEF";
+    this.hint = options.hint === void 0 ? [] : Array.isArray(options.hint) ? options.hint : [options.hint];
+    this.exitCode = options.exitCode ?? 1;
+  }
+};
+function withTimeout(promise, ms) {
+  return new Promise((resolve, reject) => {
+    const timer = setTimeout(() => reject(new TimeoutError()), ms);
+    promise.then(
+      (v) => {
+        clearTimeout(timer);
+        resolve(v);
+      },
+      (e) => {
+        clearTimeout(timer);
+        reject(e);
+      }
+    );
+  });
+}
+
 // src/overwrite.ts
 import fs3 from "fs";
 import path3 from "path";
@@ -3140,7 +3182,11 @@ var DIRS = {
   subscriptions: path.join(USER_DATA_DIR, "subscriptions"),
   logs: path.join(USER_DATA_DIR, "logs"),
   data: path.join(USER_DATA_DIR, "data"),
-  runtime: path.join(USER_DATA_DIR, "runtime")
+  runtime: path.join(USER_DATA_DIR, "runtime"),
+  // 隧道运行态。刻意独立于 runtime/：clearRuntime() 会在 stop() 成功路径 rmrf 整个
+  // runtime 目录，隧道状态放那里会被 `mihomo stop` 连同 config.yaml 一起抹掉，
+  // 于是「谁起的」标记丢失、手动起的隧道再也无法被识别
+  tunnel: path.join(USER_DATA_DIR, "tunnel")
 };
 var PATHS = {
   mihomoBinary: path.join(DIRS.kernel, "mihomo"),
@@ -3191,62 +3237,32 @@ function rmrf(dir) {
 // src/settings.ts
 import fs2 from "fs";
 import path2 from "path";
-
-// src/errors.ts
-var TimeoutError = class extends Error {
-  constructor() {
-    super("timeout");
-    this.name = "TimeoutError";
-  }
-};
-var CliError = class extends Error {
-  hint;
-  label;
-  exitCode;
-  constructor(message, options = {}) {
-    super(message);
-    this.name = "CliError";
-    this.label = options.label ?? "\u9519\u8BEF";
-    this.hint = options.hint === void 0 ? [] : Array.isArray(options.hint) ? options.hint : [options.hint];
-    this.exitCode = options.exitCode ?? 1;
-  }
-};
-function withTimeout(promise, ms) {
-  return new Promise((resolve, reject) => {
-    const timer = setTimeout(() => reject(new TimeoutError()), ms);
-    promise.then(
-      (v) => {
-        clearTimeout(timer);
-        resolve(v);
-      },
-      (e) => {
-        clearTimeout(timer);
-        reject(e);
-      }
-    );
-  });
-}
-
-// src/settings.ts
 var settingsCache = null;
 function readSettings() {
   if (settingsCache !== null) return settingsCache;
   ensureDirs();
   if (fs2.existsSync(PATHS.settingsFile)) {
+    let parsed;
     try {
-      const content = fs2.readFileSync(PATHS.settingsFile, "utf8");
-      settingsCache = JSON.parse(content);
-      return settingsCache;
+      parsed = JSON.parse(fs2.readFileSync(PATHS.settingsFile, "utf8"));
     } catch {
-      try {
-        fs2.copyFileSync(PATHS.settingsFile, `${PATHS.settingsFile}.bak`);
-        console.warn(`\u8B66\u544A: settings.json \u683C\u5F0F\u635F\u574F\uFF0C\u5DF2\u5907\u4EFD\u5230 ${PATHS.settingsFile}.bak\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u8BBE\u7F6E`);
-      } catch {
-        console.warn("\u8B66\u544A: settings.json \u683C\u5F0F\u635F\u574F\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u8BBE\u7F6E");
-      }
-      settingsCache = {};
-      return settingsCache;
+      return recoverCorruptedSettings();
+    }
+    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+      return recoverCorruptedSettings();
     }
+    settingsCache = parsed;
+    return settingsCache;
+  }
+  settingsCache = {};
+  return settingsCache;
+}
+function recoverCorruptedSettings() {
+  try {
+    fs2.copyFileSync(PATHS.settingsFile, `${PATHS.settingsFile}.bak`);
+    console.warn(`\u8B66\u544A: settings.json \u683C\u5F0F\u635F\u574F\uFF0C\u5DF2\u5907\u4EFD\u5230 ${PATHS.settingsFile}.bak\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u8BBE\u7F6E`);
+  } catch {
+    console.warn("\u8B66\u544A: settings.json \u683C\u5F0F\u635F\u574F\uFF0C\u4F7F\u7528\u9ED8\u8BA4\u8BBE\u7F6E");
   }
   settingsCache = {};
   return settingsCache;
@@ -3265,11 +3281,7 @@ function writeSettings(settings) {
 function invalidateSettingsCache() {
   settingsCache = null;
 }
-function maskUrl(url) {
-  if (!url) return url;
-  if (url.includes(",")) {
-    return url.split(",").map((u) => maskUrl(u.trim())).join(", ");
-  }
+function maskSingleUrl(url) {
   try {
     const parsed = new URL(url);
     const tokenKeys = ["token", "key", "secret", "pass", "password", "auth", "access_token", "api_key"];
@@ -3289,6 +3301,26 @@ function maskUrl(url) {
     return url;
   }
 }
+function looksLikeMultiUrl(url) {
+  if (!url.includes(",")) return false;
+  const parts = url.split(",").map((u) => u.trim()).filter(Boolean);
+  if (parts.length < 2) return false;
+  return parts.every((p) => {
+    try {
+      const u = new URL(p);
+      return u.protocol === "http:" || u.protocol === "https:";
+    } catch {
+      return false;
+    }
+  });
+}
+function maskUrl(url) {
+  if (!url) return url;
+  if (looksLikeMultiUrl(url)) {
+    return url.split(",").map((u) => maskSingleUrl(u.trim())).join(", ");
+  }
+  return maskSingleUrl(url);
+}
 function readSubscriptionCache() {
   ensureDirs();
   if (fs2.existsSync(PATHS.subscriptionsCacheFile)) {
@@ -3318,7 +3350,14 @@ function saveSubscriptionCache(subName, data) {
 }
 function getSubscriptions() {
   const settings = readSettings();
-  return settings.subscriptions || [];
+  const subs = settings.subscriptions;
+  if (!Array.isArray(subs)) {
+    if (subs !== void 0) {
+      console.warn("\u8B66\u544A: settings.json \u7684 subscriptions \u4E0D\u662F\u5217\u8868\uFF0C\u5DF2\u5FFD\u7565\uFF08\u53EF\u7528 mihomo sub add \u91CD\u65B0\u6DFB\u52A0\uFF09");
+    }
+    return [];
+  }
+  return subs.filter((s) => s != null && typeof s === "object" && typeof s.name === "string" && typeof s.url === "string");
 }
 function getSubscriptionsWithCache() {
   const subs = getSubscriptions();
@@ -3337,7 +3376,7 @@ function validateSubscriptionName(name) {
 function addSubscription(url, name = "default") {
   validateSubscriptionName(name);
   const settings = readSettings();
-  const subs = [...settings.subscriptions || []];
+  const subs = [...getSubscriptions()];
   if (subs.some((s) => s.name === name)) {
     throw new CliError(`\u8BA2\u9605 "${name}" \u5DF2\u5B58\u5728\uFF0C\u8BF7\u6362\u4E2A\u540D\u79F0\uFF08mihomo sub add <url> <\u540D\u79F0>\uFF09\uFF0C\u6216\u5148\u5220\u9664\uFF08mihomo sub remove ${name}\uFF09`);
   }
@@ -3350,7 +3389,7 @@ function addSubscription(url, name = "default") {
 }
 function removeSubscription(name) {
   const settings = readSettings();
-  const subs = [...settings.subscriptions || []];
+  const subs = [...getSubscriptions()];
   const idx = subs.findIndex((s) => s.name === name);
   if (idx < 0) return null;
   subs.splice(idx, 1);
@@ -3374,7 +3413,7 @@ function removeSubscription(name) {
 }
 function setDefaultSubscription(name) {
   const settings = readSettings();
-  const subs = settings.subscriptions || [];
+  const subs = getSubscriptions();
   const idx = subs.findIndex((s) => s.name === name);
   if (idx < 0) return false;
   if (settings.active_subscription === name) return true;
@@ -3459,6 +3498,18 @@ function deepMergeWithOverrides(target, override) {
     const { key, forceOverwrite, arrayPrepend, arrayAppend, arrayMergeByName } = parseOverrideKey(rawKey);
     const existingValue = result[key];
     if (arrayMergeByName) {
+      if (existingValue !== void 0 && !Array.isArray(existingValue)) {
+        throw new CliError(
+          `\u8986\u5199\u952E "${rawKey}" \u7684 ~ \u8BED\u4E49\u53EA\u9002\u7528\u4E8E\u6570\u7EC4\uFF0C\u4F46 "${key}" \u5F53\u524D\u662F${existingValue === null ? " null" : typeof existingValue === "object" ? "\u6620\u5C04" : `\u6807\u91CF\uFF08${typeof existingValue}\uFF09`}`,
+          {
+            label: "\u8986\u5199\u914D\u7F6E\u9519\u8BEF",
+            hint: [
+              `~${key} \u7528\u4E8E\u6309 name \u5C31\u5730\u5408\u5E76\u6570\u7EC4\u5143\u7D20\uFF08\u5982 ~proxy-groups\uFF09\u3002`,
+              `\u82E5\u8981\u8986\u76D6\u975E\u6570\u7EC4\u7684 ${key}\uFF0C\u8BF7\u7528 ${key}!\uFF08\u5F3A\u5236\u8986\u76D6\uFF09\u6216\u76F4\u63A5\u5199 ${key}\uFF08\u6DF1\u5EA6\u5408\u5E76\uFF09\u3002`
+            ]
+          }
+        );
+      }
       const existingArr = Array.isArray(existingValue) ? existingValue : [];
       const overrideArr = Array.isArray(value) ? value : [value];
       const merged = [...existingArr];
@@ -3475,6 +3526,15 @@ function deepMergeWithOverrides(target, override) {
       continue;
     }
     if (arrayPrepend || arrayAppend) {
+      if (existingValue !== void 0 && !Array.isArray(existingValue)) {
+        throw new CliError(
+          `\u8986\u5199\u952E "${rawKey}" \u7684\u6570\u7EC4\u62FC\u63A5\u8BED\u4E49\u53EA\u9002\u7528\u4E8E\u6570\u7EC4\uFF0C\u4F46 "${key}" \u5F53\u524D\u662F${existingValue === null ? " null" : typeof existingValue === "object" ? "\u6620\u5C04" : `\u6807\u91CF\uFF08${typeof existingValue}\uFF09`}`,
+          {
+            label: "\u8986\u5199\u914D\u7F6E\u9519\u8BEF",
+            hint: [`+${key} / ${key}+ \u7528\u4E8E\u5411\u6570\u7EC4\u524D\u7F6E/\u8FFD\u52A0\u5143\u7D20\uFF08\u5982 rules+\uFF09\u3002`, `\u82E5\u8981\u66FF\u6362\u975E\u6570\u7EC4\u7684 ${key}\uFF0C\u8BF7\u76F4\u63A5\u5199 ${key}: <\u503C>\u3002`]
+          }
+        );
+      }
       const existingArr = Array.isArray(existingValue) ? existingValue : [];
       const overrideArr = Array.isArray(value) ? value : [value];
       if (arrayPrepend) {
@@ -3537,7 +3597,18 @@ function summarizeMatch(match) {
   return parts.length > 0 ? parts.join(", ") : void 0;
 }
 function splitUrlsLocal(url) {
-  return url.split(",").map((u) => u.trim()).filter(Boolean);
+  const isValidHttp = (u) => {
+    try {
+      const parsed = new URL(u.trim());
+      return parsed.protocol === "http:" || parsed.protocol === "https:";
+    } catch {
+      return false;
+    }
+  };
+  if (!url.includes(",")) return [url.trim()];
+  const parts = url.split(",").map((u) => u.trim()).filter(Boolean);
+  if (parts.length > 1 && parts.every(isValidHttp)) return parts;
+  return [url.trim()];
 }
 function hostMatchesDomain(host, domain) {
   const h = host.toLowerCase();
@@ -3548,7 +3619,9 @@ function matchesScope(match, scope) {
   if (!match) return true;
   if (match.subscription) {
     const names = Array.isArray(match.subscription) ? match.subscription : [match.subscription];
-    if (!scope?.subName || !names.includes(scope.subName)) return false;
+    if (!scope?.subName) return false;
+    const subName = scope.subName.toLowerCase();
+    if (!names.some((n) => n.toLowerCase() === subName)) return false;
   }
   if (match["url-domain"]) {
     const domains = Array.isArray(match["url-domain"]) ? match["url-domain"] : [match["url-domain"]];
@@ -3672,23 +3745,63 @@ function hasFlag(args, short, long) {
 }
 function parseIntArg(args, short, long, defaultValue) {
   if (!args) return defaultValue;
+  const parse = (raw, flag) => {
+    if (!/^\d+$/.test(raw.trim())) {
+      throw new CliError(`\u9009\u9879 ${flag} \u9700\u8981\u6B63\u6574\u6570\uFF0C\u6536\u5230 "${raw}"`, { hint: [`\u4F8B\u5982: ${flag} ${defaultValue}`] });
+    }
+    const val = Number(raw);
+    if (!Number.isSafeInteger(val) || val < 1) {
+      throw new CliError(`\u9009\u9879 ${flag} \u9700\u8981 >= 1 \u7684\u6574\u6570\uFF0C\u6536\u5230 "${raw}"`, { hint: [`\u4F8B\u5982: ${flag} ${defaultValue}`] });
+    }
+    return val;
+  };
   for (let i = 0; i < args.length; i++) {
     if (args[i] === short || args[i] === long) {
       if (i + 1 < args.length) {
-        const val = parseInt(args[i + 1], 10);
-        return Number.isNaN(val) ? defaultValue : val;
+        return parse(args[i + 1], args[i]);
       }
-    } else if (args[i].startsWith(`${long}=`)) {
-      const val = parseInt(args[i].slice(long.length + 1), 10);
-      if (!Number.isNaN(val)) return val;
+      throw new CliError(`\u9009\u9879 ${args[i]} \u7F3A\u5C11\u503C`, { hint: [`\u4F8B\u5982: ${args[i]} ${defaultValue}`] });
+    }
+    if (args[i].startsWith(`${long}=`)) {
+      return parse(args[i].slice(long.length + 1), long);
     }
   }
   return defaultValue;
 }
-var VALUE_FLAGS = /* @__PURE__ */ new Set(["-t", "--timeout", "-j", "--concurrency", "-r", "--rounds", "-n", "--lines", "-u", "--update-timeout"]);
+function parseStringArg(args, long, short) {
+  if (!args) return null;
+  for (let i = 0; i < args.length; i++) {
+    if (args[i] === long || short !== void 0 && args[i] === short) {
+      if (i + 1 < args.length && !args[i + 1].startsWith("-")) {
+        return args[i + 1];
+      }
+      throw new CliError(`\u9009\u9879 ${args[i]} \u7F3A\u5C11\u503C`, { hint: [`\u4F8B\u5982: ${long} <\u503C>`] });
+    }
+    if (args[i].startsWith(`${long}=`)) {
+      const value = args[i].slice(long.length + 1);
+      if (!value) throw new CliError(`\u9009\u9879 ${long} \u7F3A\u5C11\u503C`, { hint: [`\u4F8B\u5982: ${long}=<\u503C>`] });
+      return value;
+    }
+  }
+  return null;
+}
+var VALUE_FLAGS = /* @__PURE__ */ new Set([
+  "-t",
+  "--timeout",
+  "-j",
+  "--concurrency",
+  "-r",
+  "--rounds",
+  "-n",
+  "--lines",
+  "-u",
+  "--update-timeout",
+  "--host",
+  "--port"
+]);
 function extractStartOptions(args) {
   if (!args) return [];
-  const BOOL_FLAGS = /* @__PURE__ */ new Set(["-s", "--no-update", "--no-clean"]);
+  const BOOL_FLAGS = /* @__PURE__ */ new Set(["-s", "--no-update", "--no-clean", "--no-tunnel"]);
   const out = [];
   for (let i = 0; i < args.length; i++) {
     const a = args[i];
@@ -3829,7 +3942,7 @@ function excludeOverwriteProxiesFromIncludeAll(config, overwriteFiles) {
   if (injectedNames.length === 0) return;
   const groups = config["proxy-groups"];
   if (!groups) return;
-  const excludePattern = injectedNames.map((n) => escapeRegExp(n)).join("|");
+  const excludePattern = `^(?:${injectedNames.map((n) => escapeRegExp(n)).join("|")})$`;
   for (const group of groups) {
     if (!group["include-all"] && !group["include-all-proxies"]) continue;
     const existing = group["exclude-filter"];
@@ -3864,7 +3977,58 @@ function getRuleTarget(rule) {
   }
   return last;
 }
+function assertConfigShape(config) {
+  const listSections = [
+    { key: "proxies", label: "\u8282\u70B9", needsName: true },
+    { key: "proxy-groups", label: "\u4EE3\u7406\u7EC4", needsName: true },
+    { key: "rules", label: "\u89C4\u5219", needsName: false }
+  ];
+  for (const { key, label, needsName } of listSections) {
+    const value = config[key];
+    if (value === void 0 || value === null) continue;
+    if (!Array.isArray(value)) {
+      throw new CliError(`${key} \u5FC5\u987B\u662F\u5217\u8868\uFF0C\u5F53\u524D\u4E3A ${typeof value === "object" ? "\u6620\u5C04" : typeof value}`, {
+        label: "\u914D\u7F6E\u9519\u8BEF",
+        hint: [
+          `${label}\u6BB5\uFF08${key}\uFF09\u9700\u5199\u6210 YAML \u5217\u8868\uFF0C\u6BCF\u9879\u4EE5 "- " \u5F00\u5934\u3002`,
+          `\u4F8B\u5982: ${key}:`,
+          key === "rules" ? "        - MATCH,DIRECT" : "        - {name: xxx, ...}"
+        ]
+      });
+    }
+    for (let i = 0; i < value.length; i++) {
+      const item = value[i];
+      if (item === null || item === void 0) {
+        throw new CliError(`${key}[${i}] \u4E3A\u7A7A`, {
+          label: "\u914D\u7F6E\u9519\u8BEF",
+          hint: [`${label}\u6BB5\uFF08${key}\uFF09\u7B2C ${i + 1} \u9879\u662F\u7A7A\u503C\uFF0C\u901A\u5E38\u662F\u5217\u8868\u91CC\u7559\u4E86\u7A7A\u7684 "- " \u884C\u3002`]
+        });
+      }
+      if (needsName) {
+        if (typeof item !== "object" || Array.isArray(item)) {
+          throw new CliError(`${key}[${i}] \u5FC5\u987B\u662F\u6620\u5C04`, {
+            label: "\u914D\u7F6E\u9519\u8BEF",
+            hint: [`${label}\u6BB5\uFF08${key}\uFF09\u7B2C ${i + 1} \u9879\u5E94\u4E3A {name: ..., ...} \u5F62\u5F0F\uFF0C\u5F53\u524D\u662F ${Array.isArray(item) ? "\u5217\u8868" : typeof item}\u3002`]
+          });
+        }
+        const name = item.name;
+        if (typeof name !== "string" || name === "") {
+          throw new CliError(`${key}[${i}] \u7F3A\u5C11\u6709\u6548\u7684 name`, {
+            label: "\u914D\u7F6E\u9519\u8BEF",
+            hint: [`${label}\u6BB5\uFF08${key}\uFF09\u7B2C ${i + 1} \u9879\u6CA1\u6709 name \u5B57\u6BB5\uFF08\u6216\u4E3A\u7A7A\uFF09\uFF0Cmihomo \u4F1A\u62D2\u7EDD\u542F\u52A8\u3002`]
+          });
+        }
+      } else if (typeof item !== "string") {
+        throw new CliError(`${key}[${i}] \u5FC5\u987B\u662F\u5B57\u7B26\u4E32`, {
+          label: "\u914D\u7F6E\u9519\u8BEF",
+          hint: [`${label}\u6BB5\uFF08${key}\uFF09\u7B2C ${i + 1} \u9879\u5E94\u4E3A\u5F62\u5982 "MATCH,DIRECT" \u7684\u5B57\u7B26\u4E32\uFF0C\u5F53\u524D\u662F ${typeof item}\u3002`]
+        });
+      }
+    }
+  }
+}
 function validateConfig(config) {
+  assertConfigShape(config);
   const warnings = [];
   const proxies = config.proxies || [];
   const groups = config["proxy-groups"] || [];
@@ -4102,12 +4266,13 @@ ${colors.cyan(colors.bold(`mihomo-cli v${VERSION}`))}`, "", "\u547D\u4EE4\u522B\
     "  mihomo start -s           # \u8DF3\u8FC7\u81EA\u52A8\u66F4\u65B0\u8BA2\u9605",
     "  mihomo start -u 30000     # \u81EA\u52A8\u66F4\u65B0\u8D85\u65F6 30 \u79D2 (\u9ED8\u8BA4 10s)",
     "  mihomo daemon on          # \u5F00\u542F\u4FDD\u6D3B\uFF08\u5F00\u673A\u81EA\u542F + \u5D29\u6E83\u91CD\u542F\uFF09",
+    "  mihomo tunnel add work --host m4 --port 1080   # \u52A0 ssh \u96A7\u9053\u51FA\u53E3",
     "  mihomo sub add <url>      # \u6DFB\u52A0\u8BA2\u9605 (sub \u662F subscription \u522B\u540D)",
     "  mihomo ui                 # \u6253\u5F00 Web UI",
     "",
     `${colors.cyan("\u5FEB\u6377\u547D\u4EE4:")}`,
     "  tun = start tun   use = sub use   on/off = ow on/off   open = dir open",
-    "  up = start   down = stop   upd/upgrade = update",
+    "  up = start   down = stop   upd/upgrade = update   ssh = tunnel",
     "",
     `${colors.cyan("\u6A21\u5F0F\u8BF4\u660E:")}`,
     "  mixed  HTTP + SOCKS5 \u6DF7\u5408\u7AEF\u53E3 (\u9ED8\u8BA4)",
@@ -4187,7 +4352,7 @@ function isProcessRunning(pid) {
 function isProcessCommandMatching(pid, needle) {
   if (!pid) return false;
   try {
-    const result = spawnSync2("ps", ["-p", String(pid), "-o", "command="], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
+    const result = spawnSync2("ps", ["-ww", "-p", String(pid), "-o", "command="], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
     return (result.stdout || "").includes(needle);
   } catch {
     return false;
@@ -4697,6 +4862,17 @@ function viewLogWithTail(logPath, options) {
 
 // src/daemon.ts
 var SERVICE_TARGET = `system/${LAUNCH_DAEMON_LABEL}`;
+function assertDaemonLabelSafe() {
+  if (RAW_DAEMON_LABEL_INPUT !== void 0 && !isValidDaemonLabel(RAW_DAEMON_LABEL_INPUT)) {
+    throw new CliError(`MIHOMO_CLI_DAEMON_LABEL \u65E0\u6548: "${RAW_DAEMON_LABEL_INPUT}"`, {
+      label: "\u914D\u7F6E\u9519\u8BEF",
+      hint: [
+        '\u53EA\u5141\u8BB8\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u70B9\u3001\u4E0B\u5212\u7EBF\u3001\u77ED\u6A2A\u7EBF\uFF0C\u4E14\u4E0D\u80FD\u542B ".."\u3002',
+        "\u8BE5\u503C\u4F1A\u6210\u4E3A /Library/LaunchDaemons/ \u4E0B\u7684 plist \u6587\u4EF6\u540D\uFF0C\u5E76\u4F5C\u4E3A root \u5199\u5165/\u5220\u9664\u7684\u76EE\u6807\u8DEF\u5F84\u3002"
+      ]
+    });
+  }
+}
 var HOT_RELOAD_TIMEOUT_MS = 5e3;
 var DAEMON_BOOT_WAIT_MS = 500;
 var LOG_ROTATE_MAX_BYTES = 10 * 1024 * 1024;
@@ -4778,6 +4954,7 @@ function isDaemonRunning(status) {
   return status.loaded && status.pid !== null;
 }
 function enableDaemon() {
+  assertDaemonLabelSafe();
   if (!fs6.existsSync(PATHS.mihomoBinary)) {
     throw new CliError("\u672A\u627E\u5230 mihomo \u5185\u6838\uFF0C\u8BF7\u5148\u4E0B\u8F7D\u5185\u6838");
   }
@@ -4818,6 +4995,7 @@ function enableDaemon() {
   }
 }
 function disableDaemon() {
+  assertDaemonLabelSafe();
   if (!isDaemonEnabled()) return;
   const target = shellQuote(SERVICE_TARGET);
   const plistDest = shellQuote(PATHS.launchDaemonPlist);
@@ -4862,7 +5040,7 @@ async function tryHotReload() {
 }
 async function restartDaemon() {
   if (!fs6.existsSync(PATHS.launchDaemonPlist)) {
-    throw new Error("\u4FDD\u6D3B\u672A\u542F\u7528\uFF0C\u65E0\u6CD5\u91CD\u542F");
+    throw new CliError("\u4FDD\u6D3B\u672A\u542F\u7528\uFF0C\u65E0\u6CD5\u91CD\u542F", { hint: "\u542F\u7528\u4FDD\u6D3B: mihomo daemon on" });
   }
   if (!logOversized() && await tryHotReload()) return;
   const target = shellQuote(SERVICE_TARGET);
@@ -4889,6 +5067,7 @@ async function restartDaemon() {
 
 // src/http.ts
 var MAX_RESPONSE_BYTES = 50 * 1024 * 1024;
+var MAX_ERROR_BODY_BYTES = 64 * 1024;
 function createHttpClient(options = {}) {
   const { timeout = 6e4, secret } = options;
   const authHeaders = secret ? { Authorization: `Bearer ${secret}` } : {};
@@ -4906,7 +5085,8 @@ function createHttpClient(options = {}) {
           const error = new Error(`HTTP ${response.status}`);
           error.response = { status: response.status };
           try {
-            error.response.data = await response.json();
+            const text2 = await readBodyWithLimit(response, controller, MAX_ERROR_BODY_BYTES);
+            error.response.data = JSON.parse(text2);
           } catch {
           }
           throw error;
@@ -4915,7 +5095,7 @@ function createHttpClient(options = {}) {
         if (Number.isFinite(declaredLen) && declaredLen > MAX_RESPONSE_BYTES) {
           throw new Error(`\u54CD\u5E94\u4F53\u8FC7\u5927\uFF08${formatBytes(declaredLen)}\uFF0C\u4E0A\u9650 ${formatBytes(MAX_RESPONSE_BYTES)}\uFF09`);
         }
-        const text = await readBodyWithLimit(response, controller);
+        const text = await readBodyWithLimit(response, controller, MAX_RESPONSE_BYTES);
         const data = config?.responseType === "json" ? JSON.parse(text) : text;
         return { data, headers: response.headers, status: response.status };
       } finally {
@@ -4924,7 +5104,7 @@ function createHttpClient(options = {}) {
     }
   };
 }
-async function readBodyWithLimit(response, controller) {
+async function readBodyWithLimit(response, controller, limit) {
   if (!response.body) return response.text();
   const reader = response.body.getReader();
   const chunks = [];
@@ -4935,9 +5115,9 @@ async function readBodyWithLimit(response, controller) {
       if (done) break;
       if (value) {
         total += value.byteLength;
-        if (total > MAX_RESPONSE_BYTES) {
+        if (total > limit) {
           controller.abort();
-          throw new Error(`\u54CD\u5E94\u4F53\u8D85\u8FC7\u5927\u5C0F\u4E0A\u9650\uFF08${formatBytes(MAX_RESPONSE_BYTES)}\uFF09`);
+          throw new Error(`\u54CD\u5E94\u4F53\u8D85\u8FC7\u5927\u5C0F\u4E0A\u9650\uFF08${formatBytes(limit)}\uFF09`);
         }
         chunks.push(value);
       }
@@ -4964,7 +5144,9 @@ function resolveUpdateInterval(url, cachedInterval) {
 }
 var HTTP_CLIENT = createHttpClient({ timeout: 6e4 });
 function isMultiUrl(url) {
-  return url.includes(",");
+  if (!url.includes(",")) return false;
+  const parts = url.split(",").map((u) => u.trim()).filter(Boolean);
+  return parts.length > 1 && parts.every(isValidHttpUrl);
 }
 function isValidHttpUrl(url) {
   try {
@@ -4975,6 +5157,7 @@ function isValidHttpUrl(url) {
   }
 }
 function splitUrls(url) {
+  if (!isMultiUrl(url)) return [url.trim()];
   return url.split(",").map((u) => u.trim()).filter(Boolean);
 }
 function loadSubscriptionConfig(subName) {
@@ -5097,6 +5280,23 @@ function pickSingleSubscription(subs, pattern) {
 function resolveSubscription(subs, pattern) {
   return pickSingleSubscription(findSubscriptionFuzzy(subs, pattern), pattern);
 }
+function assertLooksLikeSubscription(parsed, maskedUrl) {
+  const hasProxies = Array.isArray(parsed.proxies) && parsed.proxies.length > 0;
+  const hasGroups = Array.isArray(parsed["proxy-groups"]) && parsed["proxy-groups"].length > 0;
+  const providers = parsed["proxy-providers"];
+  const hasProviders = providers != null && typeof providers === "object" && Object.keys(providers).length > 0;
+  if (hasProxies || hasGroups || hasProviders) return;
+  const serverMsg = ["error", "message", "msg", "info"].map((k) => parsed[k]).find((v) => typeof v === "string" && v.length > 0);
+  throw new CliError("\u8BA2\u9605\u5185\u5BB9\u4E0D\u542B\u4EFB\u4F55\u8282\u70B9\u6765\u6E90\uFF08proxies / proxy-groups / proxy-providers \u5747\u4E3A\u7A7A\uFF09", {
+    label: "\u8BA2\u9605\u65E0\u6548",
+    hint: [
+      ...serverMsg ? [`\u670D\u52A1\u7AEF\u8FD4\u56DE: ${serverMsg}`] : [],
+      `URL: ${maskedUrl}`,
+      "\u5E38\u89C1\u539F\u56E0\uFF1A\u8BA2\u9605\u94FE\u63A5\u8FC7\u671F\u3001\u6D41\u91CF\u8017\u5C3D\u3001\u9700\u8981\u91CD\u65B0\u83B7\u53D6\u8BA2\u9605\u5730\u5740\u3002",
+      "\u78C1\u76D8\u4E0A\u539F\u6709\u7684\u8BA2\u9605\u914D\u7F6E\u672A\u88AB\u8986\u76D6\u3002"
+    ]
+  });
+}
 async function downloadSubscription(url, subName = "default", signal, persist = true) {
   let response;
   try {
@@ -5118,6 +5318,7 @@ async function downloadSubscription(url, subName = "default", signal, persist =
   }
   const parsed = parseYamlOrJson(content, "\u8BA2\u9605\u5185\u5BB9");
   if (!parsed) throw new Error("\u8BA2\u9605\u5185\u5BB9\u4E3A\u7A7A");
+  assertLooksLikeSubscription(parsed, maskUrl(url));
   if (persist) {
     saveSubscriptionRawConfig(subName, content);
   }
@@ -5150,12 +5351,13 @@ async function downloadMergedSubscription(urls, subName, signal, persist = true)
       }
     })
   );
-  for (const r of responses) {
-    if (r.error) {
-      const maskedUrl = maskUrl(r.url);
-      throw new Error(`\u5408\u5E76\u8BA2\u9605\u7B2C ${r.index + 1} \u4E2A URL \u83B7\u53D6\u5931\u8D25: ${r.error.message}
+  const failures = responses.filter((r) => r.error);
+  if (failures.length > 0) {
+    const isAbort = (e) => e.name === "AbortError" || /abort/i.test(e.message);
+    const real = failures.find((r) => !isAbort(r.error)) ?? failures[0];
+    const maskedUrl = maskUrl(real.url);
+    throw new Error(`\u5408\u5E76\u8BA2\u9605\u7B2C ${real.index + 1} \u4E2A URL \u83B7\u53D6\u5931\u8D25: ${real.error.message}
   URL: ${maskedUrl}`);
-    }
   }
   const parsed = responses.map((r, i) => {
     const content = r.response?.data;
@@ -5176,6 +5378,7 @@ async function downloadMergedSubscription(urls, subName, signal, persist = true)
   }
   base.proxies = baseProxies;
   const mergedContent = dumpYaml(base);
+  assertLooksLikeSubscription(base, urls.map((u) => maskUrl(u)).join(", "));
   if (persist) {
     saveSubscriptionRawConfig(subName, mergedContent);
   }
@@ -5465,6 +5668,9 @@ async function autoCleanSubscription(subName, options = {}) {
   return { summary, removedProxies, updatedGroups, removedGroups, skipped };
 }
 
+// src/commands/shared.ts
+import readline from "readline";
+
 // src/runtime.ts
 function getRuntimeMode() {
   if (isDaemonEnabled()) return "mixed";
@@ -5563,8 +5769,373 @@ function formatTestSummary(summary) {
   return `\u7ED3\u679C: ${colors.green(`${summary.alive} \u5B58\u6D3B`)} / ${colors.red(`${summary.dead} \u5931\u8D25`)} / ${summary.total} \u603B\u8BA1`;
 }
 
+// src/tunnel.ts
+import { spawn as spawn2 } from "child_process";
+import fs7 from "fs";
+import net from "net";
+import path6 from "path";
+var PORT_PROBE_TIMEOUT_MS = 300;
+var STOP_WAIT_ATTEMPTS = 20;
+var STOP_WAIT_INTERVAL = 100;
+var START_WAIT_ATTEMPTS = 40;
+var START_WAIT_INTERVAL = 500;
+function getReservedPorts() {
+  const reserved = /* @__PURE__ */ new Map();
+  const mixedPort = Number(BASE_CONFIG["mixed-port"]);
+  if (Number.isInteger(mixedPort)) reserved.set(mixedPort, "mihomo \u6DF7\u5408\u4EE3\u7406\u7AEF\u53E3");
+  reserved.set(CONTROLLER_PORT, "mihomo \u63A7\u5236\u5668\u7AEF\u53E3");
+  const testPort = Number(TEST_CONFIG["mixed-port"]);
+  if (Number.isInteger(testPort)) reserved.set(testPort, "\u6D4B\u901F\u5B9E\u4F8B\u4EE3\u7406\u7AEF\u53E3");
+  const testController = Number(TEST_CONTROLLER_ADDR.split(":")[1]);
+  if (Number.isInteger(testController)) reserved.set(testController, "\u6D4B\u901F\u5B9E\u4F8B\u63A7\u5236\u5668\u7AEF\u53E3");
+  return reserved;
+}
+function validateTunnelName(name) {
+  if (!name || !SAFE_NAME_RE.test(name)) {
+    throw new CliError(`\u96A7\u9053\u540D\u79F0\u65E0\u6548: "${name}"\uFF0C\u53EA\u5141\u8BB8\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u4E0B\u5212\u7EBF\u3001\u77ED\u6A2A\u7EBF\u548C\u4E2D\u6587\uFF08\u6700\u957F 64 \u5B57\u7B26\uFF09`);
+  }
+}
+var SAFE_HOST_RE = /^[A-Za-z0-9][A-Za-z0-9._@-]*$/;
+function validateTunnelHost(host) {
+  if (!host) {
+    throw new CliError("\u7F3A\u5C11 --host", { hint: ["\u4F8B\u5982: mihomo tunnel add work --host m4 --port 1080"] });
+  }
+  if (host.startsWith("-")) {
+    throw new CliError(`\u4E3B\u673A\u540D\u65E0\u6548: "${host}"`, {
+      label: "\u53C2\u6570\u9519\u8BEF",
+      hint: ['\u4E3B\u673A\u540D\u4E0D\u80FD\u4EE5 "-" \u5F00\u5934\u2014\u2014\u5B83\u4F1A\u88AB ssh \u5F53\u4F5C\u9009\u9879\u89E3\u6790\uFF08\u5982 -oProxyCommand=... \u53EF\u6267\u884C\u4EFB\u610F\u547D\u4EE4\uFF09\u3002']
+    });
+  }
+  if (!SAFE_HOST_RE.test(host)) {
+    throw new CliError(`\u4E3B\u673A\u540D\u65E0\u6548: "${host}"\uFF0C\u53EA\u5141\u8BB8\u5B57\u6BCD\u3001\u6570\u5B57\u3001\u70B9\u3001\u4E0B\u5212\u7EBF\u3001\u77ED\u6A2A\u7EBF\u548C @`, {
+      label: "\u53C2\u6570\u9519\u8BEF",
+      hint: ["\u53EF\u7528 ssh \u522B\u540D\uFF08~/.ssh/config \u91CC\u7684 Host\uFF09\u6216 user@hostname\u3002"]
+    });
+  }
+}
+function validateTunnelPort(port, exclude) {
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new CliError(`\u7AEF\u53E3\u65E0\u6548: ${port}\uFF0C\u9700\u4E3A 1-65535 \u7684\u6574\u6570`);
+  }
+  const reservedLabel = getReservedPorts().get(port);
+  if (reservedLabel) {
+    throw new CliError(`\u7AEF\u53E3 ${port} \u5DF2\u88AB ${reservedLabel} \u5360\u7528`, {
+      label: "\u7AEF\u53E3\u51B2\u7A81",
+      hint: ["\u8BF7\u6362\u4E00\u4E2A\u7AEF\u53E3\uFF0C\u4F8B\u5982 1080\u3002"]
+    });
+  }
+  const conflict = getTunnels().find((t) => t.port === port && t.name !== exclude);
+  if (conflict) {
+    throw new CliError(`\u7AEF\u53E3 ${port} \u5DF2\u88AB\u96A7\u9053 "${conflict.name}" \u4F7F\u7528`, { label: "\u7AEF\u53E3\u51B2\u7A81" });
+  }
+}
+function getTunnels() {
+  const settings = readSettings();
+  const tunnels = settings.tunnels;
+  if (!Array.isArray(tunnels)) {
+    if (tunnels !== void 0) {
+      console.warn("\u8B66\u544A: settings.json \u7684 tunnels \u4E0D\u662F\u5217\u8868\uFF0C\u5DF2\u5FFD\u7565\uFF08\u53EF\u7528 mihomo tunnel add \u91CD\u65B0\u6DFB\u52A0\uFF09");
+    }
+    return [];
+  }
+  return tunnels.filter((t) => t != null && typeof t === "object" && typeof t.name === "string" && typeof t.host === "string" && Number.isInteger(t.port));
+}
+function findTunnel(name) {
+  return getTunnels().find((t) => t.name === name);
+}
+function addTunnel(config) {
+  validateTunnelName(config.name);
+  validateTunnelHost(config.host);
+  validateTunnelPort(config.port);
+  const tunnels = [...getTunnels()];
+  if (tunnels.some((t) => t.name === config.name)) {
+    throw new CliError(`\u96A7\u9053 "${config.name}" \u5DF2\u5B58\u5728\uFF0C\u8BF7\u6362\u4E2A\u540D\u79F0\uFF0C\u6216\u5148\u5220\u9664\uFF08mihomo tunnel rm ${config.name}\uFF09`);
+  }
+  tunnels.push(config);
+  writeSettings({ tunnels });
+}
+function removeTunnel(name) {
+  const tunnels = [...getTunnels()];
+  const idx = tunnels.findIndex((t) => t.name === name);
+  if (idx < 0) return false;
+  tunnels.splice(idx, 1);
+  writeSettings({ tunnels });
+  clearTunnelRuntime(name);
+  return true;
+}
+function getTunnelRuntimePath(name) {
+  validateTunnelName(name);
+  return path6.join(DIRS.tunnel, `${name}.json`);
+}
+function readTunnelRuntime(name) {
+  try {
+    const raw = fs7.readFileSync(getTunnelRuntimePath(name), "utf8");
+    const parsed = JSON.parse(raw);
+    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) return null;
+    const r = parsed;
+    if (!Number.isInteger(r.pid) || r.pid <= 0) return null;
+    return {
+      pid: r.pid,
+      started_by: r.started_by === "manual" ? "manual" : "auto",
+      started_at: typeof r.started_at === "string" ? r.started_at : "",
+      port: Number.isInteger(r.port) ? r.port : 0
+    };
+  } catch {
+    return null;
+  }
+}
+function writeTunnelRuntime(name, runtime) {
+  ensureDirs();
+  atomicWriteFileSync(getTunnelRuntimePath(name), JSON.stringify(runtime, null, 2), { mode: 384 });
+}
+function clearTunnelRuntime(name) {
+  try {
+    fs7.rmSync(getTunnelRuntimePath(name), { force: true });
+  } catch {
+  }
+}
+function buildSshArgs(tunnel) {
+  return [
+    "-D",
+    `127.0.0.1:${tunnel.port}`,
+    "-N",
+    "-o",
+    "ExitOnForwardFailure=yes",
+    "-o",
+    "BatchMode=yes",
+    "-o",
+    "ServerAliveInterval=30",
+    "-o",
+    "ServerAliveCountMax=3",
+    "-o",
+    "ConnectTimeout=15",
+    tunnel.host
+  ];
+}
+function commandNeedle(port) {
+  return `-D 127.0.0.1:${port}`;
+}
+function getTunnelLogPath(name) {
+  validateTunnelName(name);
+  return path6.join(DIRS.logs, `tunnel-${name}.log`);
+}
+function isTunnelProcessAlive(pid, port) {
+  return isProcessRunning(pid) && isProcessCommandMatching(pid, commandNeedle(port));
+}
+function isPortListening(port, timeoutMs = PORT_PROBE_TIMEOUT_MS) {
+  return new Promise((resolve) => {
+    const socket = new net.Socket();
+    let settled = false;
+    const finish = (result) => {
+      if (settled) return;
+      settled = true;
+      socket.destroy();
+      resolve(result);
+    };
+    socket.setTimeout(timeoutMs);
+    socket.once("connect", () => finish(true));
+    socket.once("timeout", () => finish(false));
+    socket.once("error", () => finish(false));
+    socket.connect(port, "127.0.0.1");
+  });
+}
+async function getTunnelStatus(config) {
+  const runtime = readTunnelRuntime(config.name);
+  const alive = runtime !== null && isTunnelProcessAlive(runtime.pid, runtime.port || config.port);
+  if (!alive) {
+    return { config, state: "stopped", pid: null, started_by: null, started_at: null };
+  }
+  const listening = await isPortListening(config.port);
+  return {
+    config,
+    state: listening ? "running" : "dead-port",
+    pid: runtime.pid,
+    started_by: runtime.started_by,
+    started_at: runtime.started_at || null
+  };
+}
+async function getAllTunnelStatus() {
+  return Promise.all(getTunnels().map(getTunnelStatus));
+}
+async function startTunnel(name, options) {
+  const config = findTunnel(name);
+  if (!config) {
+    throw new CliError(`\u672A\u627E\u5230\u96A7\u9053 "${name}"`, { hint: ["\u67E5\u770B\u5168\u90E8\u96A7\u9053: mihomo tunnel"] });
+  }
+  const existing = readTunnelRuntime(name);
+  if (existing && isTunnelProcessAlive(existing.pid, existing.port || config.port)) {
+    if (options.startedBy === "manual" && existing.started_by === "auto") {
+      writeTunnelRuntime(name, { ...existing, started_by: "manual" });
+    }
+    return { alreadyRunning: true, pid: existing.pid };
+  }
+  if (existing) clearTunnelRuntime(name);
+  if (await isPortListening(config.port)) {
+    throw new CliError(`\u7AEF\u53E3 ${config.port} \u5DF2\u88AB\u5360\u7528`, {
+      label: "\u65E0\u6CD5\u542F\u52A8\u96A7\u9053",
+      hint: [`\u53EF\u80FD\u5DF2\u6709\u96A7\u9053\u6216\u5176\u4ED6\u7A0B\u5E8F\u5728\u76D1\u542C 127.0.0.1:${config.port}\u3002`, `\u67E5\u770B\u5360\u7528: lsof -nP -iTCP:${config.port} -sTCP:LISTEN`]
+    });
+  }
+  ensureDirs();
+  const logPath = getTunnelLogPath(name);
+  const logFd = fs7.openSync(logPath, "w");
+  const child = spawn2("ssh", buildSshArgs(config), {
+    detached: true,
+    stdio: ["ignore", logFd, logFd]
+  });
+  child.on("error", () => {
+  });
+  fs7.closeSync(logFd);
+  child.unref();
+  const pid = child.pid;
+  if (!pid) {
+    throw new CliError("\u65E0\u6CD5\u521B\u5EFA ssh \u8FDB\u7A0B", { label: "\u542F\u52A8\u96A7\u9053\u5931\u8D25", hint: ["\u8BF7\u786E\u8BA4\u5DF2\u5B89\u88C5 ssh \u5BA2\u6237\u7AEF\u3002"] });
+  }
+  writeTunnelRuntime(name, {
+    pid,
+    started_by: options.startedBy,
+    started_at: (/* @__PURE__ */ new Date()).toISOString(),
+    port: config.port
+  });
+  for (let i = 0; i < START_WAIT_ATTEMPTS; i++) {
+    if (!isProcessRunning(pid)) break;
+    if (await isPortListening(config.port)) {
+      return { alreadyRunning: false, pid };
+    }
+    await new Promise((resolve) => setTimeout(resolve, START_WAIT_INTERVAL));
+  }
+  clearTunnelRuntime(name);
+  if (isProcessRunning(pid)) {
+    try {
+      process.kill(pid, "SIGKILL");
+    } catch {
+    }
+  }
+  throw new CliError("ssh \u96A7\u9053\u672A\u80FD\u5EFA\u7ACB", {
+    label: "\u542F\u52A8\u96A7\u9053\u5931\u8D25",
+    hint: [...readLogTail(logPath), `\u5B8C\u6574\u65E5\u5FD7: ${logPath}`]
+  });
+}
+function readLogTail(logPath, maxLines = 5) {
+  try {
+    const content = fs7.readFileSync(logPath, "utf8").trim();
+    if (!content) return [];
+    return content.split("\n").slice(-maxLines).map((line) => `  ${line.trim()}`);
+  } catch {
+    return [];
+  }
+}
+function stopTunnel(name) {
+  const config = findTunnel(name);
+  const runtime = readTunnelRuntime(name);
+  if (!runtime) {
+    clearTunnelRuntime(name);
+    return { notRunning: true, pid: null };
+  }
+  const port = runtime.port || config?.port || 0;
+  const { pid } = runtime;
+  if (!isTunnelProcessAlive(pid, port)) {
+    clearTunnelRuntime(name);
+    return { notRunning: true, pid: null };
+  }
+  try {
+    process.kill(pid, "SIGTERM");
+  } catch {
+  }
+  for (let i = 0; i < STOP_WAIT_ATTEMPTS; i++) {
+    if (!isProcessRunning(pid)) break;
+    sleepSync(STOP_WAIT_INTERVAL);
+  }
+  if (isProcessRunning(pid) && isProcessCommandMatching(pid, commandNeedle(port))) {
+    try {
+      process.kill(pid, "SIGKILL");
+    } catch {
+    }
+    for (let i = 0; i < STOP_WAIT_ATTEMPTS; i++) {
+      if (!isProcessRunning(pid)) break;
+      sleepSync(STOP_WAIT_INTERVAL);
+    }
+  }
+  clearTunnelRuntime(name);
+  return { notRunning: false, pid };
+}
+async function startAutoTunnels() {
+  const outcomes = [];
+  for (const tunnel of getTunnels()) {
+    if (!tunnel.auto) continue;
+    try {
+      const result = await startTunnel(tunnel.name, { startedBy: "auto" });
+      outcomes.push({ name: tunnel.name, ok: true, alreadyRunning: result.alreadyRunning });
+    } catch (e) {
+      outcomes.push({
+        name: tunnel.name,
+        ok: false,
+        error: e instanceof CliError ? e : new CliError(e.message)
+      });
+    }
+  }
+  return outcomes;
+}
+function stopAutoTunnels() {
+  const stopped = [];
+  for (const tunnel of getTunnels()) {
+    const runtime = readTunnelRuntime(tunnel.name);
+    if (runtime?.started_by !== "auto") continue;
+    const result = stopTunnel(tunnel.name);
+    if (!result.notRunning) stopped.push(tunnel.name);
+  }
+  return stopped;
+}
+function stopAllTunnels() {
+  const stopped = [];
+  for (const tunnel of getTunnels()) {
+    const result = stopTunnel(tunnel.name);
+    if (!result.notRunning) stopped.push(tunnel.name);
+  }
+  return stopped;
+}
+function getTunnelOverwritePath(name) {
+  validateTunnelName(name);
+  return path6.join(USER_DATA_DIR, `overwrite.tunnel-${name}.yaml`);
+}
+function renderTunnelOverwrite(tunnel) {
+  const proxyName = `Tunnel-${tunnel.name}-Host`;
+  const groupName = `Tunnel-${tunnel.name}`;
+  return `# mihomo-cli \u96A7\u9053\u8986\u5199\uFF08tunnel: ${tunnel.name}\uFF09
+# \u672C\u6587\u4EF6\u7531 mihomo-cli \u9996\u6B21\u521B\u5EFA\uFF0C\u4E4B\u540E\u5B8C\u5168\u7531\u4F60\u7EF4\u62A4\u2014\u2014CLI \u4E0D\u4F1A\u518D\u6539\u5199\u6216\u5220\u9664\u5B83\u3002
+#
+# ~ \u662F\u300C\u6309 name \u5C31\u5730\u5408\u5E76\u300D\u8BED\u4E49\uFF1A\u4E0E\u5176\u4ED6\u8986\u5199\u6587\u4EF6\u4E2D\u7684\u540C\u540D\u8282\u70B9/\u5206\u7EC4\u5408\u5E76\uFF0C
+# \u4E0D\u4F9D\u8D56\u6587\u4EF6\u52A0\u8F7D\u987A\u5E8F\uFF08+proxies \u5219\u4F9D\u8D56\u5B57\u6BCD\u5E8F\uFF0C\u4F1A\u88AB\u540E\u6765\u7684\u6587\u4EF6\u538B\u8FC7\u53BB\uFF09\u3002
+
+~proxies:
+  - name: ${proxyName}
+    type: socks5
+    server: 127.0.0.1
+    port: ${tunnel.port}
+
+~proxy-groups:
+  - name: ${groupName}
+    type: select
+    proxies:
+      - ${proxyName}
+      - DIRECT
+
+# \u53D6\u6D88\u6CE8\u91CA\u5E76\u586B\u5165\u9700\u8981\u8D70\u96A7\u9053\u7684\u5185\u7F51\u57DF\u540D/\u7F51\u6BB5\uFF08CLI \u65E0\u4ECE\u77E5\u9053\u4F60\u7684\u5185\u7F51\u5730\u5740\uFF09\uFF1A
+# +rules:
+#   - DOMAIN-SUFFIX,example.internal,${groupName}
+#   - IP-CIDR,10.0.0.0/8,${groupName}
+`;
+}
+function ensureTunnelOverwriteFile(tunnel) {
+  const filePath = getTunnelOverwritePath(tunnel.name);
+  if (fs7.existsSync(filePath)) return false;
+  ensureDirs();
+  atomicWriteFileSync(filePath, renderTunnelOverwrite(tunnel), { mode: 384 });
+  return true;
+}
+
 // src/commands/status.ts
-function printStatus() {
+async function printStatus() {
   const status = getStatus();
   const state = getRunningState();
   const info = getConfigInfo();
@@ -5631,6 +6202,17 @@ function printStatus() {
   if (isDaemonEnabled()) {
     console.log(`${colors.gray("\u4FDD\u6D3B: ")}${colors.green("\u5DF2\u542F\u7528")} ${colors.gray("(\u5F00\u673A\u81EA\u542F + \u5D29\u6E83\u91CD\u542F)")}`);
   }
+  const tunnels = getTunnels();
+  if (tunnels.length > 0) {
+    const statuses = await getAllTunnelStatus();
+    const parts = statuses.map((s) => {
+      const label = `${s.config.name}:${s.config.port}`;
+      if (s.state === "running") return colors.green(label);
+      if (s.state === "dead-port") return colors.yellow(`${label} \u5047\u6D3B`);
+      return colors.gray(label);
+    });
+    console.log(`${colors.gray("\u96A7\u9053: ")}${parts.join(", ")}`);
+  }
   console.log("");
 }
 
@@ -5640,23 +6222,51 @@ function handleStopResult(result) {
     throw new CliError(result.remaining.join(", "), { label: "\u90E8\u5206\u8FDB\u7A0B\u672A\u7EC8\u6B62", hint: "\u8BF7\u624B\u52A8\u8FD0\u884C: sudo pkill -9 mihomo" });
   }
 }
-async function cmdStop() {
+function stopAutoTunnelsWithLog() {
+  const stopped = stopAutoTunnels();
+  if (stopped.length > 0) {
+    console.log(`${colors.green("\u5DF2\u505C\u6B62\u96A7\u9053")}: ${stopped.join(", ")}`);
+  }
+}
+async function cmdStop(args) {
   if (isDaemonEnabled()) {
     console.log(colors.yellow("\u4FDD\u6D3B\u5DF2\u542F\u7528\uFF0C\u4EE3\u7406\u7531 launchd \u6258\u7BA1"));
     console.log("\u76F4\u63A5\u505C\u6B62\u4F1A\u88AB\u81EA\u52A8\u91CD\u65B0\u62C9\u8D77\uFF0C\u8BF7\u7528: mihomo daemon off");
     return;
   }
+  const skipTunnel = hasFlag(args, "--no-tunnel");
   const pids = getMihomoPids();
   if (pids.length === 0) {
     console.log(colors.yellow("\u4E0D\u5728\u8FD0\u884C"));
+    if (!skipTunnel) stopAutoTunnelsWithLog();
     return;
   }
   console.log(`\u505C\u6B62 ${pids.length} \u4E2A\u8FDB\u7A0B...`);
   handleStopResult(stop());
   console.log(colors.green("\u5DF2\u505C\u6B62\u8FDB\u7A0B"));
+  if (!skipTunnel) stopAutoTunnelsWithLog();
 }
 
 // src/commands/start.ts
+async function startAutoTunnelsWithWarning() {
+  const outcomes = await startAutoTunnels();
+  if (outcomes.length === 0) return;
+  const started = outcomes.filter((o) => o.ok && !o.alreadyRunning);
+  if (started.length > 0) {
+    console.log(`${colors.green("\u5DF2\u542F\u52A8\u96A7\u9053")}: ${started.map((o) => o.name).join(", ")}`);
+  }
+  for (const failed of outcomes.filter((o) => !o.ok)) {
+    console.log("");
+    console.log(colors.yellow(`\u8B66\u544A: \u96A7\u9053 "${failed.name}" \u542F\u52A8\u5931\u8D25`));
+    console.log(colors.gray(`  ${failed.error?.message ?? "\u672A\u77E5\u9519\u8BEF"}`));
+    for (const line of failed.error?.hint ?? []) {
+      if (line.trim()) console.log(colors.gray(line.startsWith("  ") ? line : `  ${line}`));
+    }
+    console.log(colors.gray("  \u5185\u7F51\u5206\u6D41\u89C4\u5219\u5C06\u4E0D\u53EF\u7528\uFF0C\u5176\u4F59\u6D41\u91CF\u6B63\u5E38"));
+    console.log(colors.gray(`  \u6392\u67E5: mihomo tunnel status ${failed.name}`));
+    console.log("");
+  }
+}
 async function cmdStart(args) {
   const modeToken = args[1] && !args[1].startsWith("-") ? args[1].toLowerCase() : void 0;
   if (modeToken !== void 0 && modeToken !== "tun" && modeToken !== "mixed") {
@@ -5675,6 +6285,7 @@ async function cmdStart(args) {
   const concurrency = parseIntArg(args, "-j", "--concurrency", DEFAULT_TEST_CONCURRENCY);
   const skipUpdate = hasFlag(args, "-s", "--no-update");
   const skipClean = hasFlag(args, "--no-clean");
+  const skipTunnel = hasFlag(args, "--no-tunnel");
   const updateTimeout = parseIntArg(args, "-u", "--update-timeout", DEFAULT_AUTO_UPDATE_TIMEOUT);
   const sub = requireActiveSubscription("\u6CA1\u6709\u8BA2\u9605\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605");
   if (!skipUpdate) {
@@ -5716,6 +6327,9 @@ async function cmdStart(args) {
     const lines = e.message.split("\n");
     throw new CliError(lines[0], { label: "\u542F\u52A8\u5931\u8D25", hint: lines.slice(1) });
   }
+  if (!skipTunnel) {
+    await startAutoTunnelsWithWarning();
+  }
   const cleanThreshold = isGithubUrl(sub.url) ? AUTO_CLEAN_THRESHOLD_GITHUB : AUTO_CLEAN_THRESHOLD;
   if (!skipClean && configInfo.proxies > cleanThreshold) {
     const cache = readSubscriptionCache();
@@ -5755,7 +6369,7 @@ async function cmdStart(args) {
       saveSubscriptionCache(sub.name, { last_auto_clean_at: (/* @__PURE__ */ new Date()).toISOString() });
     }
   }
-  printStatus();
+  await printStatus();
 }
 
 // src/commands/shared.ts
@@ -5768,6 +6382,17 @@ async function dispatchSubcommand(args, table, options) {
   }
   return options.fallback(args);
 }
+async function confirmPrompt(question) {
+  if (!process.stdin.isTTY) return false;
+  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+  const answer = await new Promise((resolve) => {
+    rl.question(`${question} (y/N) `, (a) => {
+      rl.close();
+      resolve(a);
+    });
+  });
+  return answer.toLowerCase() === "y" || answer.toLowerCase() === "yes";
+}
 function requireRunning() {
   const state = getRunningState();
   if (!state.running) {
@@ -5927,15 +6552,32 @@ function printDirectoryInfo() {
   console.log("  MIHOMO_CLI_DIR: \u81EA\u5B9A\u4E49\u6839\u76EE\u5F55\u4F4D\u7F6E");
   console.log("");
 }
-var SUBCOMMANDS2 = [{ name: "open", handler: openDirectory }];
-function cmdDirectory(args) {
-  void dispatchSubcommand(args, SUBCOMMANDS2, { fallback: printDirectoryInfo });
+var SUBCOMMANDS2 = [
+  { name: "open", handler: openDirectory },
+  { name: "list", handler: printDirectoryInfo }
+];
+async function cmdDirectory(args) {
+  await dispatchSubcommand(args, SUBCOMMANDS2, {
+    fallback: printDirectoryInfo,
+    onUnknown: (action) => {
+      const names = SUBCOMMANDS2.flatMap((c) => [c.name, ...c.aliases ?? []]);
+      const suggestion = suggestSimilar(action, names);
+      throw new CliError(`\u672A\u77E5\u7684\u76EE\u5F55\u5B50\u547D\u4EE4: ${action}`, {
+        hint: [
+          ...suggestion.length > 0 ? [`\u662F\u5426\u60F3\u8F93\u5165: ${suggestion.join(" / ")}?`] : [],
+          "",
+          "\u53EF\u7528\u5B50\u547D\u4EE4: open, list",
+          "\u6253\u5F00\u6307\u5B9A\u76EE\u5F55: mihomo dir open <target>"
+        ]
+      });
+    }
+  });
 }
 
 // src/kernel.ts
 import { spawnSync as spawnSync4 } from "child_process";
-import fs7 from "fs";
-import path6 from "path";
+import fs8 from "fs";
+import path7 from "path";
 
 // node_modules/compare-versions/lib/esm/utils.js
 var semver = /^[v^~<>=]*?(\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+)(?:\.([x*]|\d+))?(?:-([\da-z\-]+(?:\.[\da-z\-]+)*))?(?:\+[\da-z\-]+(?:\.[\da-z\-]+)*)?)?)?$/i;
@@ -6061,10 +6703,10 @@ async function checkUpdate(mirror) {
 }
 function findBinaryInDir(dir, maxDepth = 4) {
   if (maxDepth <= 0) return null;
-  const files = fs7.readdirSync(dir);
+  const files = fs8.readdirSync(dir);
   for (const f of files) {
-    const fullPath = path6.join(dir, f);
-    const stat = fs7.statSync(fullPath);
+    const fullPath = path7.join(dir, f);
+    const stat = fs8.statSync(fullPath);
     if (stat.isDirectory()) {
       const found = findBinaryInDir(fullPath, maxDepth - 1);
       if (found) return found;
@@ -6090,7 +6732,7 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
   \u5E73\u53F0: ${platform}, \u67B6\u6784: ${arch}${hint}`);
   }
   const downloadUrl = withMirror(asset.browser_download_url, mirror);
-  const tempPath = path6.join(DIRS.kernel, path6.basename(asset.name));
+  const tempPath = path7.join(DIRS.kernel, path7.basename(asset.name));
   const sizeMB = (asset.size / 1024 / 1024).toFixed(2);
   if (mirror && progressCallback) {
     progressCallback("\u63D0\u793A: \u7ECF\u7B2C\u4E09\u65B9\u955C\u50CF\u4E2D\u8F6C\u4E0B\u8F7D\uFF0C\u65E0\u6CD5\u9A8C\u8BC1\u6765\u6E90\u5B8C\u6574\u6027\uFF0C\u5EFA\u8BAE\u76F4\u8FDE\u6216\u81EA\u884C\u6821\u9A8C\u4EA7\u7269");
@@ -6111,12 +6753,12 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
   }
   if (curlResult.status !== 0) {
     try {
-      fs7.unlinkSync(tempPath);
+      fs8.unlinkSync(tempPath);
     } catch {
     }
     throw new Error(`\u4E0B\u8F7D\u5931\u8D25 (curl \u9000\u51FA\u7801 ${curlResult.status})`);
   }
-  if (!fs7.existsSync(tempPath)) {
+  if (!fs8.existsSync(tempPath)) {
     throw new Error("\u4E0B\u8F7D\u5931\u8D25: \u6587\u4EF6\u672A\u751F\u6210");
   }
   if (progressCallback) {
@@ -6139,17 +6781,17 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
       if (tarResult.error) throw tarResult.error;
       if (tarResult.status !== 0) throw new Error(`tar \u9000\u51FA\u7801 ${tarResult.status}`);
     } else if (tempPath.endsWith(".gz")) {
-      const baseName = path6.basename(tempPath, ".gz");
-      const outputPath = path6.join(extractPath, baseName);
+      const baseName = path7.basename(tempPath, ".gz");
+      const outputPath = path7.join(extractPath, baseName);
       const gzipResult = spawnSync4("gzip", ["-dc", tempPath], { maxBuffer: 256 * 1024 * 1024, timeout: 6e4 });
       if (gzipResult.error) throw gzipResult.error;
       if (gzipResult.status !== 0) throw new Error(`gzip \u9000\u51FA\u7801 ${gzipResult.status}`);
-      fs7.writeFileSync(outputPath, gzipResult.stdout, { mode: 493 });
+      fs8.writeFileSync(outputPath, gzipResult.stdout, { mode: 493 });
       extractedBinary = outputPath;
     }
   } catch (e) {
     try {
-      fs7.unlinkSync(tempPath);
+      fs8.unlinkSync(tempPath);
     } catch {
     }
     throw new Error(`\u89E3\u538B\u5931\u8D25: ${e.message}`);
@@ -6157,23 +6799,23 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
   const foundBinary = extractedBinary || findBinaryInDir(extractPath);
   if (!foundBinary) {
     try {
-      fs7.unlinkSync(tempPath);
+      fs8.unlinkSync(tempPath);
     } catch {
     }
     throw new Error("\u89E3\u538B\u540E\u672A\u627E\u5230\u53EF\u6267\u884C\u6587\u4EF6");
   }
   const targetPath = PATHS.mihomoBinary;
   if (foundBinary !== targetPath) {
-    if (fs7.existsSync(targetPath)) {
-      fs7.chmodSync(targetPath, 493);
+    if (fs8.existsSync(targetPath)) {
+      fs8.chmodSync(targetPath, 493);
       try {
-        fs7.unlinkSync(targetPath);
+        fs8.unlinkSync(targetPath);
       } catch {
       }
     }
-    fs7.renameSync(foundBinary, targetPath);
+    fs8.renameSync(foundBinary, targetPath);
   }
-  fs7.chmodSync(targetPath, 493);
+  fs8.chmodSync(targetPath, 493);
   if (progressCallback) {
     progressCallback("\u6821\u9A8C\u5185\u6838...");
   }
@@ -6181,11 +6823,11 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
   const checkOutput = `${check.stdout || ""}${check.stderr || ""}`.trim();
   if (check.error || check.status !== 0 || !/v?\d+\.\d+\.\d+/.test(checkOutput)) {
     try {
-      fs7.unlinkSync(targetPath);
+      fs8.unlinkSync(targetPath);
     } catch {
     }
     try {
-      fs7.unlinkSync(tempPath);
+      fs8.unlinkSync(tempPath);
     } catch {
     }
     throw new Error(`\u5185\u6838\u81EA\u68C0\u5931\u8D25\uFF08\u53EF\u80FD\u4E0B\u8F7D\u635F\u574F\u6216\u67B6\u6784\u4E0D\u5339\u914D\uFF09\uFF0C\u5DF2\u5220\u9664
@@ -6193,7 +6835,7 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
   \u8F93\u51FA: ${checkOutput || "(\u7A7A)"}`);
   }
   try {
-    fs7.unlinkSync(tempPath);
+    fs8.unlinkSync(tempPath);
   } catch {
   }
   clearKernelVersionCache();
@@ -6328,7 +6970,7 @@ function cmdLogs(args) {
 }
 
 // src/commands/overwrite.ts
-import path7 from "path";
+import path8 from "path";
 function printOverwriteList() {
   const info = listOverwriteFile();
   const statusText = info.enabled ? colors.green("\u5DF2\u542F\u7528") : colors.yellow("\u5DF2\u7981\u7528");
@@ -6338,8 +6980,8 @@ function printOverwriteList() {
   if (info.files.length === 0) {
     console.log("\u6682\u65E0\u8986\u5199\u6587\u4EF6");
     console.log("");
-    console.log(`\u7528\u6CD5\u793A\u4F8B: \u521B\u5EFA\u6587\u4EF6 ${path7.join(info.dir, "overwrite.yaml")}`);
-    console.log(`         \u6216        ${path7.join(info.dir, "overwrite.dns.yaml")}`);
+    console.log(`\u7528\u6CD5\u793A\u4F8B: \u521B\u5EFA\u6587\u4EF6 ${path8.join(info.dir, "overwrite.yaml")}`);
+    console.log(`         \u6216        ${path8.join(info.dir, "overwrite.dns.yaml")}`);
     console.log("");
   } else {
     console.log(`${colors.cyan("\u8986\u5199\u6587\u4EF6")} (${info.files.length} \u4E2A\uFF0C\u6309\u987A\u5E8F\u52A0\u8F7D):`);
@@ -6375,20 +7017,35 @@ async function setOverwrite(enabled, args) {
 }
 var SUBCOMMANDS3 = [
   { name: "on", aliases: ["enable"], handler: (args) => setOverwrite(true, args) },
-  { name: "off", aliases: ["disable"], handler: (args) => setOverwrite(false, args) }
+  { name: "off", aliases: ["disable"], handler: (args) => setOverwrite(false, args) },
+  // list 显式注册：onUnknown 生效后，未注册的子命令会报错，不能再靠 fallback 兜住 `ow list`
+  {
+    name: "list",
+    handler: () => {
+      console.log("");
+      printOverwriteList();
+    }
+  }
 ];
 async function cmdOverwrite(args) {
   await dispatchSubcommand(args, SUBCOMMANDS3, {
+    // 无子命令 → 列表；未知子命令 → 报错（与 sub/daemon 同构，避免 `ow onn` 静默当成 list）
     fallback: () => {
       console.log("");
       printOverwriteList();
+    },
+    onUnknown: (action) => {
+      const names = SUBCOMMANDS3.flatMap((c) => [c.name, ...c.aliases ?? []]);
+      const suggestion = suggestSimilar(action, names);
+      throw new CliError(`\u672A\u77E5\u7684\u8986\u5199\u5B50\u547D\u4EE4: ${action}`, {
+        hint: [...suggestion.length > 0 ? [`\u662F\u5426\u60F3\u8F93\u5165: ${suggestion.join(" / ")}?`] : [], "", "\u53EF\u7528\u5B50\u547D\u4EE4: on, off, list"]
+      });
     }
   });
 }
 
 // src/commands/reset.ts
-import fs8 from "fs";
-import readline from "readline";
+import fs9 from "fs";
 var RESET_TARGETS = [
   {
     id: "subs",
@@ -6421,11 +7078,29 @@ var RESET_TARGETS = [
     paths: () => [DIRS.runtime],
     needsStop: true
   },
+  {
+    // 隧道要在删 pid 文件之前先停进程（onBefore）：文件一删就再也找不到那些 ssh 进程，
+    // 它们会继续占着端口跑下去，且 CLI 无任何路径能停掉。
+    // **必须排在 settings 之前**：onAfter 会 writeSettings 重建 settings.json，
+    // 排在 settings 之后会让 `reset --full` 留下一个 {}（同 subs 的处理，见执行顺序注释）
+    id: "tunnel",
+    aliases: ["tunnel", "tunnels", "ssh"],
+    label: "\u96A7\u9053",
+    paths: () => [DIRS.tunnel],
+    needsStop: false,
+    onBefore: () => stopAllTunnels(),
+    // 同步清空 settings 里的隧道列表：只删运行态会留下「列表在但状态没了」的半重置状态。
+    // 覆写文件不动——那是用户维护的资产，由 overwrites target 负责
+    onAfter: () => writeSettings({ tunnels: void 0 })
+  },
   {
     id: "settings",
     aliases: ["setting", "settings", "config"],
     label: "\u8BBE\u7F6E",
-    paths: () => [PATHS.settingsFile],
+    // 同时删 .bak：readSettings 遇格式损坏会备份原文件（settings.ts），里面含
+    // controller_secret 与订阅 URL 的 token。只删主文件会让 "已重置: 设置" 名不副实，
+    // 凭据仍明文留在数据目录（cache.json.bak 在 subscriptions/ 内，随整目录删除，无需单列）
+    paths: () => [PATHS.settingsFile, `${PATHS.settingsFile}.bak`],
     needsStop: false
   },
   {
@@ -6445,8 +7120,8 @@ var RESET_TARGETS = [
     label: "\u8986\u5199",
     paths: () => {
       const dir = USER_DATA_DIR;
-      if (!fs8.existsSync(dir)) return [];
-      return fs8.readdirSync(dir).filter(isOverwriteFilename).map((f) => `${dir}/${f}`);
+      if (!fs9.existsSync(dir)) return [];
+      return fs9.readdirSync(dir).filter(isOverwriteFilename).map((f) => `${dir}/${f}`);
     },
     needsStop: false
   },
@@ -6475,18 +7150,9 @@ function resolveResetTargets(names) {
       unmatched.push(name);
     }
   }
+  matched.sort((a, b) => RESET_TARGETS.indexOf(a) - RESET_TARGETS.indexOf(b));
   return { matched, unmatched };
 }
-async function confirmPrompt(question) {
-  const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
-  const answer = await new Promise((resolve) => {
-    rl.question(`${question} (y/N) `, (a) => {
-      rl.close();
-      resolve(a);
-    });
-  });
-  return answer.toLowerCase() === "y" || answer.toLowerCase() === "yes";
-}
 async function cmdReset(args) {
   const flags = (args || []).filter((a) => a.startsWith("-"));
   const names = (args || []).slice(1).filter((a) => !a.startsWith("-"));
@@ -6518,7 +7184,7 @@ async function cmdReset(args) {
     }
     targets = matched;
   } else {
-    targets = RESET_TARGETS.filter((t) => !["settings", "kernel", "overwrites", "daemon"].includes(t.id));
+    targets = RESET_TARGETS.filter((t) => !["settings", "kernel", "overwrites", "daemon", "tunnel"].includes(t.id));
   }
   for (const t of targets) {
     if (t.checkEmpty?.()) {
@@ -6541,29 +7207,46 @@ async function cmdReset(args) {
     console.log(colors.yellow("\u4FDD\u6D3B\u5DF2\u542F\u7528\uFF0C\u91CD\u7F6E\u5C06\u4E00\u5E76\u5173\u95ED\u4FDD\u6D3B\uFF08\u79FB\u9664\u5F00\u673A\u81EA\u542F\uFF09"));
   }
   console.log(`\u5C06\u5220\u9664: ${targets.map((t) => t.label).join("\u3001")}`);
-  if (!skipConfirm && !await confirmPrompt("\u786E\u8BA4?")) {
-    console.log("\u5DF2\u53D6\u6D88");
-    return;
+  if (!skipConfirm) {
+    if (!process.stdin.isTTY) {
+      throw new CliError("\u975E\u4EA4\u4E92\u73AF\u5883\u65E0\u6CD5\u786E\u8BA4", { label: "\u5DF2\u53D6\u6D88", hint: ["\u8DF3\u8FC7\u786E\u8BA4\u8BF7\u52A0 -y: mihomo reset ... -y"] });
+    }
+    if (!await confirmPrompt("\u786E\u8BA4?")) {
+      console.log("\u5DF2\u53D6\u6D88");
+      return;
+    }
   }
   if (disablesDaemon && isDaemonEnabled()) {
     try {
       disableDaemon();
     } catch (e) {
-      console.error(`${colors.red("\u4FDD\u6D3B\u5173\u95ED\u5DF2\u53D6\u6D88\uFF0C\u91CD\u7F6E\u4E2D\u6B62:")} ${e.message.split("\n")[0]}`);
-      return;
+      if (e instanceof CliError) throw e;
+      throw new CliError(e.message.split("\n")[0], { label: "\u4FDD\u6D3B\u5173\u95ED\u5DF2\u53D6\u6D88\uFF0C\u91CD\u7F6E\u4E2D\u6B62" });
     }
   }
   if (needsStop && getMihomoPids().length > 0) {
     console.log("\u505C\u6B62\u8FDB\u7A0B...");
-    cleanupAll();
+    const cleanup = cleanupAll();
     for (let i = 0; i < PROCESS_WAIT_ATTEMPTS; i++) {
       if (getMihomoPids().length === 0) break;
       await new Promise((r) => setTimeout(r, PROCESS_WAIT_INTERVAL));
     }
+    const remaining = getMihomoPids();
+    if (remaining.length > 0) {
+      throw new CliError(remaining.join(", "), {
+        label: "\u8FDB\u7A0B\u672A\u80FD\u505C\u6B62\uFF0C\u91CD\u7F6E\u4E2D\u6B62",
+        hint: [
+          `\u672A\u7EC8\u6B62\u7684\u8FDB\u7A0B: ${remaining.join(", ")}${cleanup.failed > 0 ? `\uFF08${cleanup.failed} \u4E2A\u7EC8\u6B62\u5931\u8D25\uFF09` : ""}`,
+          "\u8BF7\u624B\u52A8\u8FD0\u884C: sudo pkill -9 mihomo",
+          "\u5426\u5219\u6B8B\u7559\u8FDB\u7A0B\u4F1A\u7EE7\u7EED\u4F7F\u7528\u5373\u5C06\u5220\u9664\u7684\u914D\u7F6E\u3002"
+        ]
+      });
+    }
   }
   for (const t of targets) {
+    t.onBefore?.();
     for (const p of t.paths()) {
-      if (fs8.existsSync(p)) {
+      if (fs9.existsSync(p)) {
         try {
           rmrf(p);
         } catch (e) {
@@ -6581,10 +7264,11 @@ async function cmdReset(args) {
 }
 
 // src/test-instance.ts
-import { spawn as spawn2 } from "child_process";
-import fs9 from "fs";
-import path8 from "path";
+import { spawn as spawn3 } from "child_process";
+import fs10 from "fs";
+import path9 from "path";
 function isProxyValid(proxy) {
+  if (proxy === null || typeof proxy !== "object") return false;
   if (!proxy.name || !proxy.server || !proxy.port) return false;
   if (!proxy.type) return false;
   if (proxy.type === "ss" && typeof proxy.cipher === "string" && proxy.cipher.startsWith("2022-blake3")) {
@@ -6593,20 +7277,20 @@ function isProxyValid(proxy) {
   }
   return true;
 }
-var TEST_DIR = path8.join(USER_DATA_DIR, "test");
+var TEST_DIR = path9.join(USER_DATA_DIR, "test");
 var TEST_DIRS = {
-  data: path8.join(TEST_DIR, "data"),
-  runtime: path8.join(TEST_DIR, "runtime")
+  data: path9.join(TEST_DIR, "data"),
+  runtime: path9.join(TEST_DIR, "runtime")
 };
 var TEST_PATHS = {
-  configFile: path8.join(TEST_DIRS.runtime, "config.yaml"),
-  pidFile: path8.join(TEST_DIRS.runtime, "pid"),
-  logFile: path8.join(TEST_DIR, "test.log")
+  configFile: path9.join(TEST_DIRS.runtime, "config.yaml"),
+  pidFile: path9.join(TEST_DIRS.runtime, "pid"),
+  logFile: path9.join(TEST_DIR, "test.log")
 };
 var TEST_API = `http://${TEST_CONFIG["external-controller"]}`;
 function ensureTestDirs() {
   for (const dir of Object.values(TEST_DIRS)) {
-    fs9.mkdirSync(dir, { recursive: true, mode: 448 });
+    fs10.mkdirSync(dir, { recursive: true, mode: 448 });
   }
 }
 function cleanupTestDir() {
@@ -6644,24 +7328,25 @@ function buildTestConfig(subName) {
     rules: ["MATCH,PROXY"]
   };
   const content = dumpYaml(config);
-  fs9.writeFileSync(TEST_PATHS.configFile, content, { mode: 384 });
+  fs10.writeFileSync(TEST_PATHS.configFile, content, { mode: 384 });
 }
 async function startTestInstance() {
   const binary = PATHS.mihomoBinary;
-  if (!fs9.existsSync(binary)) throw new CliError('\u672A\u627E\u5230 mihomo \u5185\u6838\uFF0C\u8BF7\u5148\u8FD0\u884C "mihomo kernel" \u4E0B\u8F7D');
+  if (!fs10.existsSync(binary)) throw new CliError('\u672A\u627E\u5230 mihomo \u5185\u6838\uFF0C\u8BF7\u5148\u8FD0\u884C "mihomo kernel" \u4E0B\u8F7D');
   stopTestInstance();
-  const logFd = fs9.openSync(TEST_PATHS.logFile, "a");
-  const child = spawn2(binary, ["-d", TEST_DIRS.data, "-f", TEST_PATHS.configFile], {
+  const logFd = fs10.openSync(TEST_PATHS.logFile, "a");
+  const child = spawn3(binary, ["-d", TEST_DIRS.data, "-f", TEST_PATHS.configFile], {
     detached: true,
     stdio: ["ignore", logFd, logFd]
   });
   child.on("error", () => {
   });
-  fs9.closeSync(logFd);
+  fs10.closeSync(logFd);
   child.unref();
   const pid = child.pid;
   if (!pid) throw new CliError("\u6D4B\u8BD5\u5B9E\u4F8B\u542F\u52A8\u5931\u8D25\uFF1A\u65E0\u6CD5\u521B\u5EFA\u8FDB\u7A0B\uFF08\u5185\u6838\u4E8C\u8FDB\u5236\u53EF\u80FD\u4E0D\u53EF\u6267\u884C\uFF09");
-  fs9.writeFileSync(TEST_PATHS.pidFile, pid.toString(), { mode: 384 });
+  spawnedTestPid = pid;
+  fs10.writeFileSync(TEST_PATHS.pidFile, pid.toString(), { mode: 384 });
   const client = createHttpClient({ timeout: 2e3 });
   let ready = false;
   for (let i = 0; i < 60; i++) {
@@ -6677,7 +7362,7 @@ async function startTestInstance() {
   if (!isProcessRunning(pid)) {
     let errorDetail = "";
     try {
-      errorDetail = fs9.readFileSync(TEST_PATHS.logFile, "utf8").slice(-1e3);
+      errorDetail = fs10.readFileSync(TEST_PATHS.logFile, "utf8").slice(-1e3);
     } catch {
     }
     throw new CliError(`\u6D4B\u8BD5\u5B9E\u4F8B\u542F\u52A8\u5931\u8D25${errorDetail ? `
@@ -6687,13 +7372,16 @@ ${errorDetail}` : ""}`);
     throw new CliError("\u6D4B\u8BD5\u5B9E\u4F8B\u542F\u52A8\u8D85\u65F6\uFF0CAPI \u672A\u54CD\u5E94");
   }
 }
+var spawnedTestPid = null;
 function stopTestInstance() {
-  let pid;
+  let pid = null;
   try {
-    pid = parseInt(fs9.readFileSync(TEST_PATHS.pidFile, "utf8").trim(), 10);
+    const fromFile = parseInt(fs10.readFileSync(TEST_PATHS.pidFile, "utf8").trim(), 10);
+    if (fromFile > 0) pid = fromFile;
   } catch {
-    return;
   }
+  if (pid === null) pid = spawnedTestPid;
+  if (pid === null) return;
   if (pid > 0 && isProcessRunning(pid) && isProcessCommandMatching(pid, TEST_PATHS.configFile)) {
     process.kill(pid, "SIGKILL");
     for (let i = 0; i < 20; i++) {
@@ -6701,8 +7389,9 @@ function stopTestInstance() {
       sleepSync(100);
     }
   }
+  spawnedTestPid = null;
   try {
-    fs9.unlinkSync(TEST_PATHS.pidFile);
+    fs10.unlinkSync(TEST_PATHS.pidFile);
   } catch {
   }
 }
@@ -6824,11 +7513,12 @@ async function subAdd(args) {
     console.log(`\u6DFB\u52A0\u5408\u5E76\u8BA2\u9605: ${name} (${urls.length} \u4E2A\u6E90)`);
     addSubscription(normalizedUrl, name);
     try {
-      setDefaultSubscription(name);
       const info = await downloadMergedSubscription(urls, name);
+      setDefaultSubscription(name);
       console.log(`\u5DF2\u6DFB\u52A0\u5E76\u5207\u6362\u5230 "${name}" (${formatProxySummary(info)}, \u5408\u5E76 ${urls.length} \u6E90)`);
     } catch (e) {
       removeSubscription(name);
+      if (e instanceof CliError) throw new CliError(e.message, { label: "\u6DFB\u52A0\u5931\u8D25", hint: e.hint });
       throw new CliError(e.message, { label: "\u6DFB\u52A0\u5931\u8D25" });
     }
   } else {
@@ -6838,13 +7528,14 @@ async function subAdd(args) {
     console.log(`\u6DFB\u52A0\u8BA2\u9605: ${name}`);
     addSubscription(url, name);
     try {
-      setDefaultSubscription(name);
       const info = await downloadSubscription(url, name);
+      setDefaultSubscription(name);
       const repoUrl = githubRepoUrl(url);
       if (repoUrl) saveSubscriptionCache(name, { web_page_url: repoUrl });
       console.log(`\u5DF2\u6DFB\u52A0\u5E76\u5207\u6362\u5230 "${name}" (${formatProxySummary(info)})`);
     } catch (e) {
       removeSubscription(name);
+      if (e instanceof CliError) throw new CliError(e.message, { label: "\u6DFB\u52A0\u5931\u8D25", hint: e.hint });
       throw new CliError(e.message, { label: "\u6DFB\u52A0\u5931\u8D25" });
     }
   }
@@ -6941,8 +7632,8 @@ async function subWeb(args) {
     console.log("\u8BF7\u624B\u52A8\u8BBF\u95EE\u4E0A\u9762\u7684\u5730\u5740");
   }
 }
-function subRemove(args) {
-  const name = args[2];
+async function subRemove(args) {
+  const name = getNonFlagArg(args, 2);
   const subs = getSubscriptions();
   if (!name) {
     throw new CliError("\u8BF7\u6307\u5B9A\u8981\u5220\u9664\u7684\u8BA2\u9605\u540D\u79F0", {
@@ -6950,6 +7641,21 @@ function subRemove(args) {
     });
   }
   const target = resolveSubscription(subs, name);
+  const isExact = target.name === name;
+  const skipConfirm = hasFlag(args, "-y", "--yes");
+  if (!isExact && !skipConfirm) {
+    if (!process.stdin.isTTY) {
+      throw new CliError(`\u6A21\u7CCA\u5339\u914D\u5230 "${target.name}"\uFF0C\u975E\u4EA4\u4E92\u73AF\u5883\u9700\u786E\u8BA4`, {
+        label: "\u5DF2\u53D6\u6D88",
+        hint: [`\u8BF7\u7528\u5B8C\u6574\u540D\u79F0: mihomo sub remove ${target.name}`, `\u6216\u8DF3\u8FC7\u786E\u8BA4: mihomo sub remove ${name} -y`]
+      });
+    }
+    console.log(`\u5C06\u5220\u9664\u8BA2\u9605 "${target.name}" (\u6A21\u7CCA\u5339\u914D "${name}")`);
+    if (!await confirmPrompt("\u6B64\u64CD\u4F5C\u4E0D\u53EF\u6062\u590D\uFF0C\u786E\u8BA4?")) {
+      console.log("\u5DF2\u53D6\u6D88");
+      return;
+    }
+  }
   const switchedTo = removeSubscription(target.name);
   console.log(`\u5DF2\u5220\u9664\u8BA2\u9605 "${target.name}"`);
   if (switchedTo) {
@@ -7031,10 +7737,10 @@ async function cmdSubscription(args) {
 
 // src/commands/test.ts
 async function cmdTest(args) {
-  requireRunning();
-  const activeSub = requireActiveSubscription("\u6CA1\u6709\u6D3B\u8DC3\u8BA2\u9605");
   const timeout = parseIntArg(args, "-t", "--timeout", DEFAULT_TEST_TIMEOUT);
   const concurrency = parseIntArg(args, "-j", "--concurrency", DEFAULT_TEST_CONCURRENCY);
+  requireRunning();
+  const activeSub = requireActiveSubscription("\u6CA1\u6709\u6D3B\u8DC3\u8BA2\u9605");
   console.log(`\u6D4B\u8BD5 "${activeSub.name}" \u8282\u70B9\u8FDE\u901A\u6027...`);
   console.log(`\u8D85\u65F6: ${timeout}ms  \u5E76\u53D1: ${concurrency}`);
   console.log("");
@@ -7048,11 +7754,11 @@ async function cmdTest(args) {
   console.log(formatTestSummary(summary));
 }
 async function cmdClean(args) {
-  requireRunning();
-  const activeSub = requireActiveSubscription("\u6CA1\u6709\u6D3B\u8DC3\u8BA2\u9605");
   const timeout = parseIntArg(args, "-t", "--timeout", DEFAULT_TEST_TIMEOUT);
   const concurrency = parseIntArg(args, "-j", "--concurrency", DEFAULT_TEST_CONCURRENCY);
   const rounds = parseIntArg(args, "-r", "--rounds", DEFAULT_CLEAN_ROUNDS);
+  requireRunning();
+  const activeSub = requireActiveSubscription("\u6CA1\u6709\u6D3B\u8DC3\u8BA2\u9605");
   console.log(`\u6E05\u7406 "${activeSub.name}" \u5931\u8D25\u8282\u70B9...`);
   console.log(`\u8D85\u65F6: ${timeout}ms  \u5E76\u53D1: ${concurrency}`);
   console.log("");
@@ -7095,6 +7801,224 @@ async function cmdClean(args) {
   }
 }
 
+// src/commands/tunnel.ts
+function formatState(status) {
+  switch (status.state) {
+    case "running":
+      return colors.green(`\u8FD0\u884C\u4E2D (PID ${status.pid})`);
+    case "dead-port":
+      return colors.yellow(`\u5047\u6D3B (PID ${status.pid}\uFF0C\u7AEF\u53E3 ${status.config.port} \u4E0D\u901A)`);
+    default:
+      return colors.yellow("\u672A\u8FD0\u884C");
+  }
+}
+function getTunnelNameArg(args) {
+  return getNonFlagArg(args, 2);
+}
+function requireTunnelNameArg(args, usage) {
+  const name = getTunnelNameArg(args);
+  if (!name) {
+    const tunnels = getTunnels();
+    throw new CliError("\u8BF7\u6307\u5B9A\u96A7\u9053\u540D\u79F0", {
+      hint: [usage, ...tunnels.length > 0 ? ["", "\u53EF\u7528\u96A7\u9053:", ...tunnels.map((t) => `  ${t.name}`)] : []]
+    });
+  }
+  return name;
+}
+async function printTunnelList() {
+  const tunnels = getTunnels();
+  console.log("");
+  if (tunnels.length === 0) {
+    console.log("\u6CA1\u6709\u914D\u7F6E\u96A7\u9053");
+    console.log("");
+    console.log("\u6DFB\u52A0\u96A7\u9053: mihomo tunnel add <\u540D\u5B57> --host <ssh\u4E3B\u673A> --port <\u7AEF\u53E3>");
+    console.log(colors.gray("  \u4F8B\u5982: mihomo tunnel add work --host m4 --port 1080"));
+    console.log(colors.gray("  \u96A7\u9053\u628A\u5185\u7F51\u51FA\u53E3\u66B4\u9732\u4E3A\u672C\u5730 SOCKS5\uFF0C\u914D\u5408\u8986\u5199\u6587\u4EF6\u5206\u6D41\u5185\u7F51\u57DF\u540D"));
+    console.log("");
+    return;
+  }
+  const statuses = await getAllTunnelStatus();
+  console.log(colors.cyan("\u96A7\u9053\u5217\u8868:"));
+  console.log("");
+  for (const status of statuses) {
+    const { config } = status;
+    const autoLabel = config.auto ? colors.gray(" [auto]") : "";
+    console.log(`  ${colors.bold(config.name)}${autoLabel}`);
+    console.log(`    ${colors.gray("\u51FA\u53E3: ")}${config.host} \u2192 127.0.0.1:${config.port}`);
+    console.log(`    ${colors.gray("\u72B6\u6001: ")}${formatState(status)}`);
+    if (status.started_by) {
+      console.log(`    ${colors.gray("\u6765\u6E90: ")}${status.started_by === "auto" ? "\u968F start \u62C9\u8D77" : "\u624B\u52A8\u542F\u52A8"}`);
+    }
+  }
+  console.log("");
+  console.log("\u542F\u52A8: mihomo tunnel up [\u540D\u5B57]      \u505C\u6B62: mihomo tunnel down [\u540D\u5B57]");
+  console.log("\u72B6\u6001: mihomo tunnel status         \u5220\u9664: mihomo tunnel rm <\u540D\u5B57>");
+  console.log("");
+}
+async function tunnelAdd(args) {
+  const name = requireTunnelNameArg(args, "\u7528\u6CD5: mihomo tunnel add <\u540D\u5B57> --host <ssh\u4E3B\u673A> --port <\u7AEF\u53E3> [--no-auto]");
+  const host = parseStringArg(args, "--host");
+  if (!host) {
+    throw new CliError("\u7F3A\u5C11 --host", {
+      hint: ["\u7528\u6CD5: mihomo tunnel add <\u540D\u5B57> --host <ssh\u4E3B\u673A> --port <\u7AEF\u53E3>", "", "\u4E3B\u673A\u53EF\u7528 ~/.ssh/config \u91CC\u7684\u522B\u540D\uFF0C\u4F8B\u5982 --host m4"]
+    });
+  }
+  const portRaw = parseStringArg(args, "--port");
+  if (!portRaw) {
+    throw new CliError("\u7F3A\u5C11 --port", { hint: ["\u7528\u6CD5: mihomo tunnel add <\u540D\u5B57> --host <ssh\u4E3B\u673A> --port <\u7AEF\u53E3>"] });
+  }
+  if (!/^\d+$/.test(portRaw.trim())) {
+    throw new CliError(`\u7AEF\u53E3\u65E0\u6548: "${portRaw}"\uFF0C\u9700\u4E3A 1-65535 \u7684\u6574\u6570`);
+  }
+  const port = Number(portRaw.trim());
+  const auto = !hasFlag(args, "--no-auto");
+  const config = { name, host, port, auto };
+  addTunnel(config);
+  const created = ensureTunnelOverwriteFile(config);
+  const overwritePath = getTunnelOverwritePath(name);
+  console.log(`${colors.green("\u5DF2\u6DFB\u52A0\u96A7\u9053")} ${name} \xB7 ${host} \u2192 127.0.0.1:${port}${auto ? " \xB7 auto" : ""}`);
+  console.log("");
+  if (created) {
+    console.log(`\u5DF2\u751F\u6210\u8986\u5199\u6A21\u677F: ${overwritePath}`);
+    console.log(colors.gray("  \u6A21\u677F\u53EA\u5EFA\u597D socks5 \u8282\u70B9\u4E0E\u5206\u7EC4\uFF0C\u5206\u6D41\u89C4\u5219\u9700\u4F60\u586B\u5199\uFF08CLI \u65E0\u4ECE\u77E5\u9053\u4F60\u7684\u5185\u7F51\u57DF\u540D\uFF09"));
+    console.log(colors.gray("  \u7F16\u8F91\u540E\u6267\u884C mihomo start \u751F\u6548"));
+  } else {
+    console.log(`\u8986\u5199\u6587\u4EF6\u5DF2\u5B58\u5728\uFF0C\u672A\u6539\u52A8: ${overwritePath}`);
+  }
+  console.log("");
+  console.log(`\u542F\u52A8\u96A7\u9053: mihomo tunnel up ${name}`);
+  if (created) {
+    await restartToApply(args);
+  }
+}
+async function tunnelUp(args) {
+  const name = getTunnelNameArg(args);
+  const targets = name ? [resolveTunnel(name)] : getTunnels();
+  if (targets.length === 0) {
+    throw new CliError("\u6CA1\u6709\u914D\u7F6E\u96A7\u9053", { hint: ["\u6DFB\u52A0\u96A7\u9053: mihomo tunnel add <\u540D\u5B57> --host <ssh\u4E3B\u673A> --port <\u7AEF\u53E3>"] });
+  }
+  for (const config of targets) {
+    if (ensureTunnelOverwriteFile(config)) {
+      console.log(colors.gray(`\u5DF2\u8865\u5EFA\u8986\u5199\u6A21\u677F: ${getTunnelOverwritePath(config.name)}`));
+    }
+    const result = await startTunnel(config.name, { startedBy: "manual" });
+    if (result.alreadyRunning) {
+      console.log(`${colors.gray("\u5DF2\u5728\u8FD0\u884C")} ${config.name} (PID ${result.pid})`);
+    } else {
+      console.log(`${colors.green("\u5DF2\u542F\u52A8\u96A7\u9053")} ${config.name} \xB7 ${config.host} \u2192 127.0.0.1:${config.port} (PID ${result.pid})`);
+    }
+  }
+}
+function tunnelDown(args) {
+  const name = getTunnelNameArg(args);
+  const targets = name ? [resolveTunnel(name)] : getTunnels();
+  if (targets.length === 0) {
+    throw new CliError("\u6CA1\u6709\u914D\u7F6E\u96A7\u9053");
+  }
+  let stopped = 0;
+  for (const config of targets) {
+    const result = stopTunnel(config.name);
+    if (result.notRunning) {
+      console.log(`${colors.yellow("\u4E0D\u5728\u8FD0\u884C")} ${config.name}`);
+    } else {
+      console.log(`${colors.green("\u5DF2\u505C\u6B62\u96A7\u9053")} ${config.name} (PID ${result.pid})`);
+      stopped++;
+    }
+  }
+  if (stopped > 0) {
+    console.log("");
+    console.log(colors.gray("\u6CE8\u610F: \u8986\u5199\u6587\u4EF6\u4ECD\u5728\uFF0C\u914D\u7F6E\u91CC\u7684\u96A7\u9053\u8282\u70B9\u73B0\u5728\u6307\u5411\u672A\u76D1\u542C\u7684\u7AEF\u53E3"));
+  }
+}
+async function tunnelStatus(args) {
+  const name = getTunnelNameArg(args);
+  if (!name) {
+    await printTunnelList();
+    return;
+  }
+  const config = resolveTunnel(name);
+  const status = await getTunnelStatus(config);
+  console.log("");
+  console.log(`${colors.gray("\u96A7\u9053: ")}${config.name}${config.auto ? colors.gray(" [auto]") : ""}`);
+  console.log(`${colors.gray("\u51FA\u53E3: ")}${config.host} \u2192 127.0.0.1:${config.port}`);
+  console.log(`${colors.gray("\u72B6\u6001: ")}${formatState(status)}`);
+  if (status.started_by) {
+    console.log(`${colors.gray("\u6765\u6E90: ")}${status.started_by === "auto" ? "\u968F start \u62C9\u8D77" : "\u624B\u52A8\u542F\u52A8"}`);
+  }
+  console.log("");
+  if (status.state === "dead-port") {
+    console.log(colors.yellow("ssh \u8FDB\u7A0B\u8FD8\u5728\uFF0C\u4F46\u7AEF\u53E3\u6CA1\u6709\u76D1\u542C\u2014\u2014\u5185\u7F51\u5206\u6D41\u5F53\u524D\u4E0D\u53EF\u7528"));
+    console.log(`\u91CD\u542F\u96A7\u9053: mihomo tunnel down ${config.name} && mihomo tunnel up ${config.name}`);
+    console.log(colors.gray(`  \u65E5\u5FD7: ${getTunnelLogPath(config.name)}`));
+    console.log("");
+  } else if (status.state === "stopped") {
+    console.log(`\u542F\u52A8\u96A7\u9053: mihomo tunnel up ${config.name}`);
+    console.log("");
+  }
+}
+async function tunnelRemove(args) {
+  const name = requireTunnelNameArg(args, "\u7528\u6CD5: mihomo tunnel rm <\u540D\u5B57> [-y]");
+  const config = resolveTunnel(name);
+  const skipConfirm = hasFlag(args, "-y", "--yes");
+  if (!skipConfirm) {
+    if (!process.stdin.isTTY) {
+      throw new CliError("\u5220\u9664\u96A7\u9053\u9700\u8981\u786E\u8BA4", {
+        label: "\u5DF2\u53D6\u6D88",
+        hint: [`\u8DF3\u8FC7\u786E\u8BA4: mihomo tunnel rm ${config.name} -y`]
+      });
+    }
+    const confirmed = await confirmPrompt(`\u786E\u8BA4\u5220\u9664\u96A7\u9053 "${config.name}"?`);
+    if (!confirmed) {
+      console.log("\u5DF2\u53D6\u6D88");
+      return;
+    }
+  }
+  stopTunnel(config.name);
+  removeTunnel(config.name);
+  console.log(`${colors.green("\u5DF2\u5220\u9664\u96A7\u9053")} ${config.name}`);
+  console.log("");
+  console.log(`\u8986\u5199\u6587\u4EF6\u672A\u5220\u9664: ${getTunnelOverwritePath(config.name)}`);
+  console.log(colors.gray("  \u5B83\u4ECD\u4F1A\u5411\u914D\u7F6E\u6CE8\u5165\u6307\u5411\u8BE5\u7AEF\u53E3\u7684\u8282\u70B9\uFF0C\u5982\u4E0D\u518D\u9700\u8981\u8BF7\u81EA\u884C\u5220\u9664"));
+}
+function resolveTunnel(name) {
+  const config = findTunnel(name);
+  if (!config) {
+    const tunnels = getTunnels();
+    const suggestion = suggestSimilar(
+      name,
+      tunnels.map((t) => t.name)
+    );
+    throw new CliError(`\u672A\u627E\u5230\u96A7\u9053 "${name}"`, {
+      hint: [
+        ...suggestion.length > 0 ? [`\u662F\u5426\u60F3\u8F93\u5165: ${suggestion.join(" / ")}?`] : [],
+        ...tunnels.length > 0 ? ["", "\u53EF\u7528\u96A7\u9053:", ...tunnels.map((t) => `  ${t.name}`)] : ["", "\u6DFB\u52A0\u96A7\u9053: mihomo tunnel add <\u540D\u5B57> --host <ssh\u4E3B\u673A> --port <\u7AEF\u53E3>"]
+      ]
+    });
+  }
+  return config;
+}
+var SUBCOMMANDS5 = [
+  { name: "list", handler: printTunnelList },
+  { name: "add", handler: tunnelAdd },
+  { name: "up", aliases: ["start"], handler: tunnelUp },
+  { name: "down", aliases: ["stop"], handler: tunnelDown },
+  { name: "status", handler: tunnelStatus },
+  { name: "remove", aliases: ["rm", "delete"], handler: tunnelRemove }
+];
+async function cmdTunnel(args) {
+  await dispatchSubcommand(args, SUBCOMMANDS5, {
+    // 无 action → 列表；未知 action → 报错（不静默回落，否则 `tunnel upp` 会看似成功）
+    fallback: printTunnelList,
+    onUnknown: (action) => {
+      const names = SUBCOMMANDS5.flatMap((c) => [c.name, ...c.aliases ?? []]);
+      const suggestion = suggestSimilar(action, names);
+      throw new CliError(`\u672A\u77E5\u7684 tunnel \u5B50\u547D\u4EE4: ${action}`, {
+        hint: [...suggestion.length > 0 ? [`\u662F\u5426\u60F3\u8F93\u5165: ${suggestion.join(" / ")}?`] : [], "", "\u53EF\u7528\u5B50\u547D\u4EE4: list, add, up, down, status, rm"]
+      });
+    }
+  });
+}
+
 // src/commands/ui.ts
 function cmdUI(args) {
   const uiName = args[1] || "zash";
@@ -7119,7 +8043,7 @@ function cmdUI(args) {
 }
 
 // src/commands/update.ts
-import { execFile, spawn as spawn3 } from "child_process";
+import { execFile, spawn as spawn4 } from "child_process";
 import { promisify } from "util";
 var execFileAsync = promisify(execFile);
 var NPM_VIEW_TIMEOUT_MS = 15e3;
@@ -7150,7 +8074,7 @@ async function cmdUpdate() {
   console.log("\u6B63\u5728\u66F4\u65B0 mihomo-cli...");
   console.log("");
   await new Promise((resolve, reject) => {
-    const npm = spawn3("npm", ["install", "-g", PKG_NAME], { stdio: "inherit" });
+    const npm = spawn4("npm", ["install", "-g", PKG_NAME], { stdio: "inherit" });
     npm.on("close", (code) => {
       if (code === 0) {
         resolve();
@@ -7236,18 +8160,18 @@ var COMMANDS = [
   // === 订阅 ===
   {
     name: "subscription",
-    aliases: ["sub", "subscriptions"],
+    aliases: ["sub", "subs", "subscriptions"],
     handler: cmdSubscription,
     group: "subscription",
     usage: [
-      "subscription                 \u5217\u51FA\u6240\u6709\u8BA2\u9605\uFF08\u522B\u540D sub\uFF09",
+      "subscription                 \u5217\u51FA\u6240\u6709\u8BA2\u9605\uFF08\u522B\u540D sub/subs\uFF09",
       "subscription use <name>      \u5207\u6362\u5F53\u524D\u8BA2\u9605",
       "subscription add <url> [name]  \u6DFB\u52A0\u8BA2\u9605",
       "subscription update [name]   \u66F4\u65B0\u8BA2\u9605\uFF08\u65E0\u53C2\u66F4\u65B0\u6240\u6709\uFF09",
-      "subscription remove <name>   \u5220\u9664\u8BA2\u9605",
+      "subscription remove <name>   \u5220\u9664\u8BA2\u9605\uFF08\u6A21\u7CCA\u5339\u914D\u9700\u786E\u8BA4\uFF0C-y \u8DF3\u8FC7\uFF09",
       "subscription web [name]      \u6253\u5F00\u8BA2\u9605\u9875\u9762",
       "subscription test [name]     \u6D4B\u8BD5\u8282\u70B9\uFF08\u72EC\u7ACB\u5B9E\u4F8B\uFF0C\u65E0\u9700\u8FD0\u884C\uFF09",
-      "subscription clean [name]    \u6D4B\u901F\u6E05\u7406\uFF08\u72EC\u7ACB\u5B9E\u4F8B\uFF0C\u4E0D\u52A8\u4E3B\u5B9E\u4F8B\uFF09"
+      "subscription clean [name]    \u6D4B\u901F\u6E05\u7406\uFF08\u72EC\u7ACB\u5B9E\u4F8B\uFF0C\u4E0D\u52A8\u4E3B\u5B9E\u4F8B\uFF09[-r N] [-t ms] [-j N]"
     ]
   },
   {
@@ -7284,7 +8208,7 @@ var COMMANDS = [
     name: "on",
     aliases: [],
     handler: cmdOverwrite,
-    rewrite: () => ["ow", "on"],
+    rewrite: (args) => ["ow", "on", ...args.slice(1)],
     group: "config",
     usage: []
   },
@@ -7292,7 +8216,7 @@ var COMMANDS = [
     name: "off",
     aliases: [],
     handler: cmdOverwrite,
-    rewrite: () => ["ow", "off"],
+    rewrite: (args) => ["ow", "off", ...args.slice(1)],
     group: "config",
     usage: []
   },
@@ -7326,6 +8250,20 @@ var COMMANDS = [
     group: "system",
     usage: ["daemon on|off               \u5F00\u673A\u81EA\u542F + \u5D29\u6E83\u91CD\u542F\uFF08\u4EC5 Mixed\uFF0C\u9700\u7BA1\u7406\u5458\u5BC6\u7801\uFF09", "daemon status               \u67E5\u770B\u4FDD\u6D3B\u72B6\u6001"]
   },
+  {
+    // 别名不能用 tun——已被 TUN 模式快捷命令占用（注册表重复 token 会在模块加载期直接抛错）
+    name: "tunnel",
+    aliases: ["ssh", "tunnels"],
+    handler: cmdTunnel,
+    group: "system",
+    usage: [
+      "tunnel                      \u5217\u51FA ssh \u96A7\u9053\uFF08\u522B\u540D ssh\uFF09",
+      "tunnel add <\u540D\u5B57> --host <\u4E3B\u673A> --port <\u7AEF\u53E3> [--no-auto]",
+      "tunnel up|down [\u540D\u5B57]       \u542F\u52A8/\u505C\u6B62\u96A7\u9053\uFF08\u65E0\u53C2\u5373\u5168\u90E8\uFF09",
+      "tunnel status [\u540D\u5B57]        \u67E5\u770B\u96A7\u9053\u72B6\u6001\uFF08\u771F\u5B9E\u63A2\u6D4B\u7AEF\u53E3\uFF09",
+      "tunnel rm <\u540D\u5B57> [-y]       \u5220\u9664\u96A7\u9053\uFF08\u4E0D\u5220\u8986\u5199\u6587\u4EF6\uFF09"
+    ]
+  },
   {
     name: "update",
     aliases: ["upd", "upgrade"],
@@ -7411,12 +8349,27 @@ function clearProxyEnv() {
   delete process.env.all_proxy;
   delete process.env.ALL_PROXY;
 }
+var PLATFORM_FREE_COMMANDS = /* @__PURE__ */ new Set(["help", "version"]);
+function assertSupportedPlatform(commandName) {
+  if (process.platform === "darwin") return;
+  if (PLATFORM_FREE_COMMANDS.has(commandName)) return;
+  if (process.env.MIHOMO_CLI_ALLOW_ANY_PLATFORM === "1") return;
+  throw new CliError(`mihomo-cli \u76EE\u524D\u4EC5\u652F\u6301 macOS\uFF08\u5F53\u524D\u5E73\u53F0: ${process.platform}\uFF09`, {
+    label: "\u5E73\u53F0\u4E0D\u652F\u6301",
+    hint: [
+      "\u8FDB\u7A0B\u4FDD\u6D3B\u4F9D\u8D56 launchd\u3001\u76EE\u5F55/UI \u6253\u5F00\u4F9D\u8D56 open\u3001\u63D0\u6743\u4F9D\u8D56 sudo\uFF0C\u5747\u65E0\u5176\u4ED6\u5E73\u53F0\u5B9E\u73B0\u3002",
+      "Windows / Linux \u9002\u914D\u4ECD\u5728\u8FDB\u884C\u4E2D\u3002",
+      "\u5982\u9700\u5728\u975E macOS \u4E0A\u5F00\u53D1\u8C03\u8BD5\uFF0C\u53EF\u8BBE MIHOMO_CLI_ALLOW_ANY_PLATFORM=1\uFF08\u529F\u80FD\u4E0D\u4FDD\u8BC1\u53EF\u7528\uFF09\u3002"
+    ]
+  });
+}
 async function main() {
   clearProxyEnv();
-  ensureDirs();
   const args = process.argv.slice(2);
   if (args.length === 0) {
-    printStatus();
+    assertSupportedPlatform("status");
+    ensureDirs();
+    await printStatus();
     printShortHelp();
     return;
   }
@@ -7428,6 +8381,8 @@ async function main() {
       hint: [suggestion.length > 0 ? `\u662F\u5426\u60F3\u8F93\u5165: ${suggestion.join(" / ")}?` : '\u4F7F\u7528 "mihomo help" \u67E5\u770B\u5E2E\u52A9']
     });
   }
+  assertSupportedPlatform(command.name);
+  ensureDirs();
   await command.handler(command.rewrite ? command.rewrite(args) : args);
 }
 main().catch((e) => {