mihomo-cli 3.5.0 → 3.7.0

package/dist/index.js

@@ -1,7 +1,22 @@
 #!/usr/bin/env node
 
+// src/colors.ts
+var NO_COLOR = process.env.NO_COLOR !== void 0 || !process.stdout.isTTY;
+function colorize(code, str) {
+  if (NO_COLOR) return String(str);
+  return `${code + String(str)}\x1B[0m`;
+}
+var colors = {
+  bold: (s) => colorize("\x1B[1m", s),
+  red: (s) => colorize("\x1B[31m", s),
+  green: (s) => colorize("\x1B[32m", s),
+  yellow: (s) => colorize("\x1B[33m", s),
+  cyan: (s) => colorize("\x1B[36m", s),
+  gray: (s) => colorize("\x1B[90m", s)
+};
+
 // src/config.ts
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync } from "child_process";
 import fs4 from "fs";
 
 // node_modules/js-yaml/dist/js-yaml.mjs
@@ -3040,6 +3055,11 @@ var CHOMPING_STRIP = CHOMPING_MODE.STRIP;
 var CHOMPING_KEEP = CHOMPING_MODE.KEEP;
 
 // src/constants.ts
+import { createRequire } from "module";
+var require2 = createRequire(import.meta.url);
+var pkg = require2("../package.json");
+var VERSION = pkg.version;
+var PKG_NAME = pkg.name;
 var AVAILABLE_MIRRORS = ["v6.gh-proxy.org", "gh-proxy.org", "hk.gh-proxy.org", "cdn.gh-proxy.org"];
 var DEFAULT_MIRROR = "https://v6.gh-proxy.org/";
 var UI_URLS = {
@@ -3047,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}`;
@@ -3100,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";
@@ -3176,20 +3238,27 @@ 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;
@@ -3208,11 +3277,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"];
@@ -3232,6 +3297,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)) {
@@ -3261,7 +3346,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();
@@ -3274,15 +3366,15 @@ function getSubscriptionsWithCache() {
 var SAFE_NAME_RE = /^[\w\-\p{Unified_Ideograph}]{1,64}$/u;
 function validateSubscriptionName(name) {
   if (!name || !SAFE_NAME_RE.test(name)) {
-    throw new Error(`\u8BA2\u9605\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`);
+    throw new CliError(`\u8BA2\u9605\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`);
   }
 }
 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 Error(`\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`);
+    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`);
   }
   subs.push({ name, url });
   const updates = { subscriptions: subs };
@@ -3293,7 +3385,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);
@@ -3317,7 +3409,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;
@@ -3326,7 +3418,7 @@ function setDefaultSubscription(name) {
 }
 function getSubscriptionRawConfigPath(subName) {
   if (!SAFE_NAME_RE.test(subName)) {
-    throw new Error(`\u8BA2\u9605\u540D\u79F0\u65E0\u6548: "${subName}"`);
+    throw new CliError(`\u8BA2\u9605\u540D\u79F0\u65E0\u6548: "${subName}"`);
   }
   return path2.join(DIRS.subscriptions, `${subName}.yaml`);
 }
@@ -3402,6 +3494,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];
@@ -3418,6 +3522,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) {
@@ -3480,7 +3593,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();
@@ -3491,7 +3615,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"]];
@@ -3564,26 +3690,7 @@ function listOverwriteFile() {
 }
 
 // src/utils.ts
-import { spawnSync } from "child_process";
-import { createRequire } from "module";
-var require2 = createRequire(import.meta.url);
-var pkg = require2("../package.json");
-var VERSION = pkg.version;
-var MAX_RESPONSE_BYTES = 50 * 1024 * 1024;
 var sleepBuf = new Int32Array(new SharedArrayBuffer(4));
-var NO_COLOR = process.env.NO_COLOR !== void 0 || !process.stdout.isTTY;
-function colorize(code, str) {
-  if (NO_COLOR) return String(str);
-  return `${code + String(str)}\x1B[0m`;
-}
-var colors = {
-  bold: (s) => colorize("\x1B[1m", s),
-  red: (s) => colorize("\x1B[31m", s),
-  green: (s) => colorize("\x1B[32m", s),
-  yellow: (s) => colorize("\x1B[33m", s),
-  cyan: (s) => colorize("\x1B[36m", s),
-  gray: (s) => colorize("\x1B[90m", s)
-};
 function sleepSync(ms) {
   Atomics.wait(sleepBuf, 0, 0, ms);
 }
@@ -3596,39 +3703,6 @@ function escapeRegExp(s) {
 function shellQuote(s) {
   return `'${s.replace(/'/g, "'\\''")}'`;
 }
-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);
-      }
-    );
-  });
-}
 function formatBytes(bytes) {
   if (bytes === void 0 || bytes === null) return "\u672A\u77E5";
   const num = Number(bytes);
@@ -3667,15 +3741,25 @@ 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;
@@ -3708,90 +3792,35 @@ function getNonFlagArg(args, startIdx, valueFlags = VALUE_FLAGS) {
   }
   return null;
 }
-function isProcessRunning(pid) {
-  if (!pid) return false;
-  try {
-    const result = spawnSync("ps", ["-p", String(pid), "-o", "pid="], { encoding: "utf8", timeout: 5e3 });
-    return (result.stdout || "").trim().length > 0;
-  } catch {
-    return false;
-  }
-}
-function isProcessCommandMatching(pid, needle) {
-  if (!pid) return false;
-  try {
-    const result = spawnSync("ps", ["-p", String(pid), "-o", "command="], { encoding: "utf8", timeout: 5e3 });
-    return (result.stdout || "").includes(needle);
-  } catch {
-    return false;
-  }
-}
-function isProcessRoot(pid) {
-  if (!pid) return false;
-  try {
-    const result = spawnSync("ps", ["-p", String(pid), "-o", "uid="], { encoding: "utf8", timeout: 5e3 });
-    return (result.stdout || "").trim() === "0";
-  } catch {
-    return false;
-  }
-}
-function createHttpClient(options = {}) {
-  const { timeout = 6e4, secret } = options;
-  const authHeaders = secret ? { Authorization: `Bearer ${secret}` } : {};
-  return {
-    async get(url, config) {
-      const controller = new AbortController();
-      const timer = setTimeout(() => controller.abort(), timeout);
-      const signal = config?.signal ? AbortSignal.any([controller.signal, config.signal]) : controller.signal;
-      try {
-        const response = await fetch(url, {
-          signal,
-          headers: { "User-Agent": `mihomo-cli/${VERSION}`, ...authHeaders }
-        });
-        if (!response.ok) {
-          const error = new Error(`HTTP ${response.status}`);
-          error.response = { status: response.status };
-          try {
-            error.response.data = await response.json();
-          } catch {
-          }
-          throw error;
-        }
-        const declaredLen = Number(response.headers.get("content-length"));
-        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 data = config?.responseType === "json" ? JSON.parse(text) : text;
-        return { data, headers: response.headers, status: response.status };
-      } finally {
-        clearTimeout(timer);
-      }
+function levenshtein(a, b) {
+  if (a === b) return 0;
+  if (a.length === 0) return b.length;
+  if (b.length === 0) return a.length;
+  let prev = Array.from({ length: b.length + 1 }, (_, i) => i);
+  for (let i = 1; i <= a.length; i++) {
+    const curr = [i];
+    for (let j = 1; j <= b.length; j++) {
+      curr[j] = Math.min(prev[j] + 1, curr[j - 1] + 1, prev[j - 1] + (a[i - 1] === b[j - 1] ? 0 : 1));
     }
-  };
+    prev = curr;
+  }
+  return prev[b.length];
 }
-async function readBodyWithLimit(response, controller) {
-  if (!response.body) return response.text();
-  const reader = response.body.getReader();
-  const chunks = [];
-  let total = 0;
-  try {
-    while (true) {
-      const { done, value } = await reader.read();
-      if (done) break;
-      if (value) {
-        total += value.byteLength;
-        if (total > MAX_RESPONSE_BYTES) {
-          controller.abort();
-          throw new Error(`\u54CD\u5E94\u4F53\u8D85\u8FC7\u5927\u5C0F\u4E0A\u9650\uFF08${formatBytes(MAX_RESPONSE_BYTES)}\uFF09`);
-        }
-        chunks.push(value);
-      }
+function suggestSimilar(input, candidates) {
+  const lower = input.toLowerCase();
+  const scored = [];
+  for (const cand of candidates) {
+    const c = cand.toLowerCase();
+    if (cand === input) continue;
+    if (c.startsWith(lower)) {
+      scored.push({ name: cand, score: 0, lenDiff: Math.abs(cand.length - input.length) });
+    } else if (lower.length >= 3) {
+      const d = levenshtein(lower, c);
+      if (d <= 2) scored.push({ name: cand, score: d, lenDiff: Math.abs(cand.length - input.length) });
     }
-  } finally {
-    reader.releaseLock();
   }
-  return Buffer.concat(chunks).toString("utf8");
+  scored.sort((a, b) => a.score - b.score || a.lenDiff - b.lenDiff);
+  return scored.slice(0, 3).map((s) => s.name);
 }
 function normalizeMirrorUrl(val) {
   if (!val) return null;
@@ -3834,15 +3863,6 @@ function parseMirrorArg(args) {
   }
   return { mirror: null, isOverride: false, type: "download" };
 }
-function isProxyValid(proxy) {
-  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")) {
-    const pw = String(proxy.password || "");
-    if (!/^[A-Za-z0-9+/\-_]+=*$/.test(pw) || pw.length < 20) return false;
-  }
-  return true;
-}
 
 // src/config.ts
 var SAFE_YAML_LOAD_OPTIONS = { maxAliases: 200 };
@@ -3888,7 +3908,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"];
@@ -3923,7 +3943,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"] || [];
@@ -4097,7 +4168,7 @@ function getKernelVersion() {
   }
   if (kernelVersionCached) return kernelVersionCache;
   try {
-    const result = spawnSync2(PATHS.mihomoBinary, ["-v"], { encoding: "utf8", timeout: 5e3 });
+    const result = spawnSync(PATHS.mihomoBinary, ["-v"], { encoding: "utf8", timeout: 5e3 });
     const output = `${result.stdout || ""}${result.stderr || ""}`.trim();
     if (output) {
       const match = output.match(/v?[\d]+\.[\d]+\.[\d]+/);
@@ -4191,12 +4262,12 @@ function printVersion() {
 }
 
 // src/daemon.ts
-import { spawnSync as spawnSync4 } from "child_process";
+import { spawnSync as spawnSync3 } from "child_process";
 import fs6 from "fs";
 import path5 from "path";
 
 // src/process.ts
-import { spawn, spawnSync as spawnSync3 } from "child_process";
+import { spawn, spawnSync as spawnSync2 } from "child_process";
 import fs5 from "fs";
 import path4 from "path";
 
@@ -4233,6 +4304,34 @@ var SUDO_TIMEOUT_MS = 6e4;
 var TUN_MODE_POST_WAIT_MS = 500;
 var BATCH_KILL_THRESHOLD = 3;
 var DEFAULT_LOG_RETENTION_DAYS = 7;
+var PS_TIMEOUT_MS = 5e3;
+function isProcessRunning(pid) {
+  if (!pid) return false;
+  try {
+    const result = spawnSync2("ps", ["-p", String(pid), "-o", "pid="], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
+    return (result.stdout || "").trim().length > 0;
+  } catch {
+    return false;
+  }
+}
+function isProcessCommandMatching(pid, needle) {
+  if (!pid) return false;
+  try {
+    const result = spawnSync2("ps", ["-ww", "-p", String(pid), "-o", "command="], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
+    return (result.stdout || "").includes(needle);
+  } catch {
+    return false;
+  }
+}
+function isProcessRoot(pid) {
+  if (!pid) return false;
+  try {
+    const result = spawnSync2("ps", ["-p", String(pid), "-o", "uid="], { encoding: "utf8", timeout: PS_TIMEOUT_MS });
+    return (result.stdout || "").trim() === "0";
+  } catch {
+    return false;
+  }
+}
 var MAIN_INSTANCE_PATTERN = `${escapeRegExp(PATHS.mihomoBinary)}.*${escapeRegExp(PATHS.configFile)}`;
 function clearRuntime() {
   if (fs5.existsSync(DIRS.runtime)) {
@@ -4251,11 +4350,12 @@ function getPid() {
 }
 function isRunning() {
   const pid = getPid();
-  return pid ? isProcessRunning(pid) : false;
+  if (!pid) return false;
+  return isProcessRunning(pid) && isProcessCommandMatching(pid, PATHS.mihomoBinary);
 }
 function getMihomoPids() {
   try {
-    const result = spawnSync3("pgrep", ["-f", MAIN_INSTANCE_PATTERN], { encoding: "utf8", timeout: 1e4 });
+    const result = spawnSync2("pgrep", ["-f", MAIN_INSTANCE_PATTERN], { encoding: "utf8", timeout: 1e4 });
     const output = (result.stdout || "").trim();
     if (!output) return [];
     return output.split("\n").filter(Boolean).map((p) => parseInt(p, 10)).filter((p) => Number.isInteger(p) && p > 0);
@@ -4295,7 +4395,7 @@ function clearPid() {
   if (!fs5.existsSync(PATHS.pidFile)) return;
   if (isPidFileOwnedByRoot()) {
     try {
-      spawnSync3("sudo", ["rm", "-f", PATHS.pidFile], { stdio: "inherit", timeout: 1e4 });
+      spawnSync2("sudo", ["rm", "-f", PATHS.pidFile], { stdio: "inherit", timeout: 1e4 });
     } catch {
     }
   } else {
@@ -4317,14 +4417,14 @@ function killAllMihomo(forceSudo = false) {
   const pattern = MAIN_INSTANCE_PATTERN;
   if (forceSudo) {
     try {
-      spawnSync3("sudo", ["pkill", "-9", "-f", pattern], { stdio: "inherit", timeout: 15e3 });
+      spawnSync2("sudo", ["pkill", "-9", "-f", pattern], { stdio: "inherit", timeout: 15e3 });
       return true;
     } catch {
       return false;
     }
   } else {
     try {
-      spawnSync3("pkill", ["-9", "-f", pattern], { timeout: 1e4 });
+      spawnSync2("pkill", ["-9", "-f", pattern], { timeout: 1e4 });
       return true;
     } catch {
       return false;
@@ -4420,7 +4520,7 @@ exit 2
 }
 function getProcessInfo(pid) {
   try {
-    const result = spawnSync3("ps", ["-p", String(pid), "-o", "rss="], { encoding: "utf8", timeout: 5e3 });
+    const result = spawnSync2("ps", ["-p", String(pid), "-o", "rss="], { encoding: "utf8", timeout: 5e3 });
     const psOutput = (result.stdout || "").trim();
     if (!psOutput) return null;
     const rss = parseInt(psOutput, 10);
@@ -4454,11 +4554,11 @@ async function start(mode = "mixed") {
   rotateAndCleanupLogs();
   const binary = PATHS.mihomoBinary;
   if (!fs5.existsSync(binary)) {
-    throw new Error("\u672A\u627E\u5230 mihomo \u5185\u6838\uFF0C\u8BF7\u5148\u4E0B\u8F7D\u5185\u6838");
+    throw new CliError("\u672A\u627E\u5230 mihomo \u5185\u6838\uFF0C\u8BF7\u5148\u4E0B\u8F7D\u5185\u6838");
   }
   const configFile = PATHS.configFile;
   if (!fs5.existsSync(configFile)) {
-    throw new Error("\u672A\u627E\u5230\u914D\u7F6E\u6587\u4EF6\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605\u5E76\u542F\u52A8");
+    throw new CliError("\u672A\u627E\u5230\u914D\u7F6E\u6587\u4EF6\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605\u5E76\u542F\u52A8");
   }
   const staleState = checkStaleState();
   if (isTunMode) {
@@ -4535,7 +4635,7 @@ async function startTunMode(staleState) {
   }
   console.log("TUN \u6A21\u5F0F\u9700\u8981 sudo \u6743\u9650...");
   try {
-    const result = spawnSync3("sudo", [launchScript], { stdio: "inherit", timeout: SUDO_TIMEOUT_MS });
+    const result = spawnSync2("sudo", [launchScript], { stdio: "inherit", timeout: SUDO_TIMEOUT_MS });
     if (result.error) throw result.error;
     if (result.status !== 0) {
       const err = new Error("TUN \u542F\u52A8\u811A\u672C\u6267\u884C\u5931\u8D25");
@@ -4727,6 +4827,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;
@@ -4775,7 +4886,7 @@ function runSudoScript(scriptBody, opts) {
   const scriptPath = path5.join(DIRS.runtime, opts.file);
   fs6.writeFileSync(scriptPath, scriptBody, { mode: 448 });
   try {
-    const result = spawnSync4("sudo", [scriptPath], { stdio: "inherit", timeout: SUDO_TIMEOUT_MS });
+    const result = spawnSync3("sudo", [scriptPath], { stdio: "inherit", timeout: SUDO_TIMEOUT_MS });
     if (result.error) throw result.error;
     if (result.status !== 0) {
       if (result.status === 1) {
@@ -4808,11 +4919,12 @@ function isDaemonRunning(status) {
   return status.loaded && status.pid !== null;
 }
 function enableDaemon() {
+  assertDaemonLabelSafe();
   if (!fs6.existsSync(PATHS.mihomoBinary)) {
-    throw new Error("\u672A\u627E\u5230 mihomo \u5185\u6838\uFF0C\u8BF7\u5148\u4E0B\u8F7D\u5185\u6838");
+    throw new CliError("\u672A\u627E\u5230 mihomo \u5185\u6838\uFF0C\u8BF7\u5148\u4E0B\u8F7D\u5185\u6838");
   }
   if (!fs6.existsSync(PATHS.configFile)) {
-    throw new Error("\u672A\u627E\u5230\u8FD0\u884C\u65F6\u914D\u7F6E\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605");
+    throw new CliError("\u672A\u627E\u5230\u8FD0\u884C\u65F6\u914D\u7F6E\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605");
   }
   ensureDirs();
   const stagePath = path5.join(DIRS.runtime, "daemon.plist.stage");
@@ -4848,6 +4960,7 @@ function enableDaemon() {
   }
 }
 function disableDaemon() {
+  assertDaemonLabelSafe();
   if (!isDaemonEnabled()) return;
   const target = shellQuote(SERVICE_TARGET);
   const plistDest = shellQuote(PATHS.launchDaemonPlist);
@@ -4892,7 +5005,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);
@@ -4917,6 +5030,69 @@ async function restartDaemon() {
   cleanupOldLogs();
 }
 
+// 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}` } : {};
+  return {
+    async get(url, config) {
+      const controller = new AbortController();
+      const timer = setTimeout(() => controller.abort(), timeout);
+      const signal = config?.signal ? AbortSignal.any([controller.signal, config.signal]) : controller.signal;
+      try {
+        const response = await fetch(url, {
+          signal,
+          headers: { "User-Agent": `mihomo-cli/${VERSION}`, ...authHeaders }
+        });
+        if (!response.ok) {
+          const error = new Error(`HTTP ${response.status}`);
+          error.response = { status: response.status };
+          try {
+            const text2 = await readBodyWithLimit(response, controller, MAX_ERROR_BODY_BYTES);
+            error.response.data = JSON.parse(text2);
+          } catch {
+          }
+          throw error;
+        }
+        const declaredLen = Number(response.headers.get("content-length"));
+        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, MAX_RESPONSE_BYTES);
+        const data = config?.responseType === "json" ? JSON.parse(text) : text;
+        return { data, headers: response.headers, status: response.status };
+      } finally {
+        clearTimeout(timer);
+      }
+    }
+  };
+}
+async function readBodyWithLimit(response, controller, limit) {
+  if (!response.body) return response.text();
+  const reader = response.body.getReader();
+  const chunks = [];
+  let total = 0;
+  try {
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      if (value) {
+        total += value.byteLength;
+        if (total > limit) {
+          controller.abort();
+          throw new Error(`\u54CD\u5E94\u4F53\u8D85\u8FC7\u5927\u5C0F\u4E0A\u9650\uFF08${formatBytes(limit)}\uFF09`);
+        }
+        chunks.push(value);
+      }
+    }
+  } finally {
+    reader.releaseLock();
+  }
+  return Buffer.concat(chunks).toString("utf8");
+}
+
 // src/subscription.ts
 function isGithubUrl(url) {
   const githubRe = /github\.com|raw\.githubusercontent\.com/i;
@@ -4933,7 +5109,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 {
@@ -4944,12 +5122,13 @@ function isValidHttpUrl(url) {
   }
 }
 function splitUrls(url) {
+  if (!isMultiUrl(url)) return [url.trim()];
   return url.split(",").map((u) => u.trim()).filter(Boolean);
 }
 function loadSubscriptionConfig(subName) {
   const rawContent = readSubscriptionRawConfig(subName);
   if (!rawContent) {
-    throw new Error(`\u672A\u627E\u5230\u8BA2\u9605\u914D\u7F6E "${subName}"`);
+    throw new CliError(`\u672A\u627E\u5230\u8BA2\u9605\u914D\u7F6E "${subName}"\uFF0C\u8BF7\u5148\u66F4\u65B0\u8BA2\u9605\uFF08mihomo sub update ${subName}\uFF09`);
   }
   const raw = parseYamlOrJson(rawContent, "\u8BA2\u9605\u5185\u5BB9");
   return {
@@ -5066,6 +5245,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 {
@@ -5087,6 +5283,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);
   }
@@ -5119,12 +5316,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;
@@ -5145,6 +5343,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);
   }
@@ -5165,7 +5364,7 @@ async function downloadMergedSubscription(urls, subName, signal, persist = true)
 function prepareConfigForStart(mode, subName = "default") {
   const rawContent = readSubscriptionRawConfig(subName);
   if (!rawContent) {
-    throw new Error(`\u672A\u627E\u5230\u8BA2\u9605\u914D\u7F6E "${subName}"\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605`);
+    throw new CliError(`\u672A\u627E\u5230\u8BA2\u9605\u914D\u7F6E "${subName}"\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605`);
   }
   const subUrl = getSubscriptions().find((s) => s.name === subName)?.url;
   const buildResult = buildConfig(rawContent, mode, { subName, subUrl });
@@ -5434,6 +5633,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";
@@ -5574,6 +5776,18 @@ function printStatus() {
       subLine += ` (${formatProxySummary(info)})`;
     }
     console.log(subLine);
+    const cached = getSubscriptionsWithCache().find((s) => s.name === activeSub.name);
+    if (cached && (cached.download !== void 0 || cached.total !== void 0)) {
+      const used = (cached.upload || 0) + (cached.download || 0);
+      let trafficLine = `${colors.gray("\u6D41\u91CF: ")}${formatBytes(used)} / ${formatBytes(cached.total)}`;
+      if (cached.total && cached.total > 0) {
+        trafficLine += ` (${Math.min(used / cached.total * 100, 100).toFixed(1)}%)`;
+      }
+      console.log(trafficLine);
+    }
+    if (cached?.expire !== void 0) {
+      console.log(`${colors.gray("\u5230\u671F: ")}${formatTimestamp(cached.expire)}`);
+    }
   } else {
     console.log(`${colors.gray("\u8BA2\u9605: ")}\u672A\u914D\u7F6E`);
   }
@@ -5615,10 +5829,14 @@ async function cmdStop() {
 
 // src/commands/start.ts
 async function cmdStart(args) {
+  const modeToken = args[1] && !args[1].startsWith("-") ? args[1].toLowerCase() : void 0;
+  if (modeToken !== void 0 && modeToken !== "tun" && modeToken !== "mixed") {
+    throw new CliError(`\u672A\u77E5\u7684\u542F\u52A8\u6A21\u5F0F: ${args[1]}`, { hint: "\u7528\u6CD5: mihomo start [tun|mixed]\uFF08\u9ED8\u8BA4 mixed\uFF09" });
+  }
+  const targetMode = modeToken === "tun" ? "tun" : "mixed";
   if (!hasKernel()) {
     throw new CliError('\u672A\u627E\u5230\u5185\u6838\uFF0C\u8BF7\u8FD0\u884C "mihomo kernel"');
   }
-  const targetMode = args[1] === "tun" ? "tun" : "mixed";
   const daemonEnabled = isDaemonEnabled();
   if (targetMode === "tun" && daemonEnabled) {
     throw new CliError("\u4FDD\u6D3B\u5DF2\u542F\u7528\uFF08\u4EC5\u652F\u6301 Mixed \u6A21\u5F0F\uFF09\uFF0C\u65E0\u6CD5\u542F\u52A8 TUN", { hint: "\u8BF7\u5148\u5173\u95ED\u4FDD\u6D3B: mihomo daemon off" });
@@ -5721,6 +5939,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) {
@@ -5812,7 +6041,11 @@ async function cmdDaemon(args) {
     // 无 action → 显示状态；未知 action → 报错
     fallback: printStatusView,
     onUnknown: (action) => {
-      throw new CliError(`\u672A\u77E5\u7684 daemon \u5B50\u547D\u4EE4: ${action}`, { hint: ["", "\u53EF\u7528\u5B50\u547D\u4EE4: on, off, status"] });
+      const names = SUBCOMMANDS.flatMap((c) => [c.name, ...c.aliases ?? []]);
+      const suggestion = suggestSimilar(action, names);
+      throw new CliError(`\u672A\u77E5\u7684 daemon \u5B50\u547D\u4EE4: ${action}`, {
+        hint: [...suggestion.length > 0 ? [`\u662F\u5426\u60F3\u8F93\u5165: ${suggestion.join(" / ")}?`] : [], "", "\u53EF\u7528\u5B50\u547D\u4EE4: on, off, status"]
+      });
     }
   });
 }
@@ -5876,13 +6109,30 @@ 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 spawnSync5 } from "child_process";
+import { spawnSync as spawnSync4 } from "child_process";
 import fs7 from "fs";
 import path6 from "path";
 
@@ -6047,7 +6297,7 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
   if (progressCallback) {
     progressCallback(`\u4E0B\u8F7D\u5185\u6838: ${asset.name} (${sizeMB} MB)`);
   }
-  const curlResult = spawnSync5(
+  const curlResult = spawnSync4(
     "curl",
     ["-L", "--progress-bar", "--connect-timeout", "30", "--max-time", String(Math.floor(KERNEL_DOWNLOAD_TIMEOUT / 1e3)), "-o", tempPath, downloadUrl],
     { stdio: "inherit" }
@@ -6075,7 +6325,7 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
   let extractedBinary = null;
   try {
     if (tempPath.endsWith(".tar.gz") || tempPath.endsWith(".tgz")) {
-      const listResult = spawnSync5("tar", ["-tzf", tempPath], { encoding: "utf8", timeout: 6e4 });
+      const listResult = spawnSync4("tar", ["-tzf", tempPath], { encoding: "utf8", timeout: 6e4 });
       if (listResult.error) throw listResult.error;
       if (listResult.status !== 0) throw new Error(`tar \u5217\u8868\u9000\u51FA\u7801 ${listResult.status}`);
       const entries = (listResult.stdout || "").split("\n").filter(Boolean);
@@ -6084,13 +6334,13 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
           throw new Error(`\u5F52\u6863\u542B\u975E\u6CD5\u8DEF\u5F84\u6761\u76EE: ${entry}`);
         }
       }
-      const tarResult = spawnSync5("tar", ["-xzf", tempPath, "-C", extractPath], { stdio: ["ignore", "ignore", "inherit"], timeout: 6e4 });
+      const tarResult = spawnSync4("tar", ["-xzf", tempPath, "-C", extractPath], { stdio: ["ignore", "ignore", "inherit"], timeout: 6e4 });
       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 gzipResult = spawnSync5("gzip", ["-dc", tempPath], { maxBuffer: 256 * 1024 * 1024, timeout: 6e4 });
+      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 });
@@ -6126,7 +6376,7 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
   if (progressCallback) {
     progressCallback("\u6821\u9A8C\u5185\u6838...");
   }
-  const check = spawnSync5(targetPath, ["-v"], { encoding: "utf8", timeout: 5e3 });
+  const check = spawnSync4(targetPath, ["-v"], { encoding: "utf8", timeout: 5e3 });
   const checkOutput = `${check.stdout || ""}${check.stderr || ""}`.trim();
   if (check.error || check.status !== 0 || !/v?\d+\.\d+\.\d+/.test(checkOutput)) {
     try {
@@ -6171,6 +6421,9 @@ async function cmdKernel(args) {
       const result = await downloadKernel((msg) => console.log(msg), mirrorInfo.mirror, info.release);
       console.log(`
 \u5DF2\u66F4\u65B0\u5230 ${result.version}`);
+      if (getRunningState().running) {
+        console.log(colors.yellow("\u63D0\u793A: \u8FD0\u884C\u4E2D\u7684\u5185\u6838\u4ECD\u662F\u65E7\u7248\u672C\uFF0C\u6267\u884C mihomo start \u91CD\u542F\u540E\u751F\u6548"));
+      }
     }
   } catch (e) {
     if (e instanceof CliError) throw e;
@@ -6321,20 +6574,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";
 var RESET_TARGETS = [
   {
     id: "subs",
@@ -6371,7 +6639,10 @@ var RESET_TARGETS = [
     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
   },
   {
@@ -6421,18 +6692,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("-"));
@@ -6487,25 +6749,41 @@ 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) {
     for (const p of t.paths()) {
@@ -6530,6 +6808,16 @@ async function cmdReset(args) {
 import { spawn as spawn2 } from "child_process";
 import fs9 from "fs";
 import path8 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")) {
+    const pw = String(proxy.password || "");
+    if (!/^[A-Za-z0-9+/\-_]+=*$/.test(pw) || pw.length < 20) return false;
+  }
+  return true;
+}
 var TEST_DIR = path8.join(USER_DATA_DIR, "test");
 var TEST_DIRS = {
   data: path8.join(TEST_DIR, "data"),
@@ -6553,12 +6841,12 @@ function buildTestConfig(subName) {
   ensureTestDirs();
   const rawContent = readSubscriptionRawConfig(subName);
   if (!rawContent) {
-    throw new Error(`\u672A\u627E\u5230\u8BA2\u9605\u914D\u7F6E "${subName}"`);
+    throw new CliError(`\u672A\u627E\u5230\u8BA2\u9605\u914D\u7F6E "${subName}"\uFF0C\u8BF7\u5148\u66F4\u65B0\u8BA2\u9605\uFF08mihomo sub update ${subName}\uFF09`);
   }
   const parsed = parseYamlOrJson(rawContent, "\u8BA2\u9605\u5185\u5BB9");
   const proxies = (parsed.proxies || []).filter(isProxyValid);
   if (proxies.length === 0) {
-    throw new Error(`\u8BA2\u9605 "${subName}" \u6CA1\u6709\u6709\u6548\u8282\u70B9`);
+    throw new CliError(`\u8BA2\u9605 "${subName}" \u6CA1\u6709\u6709\u6548\u8282\u70B9`);
   }
   const nameCount = /* @__PURE__ */ new Map();
   for (const proxy of proxies) {
@@ -6585,7 +6873,7 @@ function buildTestConfig(subName) {
 }
 async function startTestInstance() {
   const binary = PATHS.mihomoBinary;
-  if (!fs9.existsSync(binary)) throw new Error('\u672A\u627E\u5230 mihomo \u5185\u6838\uFF0C\u8BF7\u5148\u8FD0\u884C "mihomo kernel" \u4E0B\u8F7D');
+  if (!fs9.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], {
@@ -6597,7 +6885,8 @@ async function startTestInstance() {
   fs9.closeSync(logFd);
   child.unref();
   const pid = child.pid;
-  if (!pid) throw new Error("\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");
+  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");
+  spawnedTestPid = pid;
   fs9.writeFileSync(TEST_PATHS.pidFile, pid.toString(), { mode: 384 });
   const client = createHttpClient({ timeout: 2e3 });
   let ready = false;
@@ -6617,20 +6906,23 @@ async function startTestInstance() {
       errorDetail = fs9.readFileSync(TEST_PATHS.logFile, "utf8").slice(-1e3);
     } catch {
     }
-    throw new Error(`\u6D4B\u8BD5\u5B9E\u4F8B\u542F\u52A8\u5931\u8D25${errorDetail ? `
+    throw new CliError(`\u6D4B\u8BD5\u5B9E\u4F8B\u542F\u52A8\u5931\u8D25${errorDetail ? `
 ${errorDetail}` : ""}`);
   }
   if (!ready) {
-    throw new Error("\u6D4B\u8BD5\u5B9E\u4F8B\u542F\u52A8\u8D85\u65F6\uFF0CAPI \u672A\u54CD\u5E94");
+    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(fs9.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++) {
@@ -6638,6 +6930,7 @@ function stopTestInstance() {
       sleepSync(100);
     }
   }
+  spawnedTestPid = null;
   try {
     fs9.unlinkSync(TEST_PATHS.pidFile);
   } catch {
@@ -6759,13 +7052,14 @@ async function subAdd(args) {
     }
     const normalizedUrl = urls.join(",");
     console.log(`\u6DFB\u52A0\u5408\u5E76\u8BA2\u9605: ${name} (${urls.length} \u4E2A\u6E90)`);
+    addSubscription(normalizedUrl, name);
     try {
-      addSubscription(normalizedUrl, name);
-      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 {
@@ -6773,15 +7067,16 @@ async function subAdd(args) {
       throw new CliError("\u8BF7\u63D0\u4F9B\u6709\u6548\u7684\u8BA2\u9605 URL\uFF08\u9700\u4EE5 http:// \u6216 https:// \u5F00\u5934\uFF09");
     }
     console.log(`\u6DFB\u52A0\u8BA2\u9605: ${name}`);
+    addSubscription(url, name);
     try {
-      addSubscription(url, name);
-      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" });
     }
   }
@@ -6878,8 +7173,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", {
@@ -6887,6 +7182,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) {
@@ -6956,18 +7266,22 @@ async function cmdSubscription(args) {
   await dispatchSubcommand(args, SUBCOMMANDS4, {
     // 无子命令 → 列表；未知子命令 → 报错
     fallback: printSubscriptionList,
-    onUnknown: () => {
-      throw new CliError("\u672A\u77E5\u7684\u8BA2\u9605\u547D\u4EE4", { hint: "\u7528\u6CD5: mihomo sub [list|use|add|update|remove|web|test|clean]" });
+    onUnknown: (action) => {
+      const names = SUBCOMMANDS4.flatMap((c) => [c.name, ...c.aliases ?? []]);
+      const suggestion = suggestSimilar(action, names);
+      throw new CliError(`\u672A\u77E5\u7684\u8BA2\u9605\u547D\u4EE4: ${action}`, {
+        hint: [...suggestion.length > 0 ? [`\u662F\u5426\u60F3\u8F93\u5165: ${suggestion.join(" / ")}?`] : [], "\u7528\u6CD5: mihomo sub [list|use|add|update|remove|web|test|clean]"]
+      });
     }
   });
 }
 
 // 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("");
@@ -6981,11 +7295,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("");
@@ -7034,6 +7348,10 @@ function cmdUI(args) {
   if (!Object.hasOwn(UI_URLS, uiName)) {
     throw new CliError(`\u672A\u77E5\u7684 UI "${uiName}"`, { hint: "\u53EF\u7528 UI: zash (\u9ED8\u8BA4), dash, yacd" });
   }
+  if (!getRunningState().running) {
+    console.log(colors.yellow("\u63D0\u793A: mihomo \u672A\u8FD0\u884C\uFF0CUI \u6682\u65F6\u65E0\u6CD5\u8FDE\u63A5\uFF08\u5148\u6267\u884C mihomo start \u542F\u52A8\uFF09"));
+    console.log("");
+  }
   const url = UI_URLS[uiName];
   console.log(`\u6253\u5F00 Web UI: ${uiName}`);
   console.log(`\u5730\u5740: ${url}`);
@@ -7048,16 +7366,38 @@ function cmdUI(args) {
 }
 
 // src/commands/update.ts
-import { exec, spawn as spawn3 } from "child_process";
+import { execFile, spawn as spawn3 } from "child_process";
 import { promisify } from "util";
-var execAsync = promisify(exec);
+var execFileAsync = promisify(execFile);
+var NPM_VIEW_TIMEOUT_MS = 15e3;
+async function getLatestNpmVersion() {
+  try {
+    const { stdout } = await execFileAsync("npm", ["view", PKG_NAME, "version"], { timeout: NPM_VIEW_TIMEOUT_MS });
+    const version = stdout.trim().split("\n").pop()?.trim();
+    return version || null;
+  } catch {
+    return null;
+  }
+}
 async function cmdUpdate() {
   console.log(`\u5F53\u524D\u7248\u672C: ${colors.cyan(VERSION)}`);
   console.log("");
+  console.log("\u6B63\u5728\u68C0\u67E5\u6700\u65B0\u7248\u672C...");
+  const latest = await getLatestNpmVersion();
+  if (latest && latest === VERSION) {
+    console.log(`\u5DF2\u662F\u6700\u65B0\u7248\u672C (${colors.green(VERSION)})\uFF0C\u65E0\u9700\u66F4\u65B0`);
+    return;
+  }
+  if (latest) {
+    console.log(`\u6700\u65B0\u7248\u672C: ${colors.cyan(latest)}`);
+  } else {
+    console.log(colors.yellow("\u65E0\u6CD5\u67E5\u8BE2\u6700\u65B0\u7248\u672C\uFF08\u7F51\u7EDC\u95EE\u9898\uFF1F\uFF09\uFF0C\u5C06\u76F4\u63A5\u5C1D\u8BD5\u91CD\u65B0\u5B89\u88C5"));
+  }
+  console.log("");
   console.log("\u6B63\u5728\u66F4\u65B0 mihomo-cli...");
   console.log("");
   await new Promise((resolve, reject) => {
-    const npm = spawn3("npm", ["install", "-g", "mihomo-cli"], { stdio: "inherit" });
+    const npm = spawn3("npm", ["install", "-g", PKG_NAME], { stdio: "inherit" });
     npm.on("close", (code) => {
       if (code === 0) {
         resolve();
@@ -7071,9 +7411,9 @@ async function cmdUpdate() {
     });
   });
   try {
-    const { stdout } = await execAsync("npm list -g mihomo-cli --json --depth=0");
+    const { stdout } = await execFileAsync("npm", ["list", "-g", PKG_NAME, "--json", "--depth=0"]);
     const result = JSON.parse(stdout);
-    const newVersion = result.dependencies?.["mihomo-cli"]?.version;
+    const newVersion = result.dependencies?.[PKG_NAME]?.version;
     console.log("");
     if (newVersion) {
       console.log(`\u66F4\u65B0\u5B8C\u6210\uFF0C\u6700\u65B0\u7248\u672C: ${colors.green(newVersion)}`);
@@ -7143,18 +7483,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]"
     ]
   },
   {
@@ -7191,7 +7531,7 @@ var COMMANDS = [
     name: "on",
     aliases: [],
     handler: cmdOverwrite,
-    rewrite: () => ["ow", "on"],
+    rewrite: (args) => ["ow", "on", ...args.slice(1)],
     group: "config",
     usage: []
   },
@@ -7199,7 +7539,7 @@ var COMMANDS = [
     name: "off",
     aliases: [],
     handler: cmdOverwrite,
-    rewrite: () => ["ow", "off"],
+    rewrite: (args) => ["ow", "off", ...args.slice(1)],
     group: "config",
     usage: []
   },
@@ -7278,6 +7618,9 @@ var COMMAND_INDEX = (() => {
 function findCommand(token) {
   return COMMAND_INDEX.get(token);
 }
+function allCommandTokens() {
+  return [...COMMAND_INDEX.keys()];
+}
 
 // src/index.ts
 process.on("SIGINT", () => {
@@ -7315,11 +7658,26 @@ 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) {
+    assertSupportedPlatform("status");
+    ensureDirs();
     printStatus();
     printShortHelp();
     return;
@@ -7327,8 +7685,13 @@ async function main() {
   const token = args[0].toLowerCase();
   const command = findCommand(token);
   if (!command) {
-    throw new CliError(`\u672A\u77E5\u547D\u4EE4: ${token}`, { hint: '\u4F7F\u7528 "mihomo help" \u67E5\u770B\u5E2E\u52A9' });
+    const suggestion = suggestSimilar(token, allCommandTokens());
+    throw new CliError(`\u672A\u77E5\u547D\u4EE4: ${token}`, {
+      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) => {