mihomo-cli 3.2.0 → 3.4.0

package/dist/index.js

@@ -6,7 +6,6 @@ import fs4 from "fs";
 
 // node_modules/js-yaml/dist/js-yaml.mjs
 var NOT_RESOLVED = /* @__PURE__ */ Symbol("NOT_RESOLVED");
-var MERGE_KEY = /* @__PURE__ */ Symbol("MERGE_KEY");
 function defineScalarTag(tagName, options) {
   return {
     tagName,
@@ -15,9 +14,9 @@ function defineScalarTag(tagName, options) {
     matchByTagPrefix: options.matchByTagPrefix ?? false,
     implicitFirstChars: options.implicitFirstChars ?? null,
     resolve: options.resolve,
-    identify: options.identify ?? null,
+    identify: options.identify,
     represent: options.represent ?? ((data) => String(data)),
-    representTagName: options.representTagName ?? null
+    representTagName: options.representTagName ?? (() => tagName)
   };
 }
 function defineSequenceTag(tagName, options) {
@@ -31,9 +30,9 @@ function defineSequenceTag(tagName, options) {
     addItem: options.addItem,
     finalize: options.finalize ?? ((carrier) => carrier),
     carrierIsResult,
-    identify: options.identify ?? null,
+    identify: options.identify,
     represent: options.represent ?? ((data) => data),
-    representTagName: options.representTagName ?? null
+    representTagName: options.representTagName ?? (() => tagName)
   };
 }
 function defineMappingTag(tagName, options) {
@@ -50,9 +49,9 @@ function defineMappingTag(tagName, options) {
     get: options.get,
     finalize: options.finalize ?? ((carrier) => carrier),
     carrierIsResult,
-    identify: options.identify ?? null,
+    identify: options.identify,
     represent: options.represent ?? ((data) => data),
-    representTagName: options.representTagName ?? null
+    representTagName: options.representTagName ?? (() => tagName)
   };
 }
 var strTag = defineScalarTag("tag:yaml.org,2002:str", {
@@ -401,9 +400,10 @@ var mergeTag = defineScalarTag("tag:yaml.org,2002:merge", {
   implicit: true,
   implicitFirstChars: ["<"],
   resolve: (source, isExplicit) => {
-    if (source === "<<" || isExplicit && source === "") return MERGE_KEY;
+    if (source === "<<" || isExplicit && source === "") return "<<";
     return NOT_RESOLVED;
-  }
+  },
+  identify: () => false
 });
 var BASE64_PATTERN = /^[A-Za-z0-9+/]*={0,2}$/;
 function resolveYamlBinary(source) {
@@ -426,6 +426,11 @@ var binaryTag = defineScalarTag("tag:yaml.org,2002:binary", {
 });
 var YAML_DATE_REGEXP = /* @__PURE__ */ new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9])-([0-9][0-9])$");
 var YAML_TIMESTAMP_REGEXP = /* @__PURE__ */ new RegExp("^([0-9][0-9][0-9][0-9])-([0-9][0-9]?)-([0-9][0-9]?)(?:[Tt]|[ \\t]+)([0-9][0-9]?):([0-9][0-9]):([0-9][0-9])(?:\\.([0-9]*))?(?:[ \\t]*(Z|([-+])([0-9][0-9]?)(?::([0-9][0-9]))?))?$");
+function makeUtcDate(year, month, day, hour = 0, minute = 0, second = 0, fraction = 0) {
+  const date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction));
+  date.setUTCFullYear(year, month, day);
+  return date;
+}
 function resolveYamlTimestamp(source) {
   let match = YAML_DATE_REGEXP.exec(source);
   if (match === null) match = YAML_TIMESTAMP_REGEXP.exec(source);
@@ -434,7 +439,7 @@ function resolveYamlTimestamp(source) {
   const month = +match[2] - 1;
   const day = +match[3];
   if (!match[4]) {
-    const date2 = new Date(Date.UTC(year, month, day));
+    const date2 = makeUtcDate(year, month, day);
     if (date2.getUTCFullYear() !== year || date2.getUTCMonth() !== month || date2.getUTCDate() !== day) return NOT_RESOLVED;
     return date2;
   }
@@ -448,7 +453,7 @@ function resolveYamlTimestamp(source) {
     while (value.length < 3) value += "0";
     fraction = +value;
   }
-  const date = new Date(Date.UTC(year, month, day, hour, minute, second, fraction));
+  const date = makeUtcDate(year, month, day, hour, minute, second, fraction);
   if (date.getUTCFullYear() !== year || date.getUTCMonth() !== month || date.getUTCDate() !== day) return NOT_RESOLVED;
   if (match[9]) {
     const offsetHour = +match[10];
@@ -503,7 +508,8 @@ var omapTag = defineSequenceTag("tag:yaml.org,2002:omap", {
     carrier.list.push(item);
     return "";
   },
-  finalize: (carrier) => carrier.list
+  finalize: (carrier) => carrier.list,
+  identify: () => false
 });
 var pairsTag = defineSequenceTag("tag:yaml.org,2002:pairs", {
   create: () => [],
@@ -519,7 +525,8 @@ var pairsTag = defineSequenceTag("tag:yaml.org,2002:pairs", {
     if (keys.length !== 1) return "cannot resolve a pairs item";
     container.push([keys[0], object[keys[0]]]);
     return "";
-  }
+  },
+  identify: () => false
 });
 var mapTag = defineMappingTag("tag:yaml.org,2002:map", {
   create: () => ({}),
@@ -546,7 +553,11 @@ var mapTag = defineMappingTag("tag:yaml.org,2002:map", {
     return Object.prototype.hasOwnProperty.call(container, String(key));
   },
   keys: (container) => Object.keys(container),
-  get: (container, key) => container[String(key)]
+  get: (container, key) => {
+    const normalizedKey = String(key);
+    if (!Object.prototype.hasOwnProperty.call(container, normalizedKey)) return null;
+    return container[normalizedKey];
+  }
 });
 var setTag = defineMappingTag("tag:yaml.org,2002:set", {
   create: () => /* @__PURE__ */ new Set(),
@@ -567,9 +578,9 @@ var setTag = defineMappingTag("tag:yaml.org,2002:set", {
 });
 function createTagDefinitionMap() {
   return {
-    scalar: {},
-    sequence: {},
-    mapping: {}
+    scalar: /* @__PURE__ */ Object.create(null),
+    sequence: /* @__PURE__ */ Object.create(null),
+    mapping: /* @__PURE__ */ Object.create(null)
   };
 }
 function createTagDefinitionListMap() {
@@ -596,11 +607,35 @@ function compileTags(tags) {
 }
 var Schema = class Schema2 {
   tags;
+  /** @internal */
   implicitScalarTags;
+  /**
+  * Dispatch implicit scalar resolvers by `source.charAt(0)`. Each bucket holds
+  * the resolvers that may match that key, in schema order; a key absent from
+  * the map uses
+  * {@link Schema.implicitScalarAnyFirstChar}
+  * (resolvers that declared no first-char constraint, so they apply to any
+  * first character).
+  */
   implicitScalarByFirstChar;
   implicitScalarAnyFirstChar;
+  /**
+  * The default scalar tag (`!!str`), resolved once so the composer's fallback
+  * for unresolved plain scalars avoids a keyed lookup per scalar.
+  *
+  * @internal
+  */
   defaultScalarTag;
+  /**
+  * The default container tags (`!!seq` / `!!map`), used by the dumper: when a
+  * value is identified by its default tag, the tag is implicit and not
+  * printed. Undefined if the schema does not define them (then such values
+  * can't be dumped).
+  *
+  * @internal
+  */
   defaultSequenceTag;
+  /** @internal */
   defaultMappingTag;
   exact;
   prefix;
@@ -646,6 +681,52 @@ var Schema = class Schema2 {
     this.exact = exact;
     this.prefix = prefix;
   }
+  /** @internal */
+  lookupScalarTag(tagName) {
+    const exactTag = this.exact.scalar[tagName];
+    if (exactTag) return exactTag;
+    for (const tag of this.prefix.scalar) if (tagName.startsWith(tag.tagName)) return tag;
+  }
+  /** @internal */
+  lookupSequenceTag(tagName) {
+    const exactTag = this.exact.sequence[tagName];
+    if (exactTag) return exactTag;
+    for (const tag of this.prefix.sequence) if (tagName.startsWith(tag.tagName)) return tag;
+  }
+  /** @internal */
+  lookupMappingTag(tagName) {
+    const exactTag = this.exact.mapping[tagName];
+    if (exactTag) return exactTag;
+    for (const tag of this.prefix.mapping) if (tagName.startsWith(tag.tagName)) return tag;
+  }
+  /** @internal */
+  resolveImplicitScalarTag(source) {
+    const candidates = this.implicitScalarByFirstChar.get(source.charAt(0)) ?? this.implicitScalarAnyFirstChar;
+    for (const tag2 of candidates) {
+      const value = tag2.resolve(source, false, tag2.tagName);
+      if (value !== NOT_RESOLVED) return {
+        value,
+        tag: tag2
+      };
+    }
+    const tag = this.defaultScalarTag;
+    return {
+      value: tag.resolve(source, false, tag.tagName),
+      tag
+    };
+  }
+  /**
+  * Creates a new schema with the specified tags added. If a tag already
+  * exists, it is replaced by the specified tag.
+  *
+  * @example
+  *
+  * ```javascript
+  * import { CORE_SCHEMA, mergeTag, realMapTag } from 'js-yaml'
+  *
+  * const schema = CORE_SCHEMA.withTags(mergeTag, realMapTag)
+  * ```
+  */
   withTags(...tags) {
     let flatTags = [];
     for (const tag of tags) flatTags = flatTags.concat(tag);
@@ -684,6 +765,19 @@ var YAML11_SCHEMA = new Schema([
   pairsTag,
   setTag
 ]);
+var DUMP_SCHEMA = YAML11_SCHEMA.withTags({
+  ...intYaml11Tag,
+  resolve: (source, isExplicit, tagName) => {
+    const result = intYaml11Tag.resolve(source, isExplicit, tagName);
+    return result === NOT_RESOLVED ? intCoreTag.resolve(source, isExplicit, tagName) : result;
+  }
+}, {
+  ...floatYaml11Tag,
+  resolve: (source, isExplicit, tagName) => {
+    const result = floatYaml11Tag.resolve(source, isExplicit, tagName);
+    return result === NOT_RESOLVED ? floatCoreTag.resolve(source, isExplicit, tagName) : result;
+  }
+});
 var realMapTag = defineMappingTag("tag:yaml.org,2002:map", {
   create: () => /* @__PURE__ */ new Map(),
   addPair: (container, key, value) => {
@@ -739,7 +833,11 @@ var legacyMapTag = defineMappingTag("tag:yaml.org,2002:map", {
     return normalizedKey !== null && Object.prototype.hasOwnProperty.call(container, normalizedKey);
   },
   keys: (container) => Object.keys(container),
-  get: (container, key) => container[String(key)]
+  get: (container, key) => {
+    const normalizedKey = String(key);
+    if (!Object.prototype.hasOwnProperty.call(container, normalizedKey)) return null;
+    return container[normalizedKey];
+  }
 });
 var DEFAULT_SNIPPET_OPTIONS = {
   maxLength: 79,
@@ -816,9 +914,13 @@ function formatError(exception, compact) {
 ${exception.mark.snippet}`;
   return `${exception.reason} ${where}`;
 }
-var YAMLException = class extends Error {
+var YAMLException = class YAMLException2 extends Error {
   reason;
   mark;
+  /**
+  * Optional `mark` contains source snippet data. Usually, use
+  * {@link YAMLException.throwAt} instead of passing it directly.
+  */
   constructor(reason, mark) {
     super();
     this.name = "YAMLException";
@@ -827,34 +929,65 @@ var YAMLException = class extends Error {
     this.message = formatError(this, false);
     if (Error.captureStackTrace) Error.captureStackTrace(this, this.constructor);
   }
+  /**
+  * Returns the formatted error, omitting the source snippet in compact mode.
+  */
   toString(compact) {
     return `${this.name}: ${formatError(this, compact)}`;
   }
-};
-function throwErrorAt(source, position, message, filename = "") {
-  let line = 0;
-  let lineStart = 0;
-  for (let index = 0; index < position; index++) {
-    const ch = source.charCodeAt(index);
-    if (ch === 10) {
-      line++;
-      lineStart = index + 1;
-    } else if (ch === 13) {
-      line++;
-      if (source.charCodeAt(index + 1) === 10) index++;
-      lineStart = index + 1;
+  /**
+  * Builds a YAMLException with a source snippet and throws it. `source` is
+  * the raw input text; `position` is an offset into it.
+  */
+  static throwAt(source, position, message, filename = "") {
+    let line = 0;
+    let lineStart = 0;
+    for (let index = 0; index < position; index++) {
+      const ch = source.charCodeAt(index);
+      if (ch === 10) {
+        line++;
+        lineStart = index + 1;
+      } else if (ch === 13) {
+        line++;
+        if (source.charCodeAt(index + 1) === 10) index++;
+        lineStart = index + 1;
+      }
     }
+    const mark = {
+      name: filename,
+      buffer: source,
+      position,
+      line,
+      column: position - lineStart
+    };
+    mark.snippet = makeSnippet(mark);
+    throw new YAMLException2(message, mark);
   }
-  const mark = {
-    name: filename,
-    buffer: source,
-    position,
-    line,
-    column: position - lineStart
-  };
-  mark.snippet = makeSnippet(mark);
-  throw new YAMLException(message, mark);
-}
+};
+var EVENT_ID = {
+  DOCUMENT: 1,
+  SEQUENCE: 2,
+  MAPPING: 3,
+  SCALAR: 4,
+  ALIAS: 5,
+  POP: 6
+};
+var SCALAR_STYLE = {
+  PLAIN: 1,
+  SINGLE_QUOTED: 2,
+  DOUBLE_QUOTED: 3,
+  LITERAL_BLOCK: 4,
+  FOLDED_BLOCK: 5
+};
+var COLLECTION_STYLE = {
+  BLOCK: 1,
+  FLOW: 2
+};
+var CHOMPING_MODE = {
+  CLIP: 1,
+  STRIP: 2,
+  KEEP: 3
+};
 var NO_RANGE$3 = -1;
 function simpleEscapeSequence(c) {
   switch (c) {
@@ -1052,8 +1185,8 @@ function getBlockValue(input, start2, end, indent, chomping, folded) {
     didReadContent = true;
     emptyLines = 0;
   }
-  if (chomping === 3) result += "\n".repeat(didReadContent ? 1 + emptyLines : emptyLines);
-  else if (chomping !== 2) {
+  if (chomping === CHOMPING_MODE.KEEP) result += "\n".repeat(didReadContent ? 1 + emptyLines : emptyLines);
+  else if (chomping !== CHOMPING_MODE.STRIP) {
     if (didReadContent) result += "\n";
   }
   return result;
@@ -1063,22 +1196,22 @@ function getScalarValue(input, scalar) {
   const { valueStart, valueEnd } = scalar;
   if (scalar.fast) return input.slice(valueStart, valueEnd);
   switch (scalar.style) {
-    case 2:
+    case SCALAR_STYLE.SINGLE_QUOTED:
       return getSingleQuotedValue(input, valueStart, valueEnd);
-    case 3:
+    case SCALAR_STYLE.DOUBLE_QUOTED:
       return getDoubleQuotedValue(input, valueStart, valueEnd);
-    case 4:
+    case SCALAR_STYLE.LITERAL_BLOCK:
       return getBlockValue(input, valueStart, valueEnd, scalar.indent, scalar.chomping, false);
-    case 5:
+    case SCALAR_STYLE.FOLDED_BLOCK:
       return getBlockValue(input, valueStart, valueEnd, scalar.indent, scalar.chomping, true);
     default:
       return getPlainValue(input, valueStart, valueEnd);
   }
 }
-var DEFAULT_TAG_HANDLERS = {
+var DEFAULT_TAG_HANDLERS = Object.assign(/* @__PURE__ */ Object.create(null), {
   "!": "!",
   "!!": "tag:yaml.org,2002:"
-};
+});
 function tagPercentEncode(source) {
   return encodeURI(source).replace(/!/g, "%21");
 }
@@ -1099,6 +1232,7 @@ function tagNameShort(fullTag) {
   return `!<${tagPercentEncode(tag)}>`;
 }
 var NO_RANGE$2 = -1;
+var MERGE_TAG_NAME = "tag:yaml.org,2002:merge";
 var DEFAULT_CONSTRUCTOR_OPTIONS = {
   filename: "",
   schema: CORE_SCHEMA,
@@ -1114,26 +1248,16 @@ function eventPosition$1(event) {
   return 0;
 }
 function throwError$1(state, message) {
-  throwErrorAt(state.source, state.position, message, state.filename);
+  YAMLException.throwAt(state.source, state.position, message, state.filename);
 }
 function finalizeCollection(state, position, tag, carrier) {
   try {
     return tag.finalize(carrier);
   } catch (error) {
     if (error instanceof YAMLException) throw error;
-    throwErrorAt(state.source, position, error instanceof Error ? error.message : String(error), state.filename);
+    YAMLException.throwAt(state.source, position, error instanceof Error ? error.message : String(error), state.filename);
   }
 }
-function lookupTag(exact, prefix, tagName) {
-  const exactTag = exact[tagName];
-  if (exactTag) return exactTag;
-  for (const tag of prefix) if (tagName.startsWith(tag.tagName)) return tag;
-}
-function findExplicitTag(state, exact, prefix, tagName, nodeKind) {
-  const tag = lookupTag(exact, prefix, tagName);
-  if (tag) return tag;
-  throwError$1(state, `unknown ${nodeKind} tag !<${tagName}>`);
-}
 function constructScalar(state, event) {
   const source = getScalarValue(state.source, event);
   const rawTag = event.tagStart === NO_RANGE$2 ? "" : state.source.slice(event.tagStart, event.tagEnd);
@@ -1144,7 +1268,7 @@ function constructScalar(state, event) {
       tag: strTag2
     };
     const tagName = tagNameFull(rawTag, state.tagHandlers);
-    const scalarTag = lookupTag(state.schema.exact.scalar, state.schema.prefix.scalar, tagName);
+    const scalarTag = state.schema.lookupScalarTag(tagName);
     if (scalarTag) {
       const result = scalarTag.resolve(source, true, tagName);
       if (result === NOT_RESOLVED) throwError$1(state, `cannot resolve a node with !<${tagName}> explicit tag`);
@@ -1153,7 +1277,7 @@ function constructScalar(state, event) {
         tag: scalarTag
       };
     }
-    const collectionTagDef = lookupTag(state.schema.exact.mapping, state.schema.prefix.mapping, tagName) ?? lookupTag(state.schema.exact.sequence, state.schema.prefix.sequence, tagName);
+    const collectionTagDef = state.schema.lookupMappingTag(tagName) ?? state.schema.lookupSequenceTag(tagName);
     if (collectionTagDef) {
       if (source !== "") throwError$1(state, `cannot resolve a node with !<${tagName}> explicit tag`);
       const carrier = collectionTagDef.create(tagName);
@@ -1164,28 +1288,15 @@ function constructScalar(state, event) {
     }
     throwError$1(state, `unknown scalar tag !<${tagName}>`);
   }
-  if (event.style === 1) {
-    const candidates = state.schema.implicitScalarByFirstChar.get(source.charAt(0)) ?? state.schema.implicitScalarAnyFirstChar;
-    for (const tag of candidates) {
-      const result = tag.resolve(source, false, tag.tagName);
-      if (result !== NOT_RESOLVED) return {
-        value: result,
-        tag
-      };
-    }
-  }
+  if (event.style === SCALAR_STYLE.PLAIN) return state.schema.resolveImplicitScalarTag(source);
   return {
     value: strTag2.resolve(source, false, strTag2.tagName),
     tag: strTag2
   };
 }
-function collectionTag(state, event, exact, prefix, defaultTagName, nodeKind) {
+function collectionTagName(state, event, defaultTagName) {
   const rawTag = event.tagStart === NO_RANGE$2 ? "" : state.source.slice(event.tagStart, event.tagEnd);
-  const tagName = rawTag === "" || rawTag === "!" ? defaultTagName : tagNameFull(rawTag, state.tagHandlers);
-  return {
-    tagName,
-    tag: findExplicitTag(state, exact, prefix, tagName, nodeKind)
-  };
+  return rawTag === "" || rawTag === "!" ? defaultTagName : tagNameFull(rawTag, state.tagHandlers);
 }
 function isMappingTag(tag) {
   return tag.nodeKind === "mapping";
@@ -1202,12 +1313,16 @@ function mergeKeys(state, frame, source, sourceTag) {
 function mergeSource(state, frame, source, sourceTag) {
   state.position = frame.keyPosition;
   if (isMappingTag(sourceTag)) mergeKeys(state, frame, source, sourceTag);
-  else if (sourceTag.nodeKind === "sequence" && Array.isArray(source)) for (const element of source) mergeKeys(state, frame, element, frame.tag);
+  else if (sourceTag.nodeKind === "sequence" && Array.isArray(source)) for (const element of source) {
+    const elementTag = state.nodeTags.get(element);
+    if (!elementTag) throwError$1(state, "cannot merge mappings; the provided source object is unacceptable");
+    mergeKeys(state, frame, element, elementTag);
+  }
   else throwError$1(state, "cannot merge mappings; the provided source object is unacceptable");
 }
 function addMappingValue(state, frame, key, value, tag) {
   state.position = frame.keyPosition;
-  if (key === MERGE_KEY) {
+  if (frame.keyIsMerge) {
     mergeSource(state, frame, value, tag);
     return;
   }
@@ -1222,9 +1337,7 @@ function addValue(state, value, tag) {
     frame.value = value;
     frame.hasValue = true;
   } else if (frame.kind === "sequence") {
-    if (frame.merge) {
-      if (!isMappingTag(tag)) throwError$1(state, "cannot merge mappings; the provided source object is unacceptable");
-    }
+    if (isMappingTag(tag)) state.nodeTags.set(value, tag);
     const err = frame.tag.addItem(frame.value, value, frame.index++);
     if (err) throwError$1(state, err);
   } else if (frame.hasKey) {
@@ -1236,6 +1349,7 @@ function addValue(state, value, tag) {
     frame.key = value;
     frame.keyPosition = state.position;
     frame.hasKey = true;
+    frame.keyIsMerge = tag.tagName === MERGE_TAG_NAME;
   }
 }
 function storeAnchor(state, event, value, tag, isValueFinal) {
@@ -1260,6 +1374,7 @@ function constructFromEvents(events, options) {
     position: 0,
     frames: [],
     anchors: /* @__PURE__ */ new Map(),
+    nodeTags: /* @__PURE__ */ new Map(),
     tagHandlers: /* @__PURE__ */ Object.create(null),
     totalMergeKeys: 0,
     aliasCount: 0
@@ -1268,8 +1383,9 @@ function constructFromEvents(events, options) {
     const event = state.events[state.eventIndex++];
     state.position = eventPosition$1(event);
     switch (event.type) {
-      case 1:
+      case EVENT_ID.DOCUMENT:
         state.anchors = /* @__PURE__ */ new Map();
+        state.nodeTags = /* @__PURE__ */ new Map();
         state.aliasCount = 0;
         state.tagHandlers = /* @__PURE__ */ Object.create(null);
         for (const directive of event.directives) if (directive.kind === "tag") state.tagHandlers[directive.handle] = directive.prefix;
@@ -1280,47 +1396,49 @@ function constructFromEvents(events, options) {
           hasValue: false
         });
         break;
-      case 4: {
+      case EVENT_ID.SCALAR: {
         const { value, tag } = constructScalar(state, event);
         storeAnchor(state, event, value, tag, true);
         addValue(state, value, tag);
         break;
       }
-      case 2: {
-        const definition = collectionTag(state, event, state.schema.exact.sequence, state.schema.prefix.sequence, "tag:yaml.org,2002:seq", "sequence");
-        const value = definition.tag.create(definition.tagName);
-        const anchor = storeAnchor(state, event, value, definition.tag, definition.tag.carrierIsResult);
-        const parent = state.frames[state.frames.length - 1];
-        const merge = parent !== void 0 && parent.kind === "mapping" && parent.hasKey && parent.key === MERGE_KEY;
+      case EVENT_ID.SEQUENCE: {
+        const tagName = collectionTagName(state, event, "tag:yaml.org,2002:seq");
+        const tag = state.schema.lookupSequenceTag(tagName);
+        if (!tag) throwError$1(state, `unknown sequence tag !<${tagName}>`);
+        const value = tag.create(tagName);
+        const anchor = storeAnchor(state, event, value, tag, tag.carrierIsResult);
         state.frames.push({
           kind: "sequence",
           position: state.position,
           value,
-          tag: definition.tag,
+          tag,
           anchor,
-          index: 0,
-          merge
+          index: 0
         });
         break;
       }
-      case 3: {
-        const definition = collectionTag(state, event, state.schema.exact.mapping, state.schema.prefix.mapping, "tag:yaml.org,2002:map", "mapping");
-        const value = definition.tag.create(definition.tagName);
-        const anchor = storeAnchor(state, event, value, definition.tag, definition.tag.carrierIsResult);
+      case EVENT_ID.MAPPING: {
+        const tagName = collectionTagName(state, event, "tag:yaml.org,2002:map");
+        const tag = state.schema.lookupMappingTag(tagName);
+        if (!tag) throwError$1(state, `unknown mapping tag !<${tagName}>`);
+        const value = tag.create(tagName);
+        const anchor = storeAnchor(state, event, value, tag, tag.carrierIsResult);
         state.frames.push({
           kind: "mapping",
           position: state.position,
           value,
-          tag: definition.tag,
+          tag,
           anchor,
           key: void 0,
           keyPosition: state.position,
           hasKey: false,
+          keyIsMerge: false,
           overridable: null
         });
         break;
       }
-      case 5: {
+      case EVENT_ID.ALIAS: {
         if (state.maxAliases !== -1 && ++state.aliasCount > state.maxAliases) throwError$1(state, `aliases exceeded maxAliases (${state.maxAliases})`);
         const name = state.source.slice(event.anchorStart, event.anchorEnd);
         const anchor = state.anchors.get(name);
@@ -1329,8 +1447,12 @@ function constructFromEvents(events, options) {
         addValue(state, anchor.value, anchor.tag);
         break;
       }
-      case 6: {
+      case EVENT_ID.POP: {
         const frame = state.frames.pop();
+        if (frame.kind === "mapping" && frame.hasKey) {
+          state.position = frame.keyPosition;
+          throwError$1(state, "incomplete mapping pair in event stream");
+        }
         if (frame.kind === "document") state.documents.push(frame.value);
         else {
           const value = frame.tag.carrierIsResult ? frame.value : finalizeCollection(state, frame.position, frame.tag, frame.value);
@@ -1366,7 +1488,7 @@ var DEFAULT_PARSER_OPTIONS = {
 };
 function addDocumentEvent(state, explicitStart, explicitEnd) {
   state.events.push({
-    type: 1,
+    type: EVENT_ID.DOCUMENT,
     explicitStart,
     explicitEnd,
     directives: state.directives
@@ -1374,7 +1496,7 @@ function addDocumentEvent(state, explicitStart, explicitEnd) {
 }
 function addSequenceEvent(state, start2, anchorStart, anchorEnd, tagStart, tagEnd, style) {
   state.events.push({
-    type: 2,
+    type: EVENT_ID.SEQUENCE,
     start: start2,
     anchorStart,
     anchorEnd,
@@ -1385,7 +1507,7 @@ function addSequenceEvent(state, start2, anchorStart, anchorEnd, tagStart, tagEn
 }
 function addMappingEvent(state, start2, anchorStart, anchorEnd, tagStart, tagEnd, style) {
   state.events.push({
-    type: 3,
+    type: EVENT_ID.MAPPING,
     start: start2,
     anchorStart,
     anchorEnd,
@@ -1394,9 +1516,20 @@ function addMappingEvent(state, start2, anchorStart, anchorEnd, tagStart, tagEnd
     style
   });
 }
-function addScalarEvent(state, valueStart, valueEnd, anchorStart, anchorEnd, tagStart, tagEnd, style, chomping = 1, indent = -1, fast = false) {
+function insertFlowPairMappingEvent(state, snapshot) {
+  state.events.splice(snapshot.eventsLength, 0, {
+    type: EVENT_ID.MAPPING,
+    start: snapshot.position,
+    anchorStart: NO_RANGE$1,
+    anchorEnd: NO_RANGE$1,
+    tagStart: NO_RANGE$1,
+    tagEnd: NO_RANGE$1,
+    style: COLLECTION_STYLE.FLOW
+  });
+}
+function addScalarEvent(state, valueStart, valueEnd, anchorStart, anchorEnd, tagStart, tagEnd, style, chomping = CHOMPING_MODE.CLIP, indent = -1, fast = false) {
   state.events.push({
-    type: 4,
+    type: EVENT_ID.SCALAR,
     valueStart,
     valueEnd,
     anchorStart,
@@ -1411,16 +1544,16 @@ function addScalarEvent(state, valueStart, valueEnd, anchorStart, anchorEnd, tag
 }
 function addAliasEvent(state, anchorStart, anchorEnd) {
   state.events.push({
-    type: 5,
+    type: EVENT_ID.ALIAS,
     anchorStart,
     anchorEnd
   });
 }
 function addPopEvent(state) {
-  state.events.push({ type: 6 });
+  state.events.push({ type: EVENT_ID.POP });
 }
 function addEmptyScalarEvent(state) {
-  addScalarEvent(state, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, 1);
+  addScalarEvent(state, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, SCALAR_STYLE.PLAIN);
 }
 function emptyProperties() {
   return {
@@ -1449,7 +1582,7 @@ function restoreState(state, snapshot) {
   state.events.length = snapshot.eventsLength;
 }
 function throwError(state, message) {
-  throwErrorAt(state.input.slice(0, state.length), state.position, message, state.filename);
+  YAMLException.throwAt(state.input.slice(0, state.length), state.position, message, state.filename);
 }
 function isEol(c) {
   return c === 10 || c === 13;
@@ -1617,7 +1750,7 @@ function readSingleQuotedScalar(state, nodeIndent, props) {
       }
       const end = state.position;
       state.position++;
-      addScalarEvent(state, start2, end, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, 2, 1, -1, simple);
+      addScalarEvent(state, start2, end, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, SCALAR_STYLE.SINGLE_QUOTED, CHOMPING_MODE.CLIP, -1, simple);
       return true;
     }
     if (isEol(ch)) {
@@ -1639,7 +1772,7 @@ function readDoubleQuotedScalar(state, nodeIndent, props) {
     if (ch === 34) {
       const end = state.position;
       state.position++;
-      addScalarEvent(state, start2, end, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, 3, 1, -1, simple);
+      addScalarEvent(state, start2, end, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, SCALAR_STYLE.DOUBLE_QUOTED, CHOMPING_MODE.CLIP, -1, simple);
       return true;
     }
     if (ch === 92) {
@@ -1667,18 +1800,18 @@ function readDoubleQuotedScalar(state, nodeIndent, props) {
 }
 function readBlockScalar(state, parentIndent, props) {
   const ch = state.input.charCodeAt(state.position);
-  let chomping = 1;
+  let chomping = CHOMPING_MODE.CLIP;
   let indent = -1;
   let detectedIndent = false;
   if (ch !== 124 && ch !== 62) return false;
-  const style = ch === 124 ? 4 : 5;
+  const style = ch === 124 ? SCALAR_STYLE.LITERAL_BLOCK : SCALAR_STYLE.FOLDED_BLOCK;
   state.position++;
   while (state.input.charCodeAt(state.position) !== 0) {
     const current = state.input.charCodeAt(state.position);
     const digit = fromDecimalCode(current);
     if (current === 43 || current === 45) {
-      if (chomping !== 1) throwError(state, "repeat of a chomping mode identifier");
-      chomping = current === 43 ? 3 : 2;
+      if (chomping !== CHOMPING_MODE.CLIP) throwError(state, "repeat of a chomping mode identifier");
+      chomping = current === 43 ? CHOMPING_MODE.KEEP : CHOMPING_MODE.STRIP;
       state.position++;
     } else if (digit >= 0) {
       if (digit === 0) throwError(state, "bad explicit indentation width of a block scalar; it cannot be less than one");
@@ -1793,7 +1926,7 @@ function readPlainScalar(state, nodeIndent, nodeContext, props) {
   }
   if (end === start2) return false;
   checkPrintable(state, start2, end);
-  addScalarEvent(state, start2, end, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, 1, 1, -1, !multiline);
+  addScalarEvent(state, start2, end, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, SCALAR_STYLE.PLAIN, CHOMPING_MODE.CLIP, -1, !multiline);
   return true;
 }
 function skipFlowSeparationSpace(state, nodeIndent) {
@@ -1808,8 +1941,8 @@ function readFlowCollection(state, nodeIndent, props) {
   let readNext = true;
   if (ch !== 91 && ch !== 123) return false;
   const terminator = isMapping ? 125 : 93;
-  if (isMapping) addMappingEvent(state, start2, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, 2);
-  else addSequenceEvent(state, start2, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, 2);
+  if (isMapping) addMappingEvent(state, start2, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, COLLECTION_STYLE.FLOW);
+  else addSequenceEvent(state, start2, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, COLLECTION_STYLE.FLOW);
   state.position++;
   while (state.input.charCodeAt(state.position) !== 0) {
     skipFlowSeparationSpace(state, nodeIndent);
@@ -1837,12 +1970,8 @@ function readFlowCollection(state, nodeIndent, props) {
       state.position++;
       skipFlowSeparationSpace(state, nodeIndent);
       if (!isMapping) {
-        restoreState(state, entryStart);
-        addMappingEvent(state, entryStart.position, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, 2);
-        if (!parseNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true)) addEmptyScalarEvent(state);
-        skipFlowSeparationSpace(state, nodeIndent);
-        state.position++;
-        skipFlowSeparationSpace(state, nodeIndent);
+        insertFlowPairMappingEvent(state, entryStart);
+        if (!keyWasRead) addEmptyScalarEvent(state);
       } else if (!keyWasRead) addEmptyScalarEvent(state);
       if (!parseNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true)) addEmptyScalarEvent(state);
       skipFlowSeparationSpace(state, nodeIndent);
@@ -1852,9 +1981,8 @@ function readFlowCollection(state, nodeIndent, props) {
       addEmptyScalarEvent(state);
     } else if (isMapping) addEmptyScalarEvent(state);
     else if (isPair) {
-      restoreState(state, entryStart);
-      addMappingEvent(state, entryStart.position, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, NO_RANGE$1, 2);
-      parseNode(state, nodeIndent, CONTEXT_FLOW_IN, false, true);
+      insertFlowPairMappingEvent(state, entryStart);
+      if (!keyWasRead) addEmptyScalarEvent(state);
       addEmptyScalarEvent(state);
       addPopEvent(state);
     }
@@ -1868,7 +1996,7 @@ function readFlowCollection(state, nodeIndent, props) {
 }
 function readBlockSequence(state, nodeIndent, props) {
   if (state.firstTabInLine !== -1 || state.input.charCodeAt(state.position) !== 45 || !isWsOrEolOrEnd(state.input.charCodeAt(state.position + 1))) return false;
-  addSequenceEvent(state, state.position, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, 1);
+  addSequenceEvent(state, state.position, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, COLLECTION_STYLE.BLOCK);
   while (state.input.charCodeAt(state.position) === 45 && isWsOrEolOrEnd(state.input.charCodeAt(state.position + 1))) {
     if (state.firstTabInLine !== -1) {
       state.position = state.firstTabInLine;
@@ -1904,7 +2032,7 @@ function readBlockMapping(state, nodeIndent, flowIndent, props) {
     const entryLine = state.line;
     if ((ch === 63 || ch === 58) && isWsOrEolOrEnd(following)) {
       if (!mappingOpened) {
-        addMappingEvent(state, state.position, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, 1);
+        addMappingEvent(state, state.position, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, COLLECTION_STYLE.BLOCK);
         mappingOpened = true;
       }
       if (ch === 63) {
@@ -1934,7 +2062,7 @@ function readBlockMapping(state, nodeIndent, flowIndent, props) {
           if (!isWsOrEolOrEnd(ch)) throwError(state, "a whitespace character is expected after the key-value separator within a block mapping");
           if (!mappingOpened) {
             restoreState(state, beforeKey);
-            addMappingEvent(state, beforeKey.position, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, 1);
+            addMappingEvent(state, beforeKey.position, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, COLLECTION_STYLE.BLOCK);
             mappingOpened = true;
             parseNode(state, flowIndent, CONTEXT_FLOW_OUT, false, true);
             ch = state.input.charCodeAt(state.position);
@@ -1995,10 +2123,6 @@ function parseNode(state, parentIndent, nodeContext, allowToSeek, allowCompact,
     else if (state.lineIndent === parentIndent) indentStatus = 0;
     else indentStatus = -1;
   }
-  if (state.position === state.lineStart && testDocumentSeparator(state)) {
-    state.depth--;
-    return false;
-  }
   if (indentStatus === 1) while (true) {
     const ch = state.input.charCodeAt(state.position);
     const propertyState = snapshotState(state);
@@ -2006,7 +2130,7 @@ function parseNode(state, parentIndent, nodeContext, allowToSeek, allowCompact,
     if (atNewLine && allowBlockStyles && (props.tagStart !== NO_RANGE$1 || props.anchorStart !== NO_RANGE$1) && (ch === 33 || ch === 38)) {
       const fallbackState = snapshotState(state);
       const flowIndent = parentIndent + 1;
-      if (readBlockMapping(state, state.position - state.lineStart, flowIndent, props) && state.events[fallbackState.eventsLength]?.type === 3) {
+      if (readBlockMapping(state, state.position - state.lineStart, flowIndent, props) && state.events[fallbackState.eventsLength]?.type === EVENT_ID.MAPPING) {
         state.depth--;
         return true;
       }
@@ -2034,7 +2158,7 @@ function parseNode(state, parentIndent, nodeContext, allowToSeek, allowCompact,
         const fallbackState = snapshotState(state);
         const propertyIndent = propertyStart.position - propertyStart.lineStart;
         restoreState(state, propertyStart);
-        if (readBlockMapping(state, propertyIndent, flowIndent, emptyProperties()) && state.events[fallbackState.eventsLength]?.type === 3) hasContent = true;
+        if (readBlockMapping(state, propertyIndent, flowIndent, emptyProperties()) && state.events[fallbackState.eventsLength]?.type === EVENT_ID.MAPPING) hasContent = true;
         else restoreState(state, fallbackState);
       }
       if (!hasContent && (allowBlockScalars && readBlockScalar(state, flowIndent, props) || readSingleQuotedScalar(state, flowIndent, props) || readDoubleQuotedScalar(state, flowIndent, props) || readAlias(state, props) || readPlainScalar(state, flowIndent, nodeContext, props))) hasContent = true;
@@ -2043,7 +2167,7 @@ function parseNode(state, parentIndent, nodeContext, allowToSeek, allowCompact,
   }
   allowBlockScalars = allowBlockScalars && !hasContent;
   if (!hasContent && (props.anchorStart !== NO_RANGE$1 || props.tagStart !== NO_RANGE$1 || allowBlockScalars)) {
-    addScalarEvent(state, NO_RANGE$1, NO_RANGE$1, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, 1);
+    addScalarEvent(state, NO_RANGE$1, NO_RANGE$1, props.anchorStart, props.anchorEnd, props.tagStart, props.tagEnd, SCALAR_STYLE.PLAIN);
     hasContent = true;
   }
   state.depth--;
@@ -2128,7 +2252,7 @@ function readDocument(state) {
     }
   }
   const documentEvent = state.events[documentEventIndex];
-  if (documentEvent?.type === 1) documentEvent.explicitEnd = explicitEnd;
+  if (documentEvent?.type === EVENT_ID.DOCUMENT) documentEvent.explicitEnd = explicitEnd;
   addPopEvent(state);
   if (!explicitEnd && state.position < state.length && !(state.position === state.lineStart && testDocumentSeparator(state))) throwError(state, "end of the stream or a document separator is expected");
 }
@@ -2150,7 +2274,7 @@ function parseEvents(input, options) {
     events: []
   };
   const nullpos = input.indexOf("\0");
-  if (nullpos !== -1) throwErrorAt(input, nullpos, "null byte is not allowed in input", state.filename);
+  if (nullpos !== -1) YAMLException.throwAt(input, nullpos, "null byte is not allowed in input", state.filename);
   if (state.input.charCodeAt(state.position) === 65279) state.position++;
   while (state.position < state.length) {
     skipSeparationSpace(state, true);
@@ -2186,6 +2310,7 @@ function load(input, options) {
   throw new YAMLException("expected a single document in the stream, but found more");
 }
 var Style = class {
+  /** Whether to print the node's tag explicitly. */
   tagged = false;
   flow = false;
   singleQuoted = false;
@@ -2221,9 +2346,9 @@ function buildRepresentTypes(schema) {
 function matchTag(state, object) {
   for (let index = 0, length = state.representTypes.length; index < length; index += 1) {
     const { tag, implicitTag } = state.representTypes[index];
-    if (tag.identify && tag.identify(object)) {
+    if (tag.identify(object)) {
       let tagName;
-      if (tag.matchByTagPrefix && tag.representTagName) tagName = tag.representTagName(object);
+      if (tag.matchByTagPrefix) tagName = tag.representTagName(object);
       else tagName = tag.tagName;
       return {
         tag,
@@ -2423,8 +2548,7 @@ function createPresenterState(options) {
   };
   return {
     ...opts,
-    defaultScalarTagName: opts.schema.defaultScalarTag.tagName,
-    implicitResolvers: opts.schema.implicitScalarTags
+    defaultScalarTagName: opts.schema.defaultScalarTag.tagName
   };
 }
 function encodeNonPrintable(character) {
@@ -2465,13 +2589,6 @@ function scalarLayout(state, level) {
     lineWidth: state.lineWidth === -1 ? -1 : Math.max(Math.min(state.lineWidth, 40), state.lineWidth - indent)
   };
 }
-function resolveImplicitTag(state, str) {
-  for (let index = 0, length = state.implicitResolvers.length; index < length; index += 1) {
-    const tagDefinition = state.implicitResolvers[index];
-    if (tagDefinition.resolve(str, false, tagDefinition.tagName) !== NOT_RESOLVED) return tagDefinition.tagName;
-  }
-  return state.defaultScalarTagName;
-}
 function isWhitespace(c) {
   return c === CHAR_SPACE || c === CHAR_TAB;
 }
@@ -2491,7 +2608,7 @@ function isNsCharOrWhitespace(c) {
 function isPlainSafe(c, prev, inblock) {
   const cIsNsCharOrWhitespace = isNsCharOrWhitespace(c);
   const cIsNsChar = cIsNsCharOrWhitespace && !isWhitespace(c);
-  return (inblock ? cIsNsCharOrWhitespace : cIsNsCharOrWhitespace && c !== CHAR_COMMA && c !== CHAR_LEFT_SQUARE_BRACKET && c !== CHAR_RIGHT_SQUARE_BRACKET && c !== CHAR_LEFT_CURLY_BRACKET && c !== CHAR_RIGHT_CURLY_BRACKET) && c !== CHAR_SHARP && !(prev === CHAR_COLON && !cIsNsChar) || isNsCharOrWhitespace(prev) && !isWhitespace(prev) && c === CHAR_SHARP || prev === CHAR_COLON && cIsNsChar;
+  return (inblock ? cIsNsCharOrWhitespace : cIsNsCharOrWhitespace && c !== CHAR_COMMA && c !== CHAR_LEFT_SQUARE_BRACKET && c !== CHAR_RIGHT_SQUARE_BRACKET && c !== CHAR_LEFT_CURLY_BRACKET && c !== CHAR_RIGHT_CURLY_BRACKET) && c !== CHAR_SHARP && !(prev === CHAR_COLON && !cIsNsChar) || isNsCharOrWhitespace(prev) && !isWhitespace(prev) && c === CHAR_SHARP || prev === CHAR_COLON && cIsNsChar && (inblock || c !== CHAR_COMMA && c !== CHAR_LEFT_SQUARE_BRACKET && c !== CHAR_RIGHT_SQUARE_BRACKET && c !== CHAR_LEFT_CURLY_BRACKET && c !== CHAR_RIGHT_CURLY_BRACKET);
 }
 function isPlainSafeFirst(c) {
   return isPrintable(c) && c !== CHAR_BOM && !isWhitespace(c) && c !== CHAR_MINUS && c !== CHAR_QUESTION && c !== CHAR_COLON && c !== CHAR_COMMA && c !== CHAR_LEFT_SQUARE_BRACKET && c !== CHAR_RIGHT_SQUARE_BRACKET && c !== CHAR_LEFT_CURLY_BRACKET && c !== CHAR_RIGHT_CURLY_BRACKET && c !== CHAR_SHARP && c !== CHAR_AMPERSAND && c !== CHAR_ASTERISK && c !== CHAR_EXCLAMATION && c !== CHAR_VERTICAL_LINE && c !== CHAR_EQUALS && c !== CHAR_GREATER_THAN && c !== CHAR_SINGLE_QUOTE && c !== CHAR_DOUBLE_QUOTE && c !== CHAR_PERCENT && c !== CHAR_COMMERCIAL_AT && c !== CHAR_GRAVE_ACCENT;
@@ -2547,14 +2664,14 @@ function chooseScalarStyle(state, string, layout, singleLineOnly, forceQuote, in
       if (char === CHAR_LINE_FEED) {
         hasLineBreak = true;
         if (shouldTrackWidth) {
-          hasFoldableLine = hasFoldableLine || i - previousLineBreak - 1 > lineWidth && string[previousLineBreak + 1] !== " ";
+          hasFoldableLine = hasFoldableLine || i - previousLineBreak - 1 > lineWidth && !isMoreIndented(string[previousLineBreak + 1]);
           previousLineBreak = i;
         }
       } else if (!isPrintable(char)) return STYLE_DOUBLE;
       plain = plain && isPlainSafe(char, prevChar, inblock);
       prevChar = char;
     }
-    hasFoldableLine = hasFoldableLine || shouldTrackWidth && i - previousLineBreak - 1 > lineWidth && string[previousLineBreak + 1] !== " ";
+    hasFoldableLine = hasFoldableLine || shouldTrackWidth && i - previousLineBreak - 1 > lineWidth && !isMoreIndented(string[previousLineBreak + 1]);
   }
   if (!hasLineBreak && !hasFoldableLine) {
     if (plain && !forceQuote) return STYLE_PLAIN;
@@ -2588,11 +2705,11 @@ function resolveScalarStyle(state, node, layout, iskey, inblock) {
   }
   const string = node.value;
   if (string.length === 0) {
-    if (node.style.tagged || resolveImplicitTag(state, string) === node.tag) return STYLE_PLAIN;
+    if (node.style.tagged || state.schema.resolveImplicitScalarTag(string).tag.tagName === node.tag) return STYLE_PLAIN;
     return state.quoteStyle === "double" ? STYLE_DOUBLE : STYLE_SINGLE;
   }
   const style = chooseScalarStyle(state, string, layout, singleLineOnly, state.forceQuotes && !iskey, inblock);
-  if (style === STYLE_PLAIN && !node.style.tagged && resolveImplicitTag(state, string) !== node.tag) return state.quoteStyle === "double" ? STYLE_DOUBLE : STYLE_SINGLE;
+  if (style === STYLE_PLAIN && !node.style.tagged && state.schema.resolveImplicitScalarTag(string).tag.tagName !== node.tag) return state.quoteStyle === "double" ? STYLE_DOUBLE : STYLE_SINGLE;
   return style;
 }
 function blockHeader(string, indentPerLevel) {
@@ -2619,27 +2736,30 @@ function encodeFlowBreaks(string, indent) {
 function dropEndingNewline(string) {
   return string[string.length - 1] === "\n" ? string.slice(0, -1) : string;
 }
+function isMoreIndented(char) {
+  return char === " " || char === "	";
+}
 function foldBlockScalar(string, width) {
   const lineRe = /(\n+)([^\n]*)/g;
   let nextLF = string.indexOf("\n");
   if (nextLF === -1) nextLF = string.length;
   lineRe.lastIndex = nextLF;
   let result = foldLine(string.slice(0, nextLF), width);
-  let prevMoreIndented = string[0] === "\n" || string[0] === " ";
+  let prevMoreIndented = string[0] === "\n" || isMoreIndented(string[0]);
   let moreIndented;
   let match;
   while (match = lineRe.exec(string)) {
     const prefix = match[1];
     const line = match[2];
-    moreIndented = line[0] === " ";
+    moreIndented = line !== "" && isMoreIndented(line[0]);
     result += prefix + (!prevMoreIndented && !moreIndented && line !== "" ? "\n" : "") + foldLine(line, width);
     prevMoreIndented = moreIndented;
   }
   return result;
 }
 function foldLine(line, width) {
-  if (line === "" || line[0] === " ") return line;
-  const breakRe = / [^ ]/g;
+  if (line === "" || isMoreIndented(line[0])) return line;
+  const breakRe = / [^ \t]/g;
   let match;
   let start2 = 0;
   let end;
@@ -2873,22 +2993,9 @@ function present(documents, options) {
   }
   return result;
 }
-var DEFAULT_DUMP_SCHEMA = YAML11_SCHEMA.withTags({
-  ...intYaml11Tag,
-  resolve: (source, isExplicit, tagName) => {
-    const result = intYaml11Tag.resolve(source, isExplicit, tagName);
-    return result === NOT_RESOLVED ? intCoreTag.resolve(source, isExplicit, tagName) : result;
-  }
-}, {
-  ...floatYaml11Tag,
-  resolve: (source, isExplicit, tagName) => {
-    const result = floatYaml11Tag.resolve(source, isExplicit, tagName);
-    return result === NOT_RESOLVED ? floatCoreTag.resolve(source, isExplicit, tagName) : result;
-  }
-});
 var DEFAULT_DUMP_OPTIONS = {
   ...DEFAULT_PRESENTER_OPTIONS,
-  schema: DEFAULT_DUMP_SCHEMA,
+  schema: DUMP_SCHEMA,
   skipInvalid: false,
   noRefs: false,
   flowLevel: -1,
@@ -2915,9 +3022,26 @@ function dump(input, options = {}) {
     schema: opts.schema
   });
 }
+var EVENT_DOCUMENT = EVENT_ID.DOCUMENT;
+var EVENT_SEQUENCE = EVENT_ID.SEQUENCE;
+var EVENT_MAPPING = EVENT_ID.MAPPING;
+var EVENT_SCALAR = EVENT_ID.SCALAR;
+var EVENT_ALIAS = EVENT_ID.ALIAS;
+var EVENT_POP = EVENT_ID.POP;
+var SCALAR_STYLE_PLAIN = SCALAR_STYLE.PLAIN;
+var SCALAR_STYLE_SINGLE_QUOTED = SCALAR_STYLE.SINGLE_QUOTED;
+var SCALAR_STYLE_DOUBLE_QUOTED = SCALAR_STYLE.DOUBLE_QUOTED;
+var SCALAR_STYLE_LITERAL_BLOCK = SCALAR_STYLE.LITERAL_BLOCK;
+var SCALAR_STYLE_FOLDED_BLOCK = SCALAR_STYLE.FOLDED_BLOCK;
+var COLLECTION_STYLE_BLOCK = COLLECTION_STYLE.BLOCK;
+var COLLECTION_STYLE_FLOW = COLLECTION_STYLE.FLOW;
+var CHOMPING_CLIP = CHOMPING_MODE.CLIP;
+var CHOMPING_STRIP = CHOMPING_MODE.STRIP;
+var CHOMPING_KEEP = CHOMPING_MODE.KEEP;
 
 // src/constants.ts
-var AVAILABLE_MIRRORS = ["gh-proxy.org", "v6.gh-proxy.org", "hk.gh-proxy.org", "cdn.gh-proxy.org"];
+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 = {
   zash: "https://board.zash.run.place",
   dash: "https://metacubex.github.io/metacubexd",
@@ -2974,6 +3098,7 @@ var DEFAULT_TEST_URL = "http://www.gstatic.com/generate_204";
 var DEFAULT_CLEAN_ROUNDS = 2;
 var AUTO_CLEAN_THRESHOLD = 100;
 var AUTO_CLEAN_THRESHOLD_GITHUB = 50;
+var AUTO_CLEAN_COOLDOWN_HOURS = 12;
 
 // src/overwrite.ts
 import fs3 from "fs";
@@ -3025,8 +3150,9 @@ function ensureDirs() {
     }
   }
 }
+var atomicWriteSeq = 0;
 function atomicWriteFileSync(filePath, content, options) {
-  const tmp = `${filePath}.${process.pid}.tmp`;
+  const tmp = `${filePath}.${process.pid}.${atomicWriteSeq++}.tmp`;
   try {
     fs.writeFileSync(tmp, content, options);
     fs.renameSync(tmp, filePath);
@@ -3097,6 +3223,7 @@ function maskUrl(url) {
     }
     if (parsed.username) parsed.username = "***";
     if (parsed.password) parsed.password = "***";
+    parsed.pathname = parsed.pathname.split("/").map((seg) => seg.length >= 16 ? `${seg.slice(0, 4)}***${seg.slice(-4)}` : seg).join("/");
     return parsed.toString();
   } catch {
     if (url.length > 30) {
@@ -3112,6 +3239,12 @@ function readSubscriptionCache() {
       const content = fs2.readFileSync(PATHS.subscriptionsCacheFile, "utf8");
       return JSON.parse(content);
     } catch {
+      try {
+        fs2.copyFileSync(PATHS.subscriptionsCacheFile, `${PATHS.subscriptionsCacheFile}.bak`);
+        console.warn(`\u8B66\u544A: \u8BA2\u9605\u7F13\u5B58\u683C\u5F0F\u635F\u574F\uFF0C\u5DF2\u5907\u4EFD\u5230 ${PATHS.subscriptionsCacheFile}.bak`);
+      } catch {
+        console.warn("\u8B66\u544A: \u8BA2\u9605\u7F13\u5B58\u683C\u5F0F\u635F\u574F\uFF0C\u5DF2\u5FFD\u7565");
+      }
       return {};
     }
   }
@@ -3214,6 +3347,7 @@ function parseOverrideKey(key) {
   let forceOverwrite = false;
   let arrayPrepend = false;
   let arrayAppend = false;
+  let arrayMergeByName = false;
   const lastChar = key[key.length - 1];
   const openAngleCount = (key.match(/</g) || []).length;
   const closeAngleCount = (key.match(/>/g) || []).length;
@@ -3234,6 +3368,9 @@ function parseOverrideKey(key) {
     } else {
       actualKey = unwrapped;
     }
+  } else if (actualKey.startsWith("~")) {
+    arrayMergeByName = true;
+    actualKey = actualKey.slice(1);
   } else {
     if (actualKey.startsWith("+")) {
       arrayPrepend = true;
@@ -3244,7 +3381,7 @@ function parseOverrideKey(key) {
       actualKey = actualKey.slice(0, -1);
     }
   }
-  return { key: actualKey, forceOverwrite, arrayPrepend, arrayAppend };
+  return { key: actualKey, forceOverwrite, arrayPrepend, arrayAppend, arrayMergeByName };
 }
 function deepMergeWithOverrides(target, override) {
   let t = target;
@@ -3262,8 +3399,24 @@ function deepMergeWithOverrides(target, override) {
   }
   const result = { ...t };
   for (const [rawKey, value] of Object.entries(override)) {
-    const { key, forceOverwrite, arrayPrepend, arrayAppend } = parseOverrideKey(rawKey);
+    const { key, forceOverwrite, arrayPrepend, arrayAppend, arrayMergeByName } = parseOverrideKey(rawKey);
     const existingValue = result[key];
+    if (arrayMergeByName) {
+      const existingArr = Array.isArray(existingValue) ? existingValue : [];
+      const overrideArr = Array.isArray(value) ? value : [value];
+      const merged = [...existingArr];
+      for (const item of overrideArr) {
+        const name = item && typeof item === "object" && !Array.isArray(item) ? item.name : void 0;
+        const idx = name != null ? merged.findIndex((e) => e && typeof e === "object" && e.name === name) : -1;
+        if (idx >= 0) {
+          merged[idx] = deepMergeWithOverrides(merged[idx], item);
+        } else {
+          merged.push(item);
+        }
+      }
+      result[key] = merged;
+      continue;
+    }
     if (arrayPrepend || arrayAppend) {
       const existingArr = Array.isArray(existingValue) ? existingValue : [];
       const overrideArr = Array.isArray(value) ? value : [value];
@@ -3296,6 +3449,69 @@ function setOverwriteEnabled(enabled) {
 function isOverwriteFilename(filename) {
   return filename === "overwrite.yaml" || /^overwrite\..+\.ya?ml$/.test(filename);
 }
+var MATCH_KEYS = /* @__PURE__ */ new Set(["subscription", "url-domain"]);
+function normalizeMatch(raw, fileName) {
+  if (raw == null) return void 0;
+  if (typeof raw !== "object" || Array.isArray(raw)) {
+    console.warn(`\u8B66\u544A: \u8986\u5199\u6587\u4EF6 "${fileName}" \u7684 match \u5FC5\u987B\u662F\u5BF9\u8C61\uFF0C\u5DF2\u5FFD\u7565\u4F5C\u7528\u57DF\u9650\u5B9A`);
+    return void 0;
+  }
+  const result = {};
+  let hasValid = false;
+  for (const [key, value] of Object.entries(raw)) {
+    if (!MATCH_KEYS.has(key)) {
+      console.warn(`\u8B66\u544A: \u8986\u5199\u6587\u4EF6 "${fileName}" \u7684 match \u542B\u672A\u77E5\u952E "${key}"\uFF0C\u5DF2\u5FFD\u7565`);
+      continue;
+    }
+    const arr = (Array.isArray(value) ? value : [value]).filter((v) => typeof v === "string" && v.length > 0);
+    if (arr.length === 0) continue;
+    result[key] = arr;
+    hasValid = true;
+  }
+  return hasValid ? result : void 0;
+}
+function summarizeMatch(match) {
+  if (!match) return void 0;
+  const parts = [];
+  for (const [key, value] of Object.entries(match)) {
+    const vals = Array.isArray(value) ? value : [value];
+    parts.push(`${key}=${vals.join("/")}`);
+  }
+  return parts.length > 0 ? parts.join(", ") : void 0;
+}
+function splitUrlsLocal(url) {
+  return url.split(",").map((u) => u.trim()).filter(Boolean);
+}
+function hostMatchesDomain(host, domain) {
+  const h = host.toLowerCase();
+  const d = domain.toLowerCase();
+  return h === d || h.endsWith(`.${d}`);
+}
+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 (match["url-domain"]) {
+    const domains = Array.isArray(match["url-domain"]) ? match["url-domain"] : [match["url-domain"]];
+    if (!scope?.subUrl) return false;
+    const hosts = [];
+    for (const u of splitUrlsLocal(scope.subUrl)) {
+      try {
+        hosts.push(new URL(u).hostname);
+      } catch {
+      }
+    }
+    if (hosts.length === 0) return false;
+    const ok = domains.some((d) => hosts.some((h) => hostMatchesDomain(h, d)));
+    if (!ok) return false;
+  }
+  return true;
+}
+function filterOverwriteFilesByScope(files, scope) {
+  return files.filter((f) => matchesScope(f.match, scope));
+}
 function loadOverwriteFile() {
   const dir = USER_DATA_DIR;
   if (!fs3.existsSync(dir)) return [];
@@ -3309,9 +3525,12 @@ function loadOverwriteFile() {
     const filePath = path3.join(dir, file);
     try {
       const content = fs3.readFileSync(filePath, "utf8");
-      const parsed = load(content);
-      if (parsed && typeof parsed === "object") {
-        results.push({ name: file, path: filePath, config: parsed });
+      const parsed = load(content, { maxAliases: 200 });
+      if (parsed && typeof parsed === "object" && !Array.isArray(parsed)) {
+        const { match, ...config } = parsed;
+        results.push({ name: file, path: filePath, config, match: normalizeMatch(match, file) });
+      } else if (parsed !== null) {
+        console.warn(`\u8B66\u544A: \u8986\u5199\u6587\u4EF6 "${file}" \u9876\u5C42\u5FC5\u987B\u662F\u5BF9\u8C61\uFF0C\u5DF2\u8DF3\u8FC7`);
       }
     } catch (e) {
       console.warn(`\u8B66\u544A: \u8986\u5199\u6587\u4EF6 "${file}" \u89E3\u6790\u5931\u8D25: ${e.message}`);
@@ -3320,9 +3539,9 @@ function loadOverwriteFile() {
   return results;
 }
 function applyOverwrite(baseConfig, preloadedFiles) {
-  if (!isOverwriteEnabled()) return baseConfig;
+  if (!isOverwriteEnabled()) return { ...baseConfig };
   const overwriteFiles = preloadedFiles || loadOverwriteFile();
-  if (overwriteFiles.length === 0) return baseConfig;
+  if (overwriteFiles.length === 0) return { ...baseConfig };
   let result = { ...baseConfig };
   for (const file of overwriteFiles) {
     result = deepMergeWithOverrides(result, file.config);
@@ -3338,7 +3557,8 @@ function listOverwriteFile() {
     files: files.map((f) => ({
       name: f.name,
       path: f.path,
-      keys: Object.keys(f.config || {})
+      keys: Object.keys(f.config || {}),
+      scope: summarizeMatch(f.match)
     }))
   };
 }
@@ -3349,6 +3569,7 @@ 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) {
@@ -3408,6 +3629,7 @@ function formatBytes(bytes) {
 }
 function formatTimestamp(ts) {
   if (ts === void 0 || ts === null) return "\u672A\u77E5";
+  if (ts === 0) return "\u6C38\u4E45";
   try {
     return new Date(ts * 1e3).toLocaleString("zh-CN");
   } catch {
@@ -3429,7 +3651,7 @@ function formatDate(dateOrIso) {
   }
 }
 function hasFlag(args, short, long) {
-  return !!args && (args.includes(short) || args.includes(long));
+  return !!args && (args.includes(short) || long !== void 0 && args.includes(long));
 }
 function parseIntArg(args, short, long, defaultValue) {
   if (!args) return defaultValue;
@@ -3439,11 +3661,29 @@ function parseIntArg(args, short, long, defaultValue) {
         const val = parseInt(args[i + 1], 10);
         return Number.isNaN(val) ? defaultValue : val;
       }
+    } else if (args[i].startsWith(`${long}=`)) {
+      const val = parseInt(args[i].slice(long.length + 1), 10);
+      if (!Number.isNaN(val)) return val;
     }
   }
   return defaultValue;
 }
 var VALUE_FLAGS = /* @__PURE__ */ new Set(["-t", "--timeout", "-j", "--concurrency", "-r", "--rounds", "-n", "--lines", "-u", "--update-timeout"]);
+function extractStartOptions(args) {
+  if (!args) return [];
+  const BOOL_FLAGS = /* @__PURE__ */ new Set(["-s", "--no-update", "--no-clean"]);
+  const out = [];
+  for (let i = 0; i < args.length; i++) {
+    const a = args[i];
+    if (VALUE_FLAGS.has(a)) {
+      out.push(a);
+      if (i + 1 < args.length) out.push(args[++i]);
+    } else if (BOOL_FLAGS.has(a) || /^--(timeout|concurrency|rounds|update-timeout)=/.test(a)) {
+      out.push(a);
+    }
+  }
+  return out;
+}
 function getNonFlagArg(args, startIdx, valueFlags = VALUE_FLAGS) {
   if (!args) return null;
   for (let i = startIdx; i < args.length; i++) {
@@ -3465,6 +3705,15 @@ function isProcessRunning(pid) {
     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 {
@@ -3475,7 +3724,8 @@ function isProcessRoot(pid) {
   }
 }
 function createHttpClient(options = {}) {
-  const { timeout = 6e4 } = options;
+  const { timeout = 6e4, secret } = options;
+  const authHeaders = secret ? { Authorization: `Bearer ${secret}` } : {};
   return {
     async get(url, config) {
       const controller = new AbortController();
@@ -3484,7 +3734,7 @@ function createHttpClient(options = {}) {
       try {
         const response = await fetch(url, {
           signal,
-          headers: { "User-Agent": `mihomo-cli/${VERSION}` }
+          headers: { "User-Agent": `mihomo-cli/${VERSION}`, ...authHeaders }
         });
         if (!response.ok) {
           const error = new Error(`HTTP ${response.status}`);
@@ -3495,7 +3745,12 @@ function createHttpClient(options = {}) {
           }
           throw error;
         }
-        const data = config?.responseType === "json" ? await response.json() : await response.text();
+        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);
@@ -3503,6 +3758,29 @@ function createHttpClient(options = {}) {
     }
   };
 }
+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);
+      }
+    }
+  } finally {
+    reader.releaseLock();
+  }
+  return Buffer.concat(chunks).toString("utf8");
+}
 function normalizeMirrorUrl(val) {
   if (!val) return null;
   if (val === "direct" || val === "no" || val === "none") return null;
@@ -3522,19 +3800,23 @@ function parseMirrorArg(args) {
   if (args.includes("--no-mirror") || args.includes("--direct")) {
     return { mirror: null, isOverride: true, type: "download" };
   }
+  const mirrorAllEq = args.find((a) => a.startsWith("--mirror-all="));
   const mirrorAllIdx = args.indexOf("--mirror-all");
-  if (mirrorAllIdx >= 0) {
-    const nextArg = args[mirrorAllIdx + 1];
+  if (mirrorAllIdx >= 0 || mirrorAllEq) {
+    const inline = mirrorAllEq?.slice("--mirror-all=".length);
+    const nextArg = inline ?? args[mirrorAllIdx + 1];
     if (!nextArg || nextArg.startsWith("-")) {
-      return { mirror: "https://v6.gh-proxy.org/", isOverride: true, type: "all" };
+      return { mirror: DEFAULT_MIRROR, isOverride: true, type: "all" };
     }
     return { mirror: normalizeMirrorUrl(nextArg), isOverride: true, type: "all" };
   }
+  const mirrorEq = args.find((a) => a.startsWith("--mirror="));
   const mirrorIdx = args.indexOf("--mirror");
-  if (mirrorIdx >= 0) {
-    const nextArg = args[mirrorIdx + 1];
+  if (mirrorIdx >= 0 || mirrorEq) {
+    const inline = mirrorEq?.slice("--mirror=".length);
+    const nextArg = inline ?? args[mirrorIdx + 1];
     if (!nextArg || nextArg.startsWith("-")) {
-      return { mirror: "https://v6.gh-proxy.org/", isOverride: true, type: "download" };
+      return { mirror: DEFAULT_MIRROR, isOverride: true, type: "download" };
     }
     return { mirror: normalizeMirrorUrl(nextArg), isOverride: true, type: "download" };
   }
@@ -3551,12 +3833,16 @@ function isProxyValid(proxy) {
 }
 
 // src/config.ts
+var SAFE_YAML_LOAD_OPTIONS = { maxAliases: 200 };
+function loadYamlSafe(content) {
+  return load(content, SAFE_YAML_LOAD_OPTIONS);
+}
 function parseYamlOrJson(content, errorMsg) {
   if (!content?.trim()) {
     throw new Error(`${errorMsg || "\u5185\u5BB9"}\u4E3A\u7A7A`);
   }
   try {
-    const result = load(content);
+    const result = loadYamlSafe(content);
     if (result != null && typeof result === "object" && !Array.isArray(result)) return result;
   } catch {
   }
@@ -3567,16 +3853,17 @@ function parseYamlOrJson(content, errorMsg) {
   }
 }
 function dumpYaml(obj) {
-  return dump(obj, { indent: 2, lineWidth: -1, schema: CORE_SCHEMA });
+  return dump(obj, { indent: 2, lineWidth: -1 });
 }
 function collectOverwriteProxyNames(overwriteFiles) {
   const names = [];
   for (const file of overwriteFiles) {
     for (const [key, value] of Object.entries(file.config)) {
-      if ((key === "+proxies" || key === "proxies+") && Array.isArray(value)) {
+      if ((key === "+proxies" || key === "proxies+" || key === "~proxies") && Array.isArray(value)) {
         for (const proxy of value) {
           if (proxy && typeof proxy === "object" && "name" in proxy) {
-            names.push(proxy.name);
+            const name = proxy.name;
+            if (typeof name === "string" && name.length > 0) names.push(name);
           }
         }
       }
@@ -3614,6 +3901,7 @@ function deduplicateByName(items) {
   });
   return { result, names, duplicates };
 }
+var NON_TARGET_RULE_TYPES = /* @__PURE__ */ new Set(["SUB-RULE"]);
 function getRuleTarget(rule) {
   const parts = rule.split(",");
   if (parts.length < 2) return "";
@@ -3667,6 +3955,8 @@ function validateConfig(config) {
   if (rules.length > 0) {
     const removedRules = [];
     config.rules = rules.filter((rule) => {
+      const ruleType = rule.split(",")[0]?.trim().toUpperCase();
+      if (NON_TARGET_RULE_TYPES.has(ruleType)) return true;
       const target = getRuleTarget(rule);
       if (!target || validNames.has(target)) return true;
       removedRules.push(rule);
@@ -3678,13 +3968,14 @@ function validateConfig(config) {
   }
   return warnings;
 }
-function buildConfig(subRawContent, mode) {
+function buildConfig(subRawContent, mode, scope) {
   const subscriptionConfig = parseYamlOrJson(subRawContent, "\u8BA2\u9605\u5185\u5BB9");
   if (!subscriptionConfig) {
     throw new Error("\u8BA2\u9605\u5185\u5BB9\u4E3A\u7A7A");
   }
   const overwriteEnabled = isOverwriteEnabled();
-  const overwriteFiles = overwriteEnabled ? loadOverwriteFile() : [];
+  const allFiles = overwriteEnabled ? loadOverwriteFile() : [];
+  const overwriteFiles = filterOverwriteFilesByScope(allFiles, scope);
   const withOverwrites = applyOverwrite(subscriptionConfig, overwriteFiles);
   if (overwriteFiles.length > 0) {
     excludeOverwriteProxiesFromIncludeAll(withOverwrites, overwriteFiles);
@@ -3695,7 +3986,6 @@ function buildConfig(subRawContent, mode) {
       systemConfig[key] = value;
     }
   }
-  systemConfig["allow-lan"] = false;
   systemConfig["external-controller"] = BASE_CONFIG["external-controller"];
   systemConfig["mixed-port"] = BASE_CONFIG["mixed-port"];
   delete withOverwrites["mixed-port"];
@@ -3704,6 +3994,11 @@ function buildConfig(subRawContent, mode) {
   delete withOverwrites["external-ui"];
   delete withOverwrites["external-ui-name"];
   delete withOverwrites["external-ui-url"];
+  delete withOverwrites.secret;
+  const controllerSecret = readSettings().controller_secret;
+  if (controllerSecret) {
+    systemConfig.secret = controllerSecret;
+  }
   if (mode === "tun") {
     systemConfig.tun = TUN_CONFIG.tun;
     const subDns = withOverwrites.dns || {};
@@ -3759,7 +4054,7 @@ function getConfigInfo() {
   if (!hasConfig()) return null;
   try {
     const content = fs4.readFileSync(PATHS.configFile, "utf8");
-    const cfg = load(content);
+    const cfg = loadYamlSafe(content);
     if (!cfg) return null;
     const proxies = cfg.proxies;
     const proxyGroups = cfg["proxy-groups"];
@@ -3892,6 +4187,33 @@ import path5 from "path";
 import { spawn, spawnSync as spawnSync3 } from "child_process";
 import fs5 from "fs";
 import path4 from "path";
+
+// src/lifecycle.ts
+var cleanupFns = /* @__PURE__ */ new Set();
+var silentSigint = false;
+function setSilentSigint(value) {
+  silentSigint = value;
+}
+function isSilentSigint() {
+  return silentSigint;
+}
+function registerCleanup(fn) {
+  cleanupFns.add(fn);
+  return () => {
+    cleanupFns.delete(fn);
+  };
+}
+function runCleanup() {
+  for (const fn of cleanupFns) {
+    try {
+      fn();
+    } catch {
+    }
+  }
+  cleanupFns.clear();
+}
+
+// src/process.ts
 var PROCESS_WAIT_ATTEMPTS = 50;
 var PROCESS_WAIT_INTERVAL = 100;
 var STARTUP_WAIT_MS = 800;
@@ -3950,6 +4272,9 @@ function checkStaleState() {
     needsSudo: hasRootProcess || hasRootPidFile
   };
 }
+function hasRootResidue() {
+  return checkStaleState().needsSudo;
+}
 function savePid(pid) {
   ensureDirs();
   fs5.writeFileSync(PATHS.pidFile, pid.toString(), { mode: 384 });
@@ -3968,23 +4293,10 @@ function clearPid() {
     }
   }
 }
-function killProcess(pid, needsSudo = false) {
+function killProcess(pid) {
   try {
-    if (needsSudo) {
-      const result = spawnSync3("sudo", ["kill", "-9", String(pid)], { stdio: "inherit", timeout: 1e4 });
-      if (result.status === 0) {
-        return true;
-      }
-      try {
-        process.kill(pid, "SIGKILL");
-        return true;
-      } catch {
-        return false;
-      }
-    } else {
-      process.kill(pid, "SIGKILL");
-      return true;
-    }
+    process.kill(pid, "SIGKILL");
+    return true;
   } catch {
     return false;
   }
@@ -4030,7 +4342,7 @@ function cleanupAll(forceSudo = false) {
       killedCount = pids.length;
     } else {
       for (const pid of pids) {
-        if (killProcess(pid, false)) {
+        if (killProcess(pid)) {
           killedCount++;
         } else {
           failedPids.push(pid);
@@ -4082,12 +4394,13 @@ for i in 1 2 3 4 5; do
   fi
 done
 
-# \u5931\u8D25\uFF0C\u663E\u793A\u65E5\u5FD7
+# \u5931\u8D25\uFF0C\u663E\u793A\u65E5\u5FD7\uFF08\u9000\u51FA\u7801 2\uFF1A\u907F\u5F00 sudo \u7684 1=\u9274\u6743\u5931\u8D25/\u53D6\u6D88\uFF0C\u4F9B\u8C03\u7528\u65B9\u533A\u5206\uFF09
+rm -f "\${PID_FILE}" 2>/dev/null || true
 echo "TUN \u542F\u52A8\u5931\u8D25"
 echo ""
 echo "--- \u65E5\u5FD7 ---"
 tail -25 "\${LOG_FILE}" 2>/dev/null
-exit 1
+exit 2
 `;
   const scriptPath = path4.join(DIRS.runtime, "launch-tun.sh");
   fs5.writeFileSync(scriptPath, scriptContent, { mode: 448 });
@@ -4145,7 +4458,7 @@ async function startMixedMode(staleState) {
   if (staleState.needsCleanup) {
     if (staleState.needsSudo) {
       console.log("\n\u53D1\u73B0\u9700\u8981 root \u6743\u9650\u6E05\u7406\u7684\u6B8B\u7559\u8FDB\u7A0B/\u6587\u4EF6");
-      console.log("\u8BF7\u5148\u624B\u52A8\u6E05\u7406: sudo pkill -9 mihomo");
+      console.log(`\u8BF7\u5148\u624B\u52A8\u6E05\u7406: sudo pkill -9 mihomo && sudo rm -f ${PATHS.pidFile}`);
       console.log("\u6216\u8005\u5207\u6362\u5230 TUN \u6A21\u5F0F\uFF0C\u542F\u52A8\u65F6\u4F1A\u81EA\u52A8\u6E05\u7406");
       throw new Error("\u5B58\u5728\u9700\u8981 root \u6743\u9650\u6E05\u7406\u7684\u6B8B\u7559");
     }
@@ -4176,9 +4489,15 @@ async function startMixedMode(staleState) {
     detached: true,
     stdio: ["ignore", logFd, logFd]
   });
+  child.on("error", () => {
+  });
   fs5.closeSync(logFd);
   child.unref();
   const pid = child.pid;
+  if (!pid) {
+    clearPid();
+    throw new Error("\u542F\u52A8\u5931\u8D25\uFF1A\u65E0\u6CD5\u521B\u5EFA\u5185\u6838\u8FDB\u7A0B\uFF08\u5185\u6838\u4E8C\u8FDB\u5236\u53EF\u80FD\u4E0D\u53EF\u6267\u884C\uFF09");
+  }
   savePid(pid);
   await new Promise((resolve) => setTimeout(resolve, STARTUP_WAIT_MS));
   if (!isRunning()) {
@@ -4219,6 +4538,9 @@ async function startTunMode(staleState) {
     if (e.status === 1) {
       throw new Error("\u5BC6\u7801\u9519\u8BEF\u6216\u53D6\u6D88");
     }
+    if (e.status === 2) {
+      throw new Error("TUN \u542F\u52A8\u5931\u8D25\uFF08\u8BE6\u89C1\u4E0A\u65B9\u65E5\u5FD7\uFF09");
+    }
     throw new Error(e.message);
   }
   try {
@@ -4351,7 +4673,7 @@ function getLogPathByName(name) {
 }
 function openUrl(url) {
   try {
-    const child = spawn("open", [url], { stdio: "ignore", detached: true });
+    const child = spawn("open", ["--", url], { stdio: "ignore", detached: true });
     child.unref();
     child.on("error", () => {
     });
@@ -4383,6 +4705,7 @@ function viewLogWithTail(logPath, options) {
   tailArgs.push("-n", lines.toString());
   tailArgs.push(logPath);
   const tail = spawn("tail", tailArgs, { stdio: "inherit" });
+  if (follow) setSilentSigint(true);
   tail.on("close", () => process.exit(0));
   tail.on("error", (e) => {
     console.error(`\u65E0\u6CD5\u8BFB\u53D6\u65E5\u5FD7: ${e.message}`);
@@ -4538,10 +4861,13 @@ function disableDaemon() {
 async function tryHotReload() {
   const controller = new AbortController();
   const timer = setTimeout(() => controller.abort(), HOT_RELOAD_TIMEOUT_MS);
+  const secret = readSettings().controller_secret;
+  const headers = { "Content-Type": "application/json" };
+  if (secret) headers.Authorization = `Bearer ${secret}`;
   try {
     const res = await fetch(`${CONTROLLER_BASE_URL}/configs?force=true`, {
       method: "PUT",
-      headers: { "Content-Type": "application/json" },
+      headers,
       body: "{}",
       signal: controller.signal
     });
@@ -4581,7 +4907,11 @@ async function restartDaemon() {
 
 // src/subscription.ts
 function isGithubUrl(url) {
-  return /github\.com|raw\.githubusercontent\.com/i.test(url);
+  const githubRe = /github\.com|raw\.githubusercontent\.com/i;
+  if (isMultiUrl(url)) {
+    return splitUrls(url).every((u) => githubRe.test(u));
+  }
+  return githubRe.test(url);
 }
 function getDefaultUpdateInterval(url) {
   return isGithubUrl(url) ? DEFAULT_UPDATE_INTERVAL_HOURS_GITHUB : DEFAULT_UPDATE_INTERVAL_HOURS;
@@ -4593,6 +4923,14 @@ var HTTP_CLIENT = createHttpClient({ timeout: 6e4 });
 function isMultiUrl(url) {
   return url.includes(",");
 }
+function isValidHttpUrl(url) {
+  try {
+    const u = new URL(url.trim());
+    return u.protocol === "http:" || u.protocol === "https:";
+  } catch {
+    return false;
+  }
+}
 function splitUrls(url) {
   return url.split(",").map((u) => u.trim()).filter(Boolean);
 }
@@ -4708,7 +5046,7 @@ function pickSingleSubscription(subs, pattern) {
   for (const s of subs) console.log(`  ${s.name}`);
   process.exit(1);
 }
-async function downloadSubscription(url, subName = "default", signal) {
+async function downloadSubscription(url, subName = "default", signal, persist = true) {
   let response;
   try {
     response = await HTTP_CLIENT.get(url, { responseType: "text", signal });
@@ -4729,9 +5067,13 @@ async function downloadSubscription(url, subName = "default", signal) {
   }
   const parsed = parseYamlOrJson(content, "\u8BA2\u9605\u5185\u5BB9");
   if (!parsed) throw new Error("\u8BA2\u9605\u5185\u5BB9\u4E3A\u7A7A");
-  saveSubscriptionRawConfig(subName, content);
+  if (persist) {
+    saveSubscriptionRawConfig(subName, content);
+  }
   const meta = extractSubscriptionMeta(response.headers);
-  saveSubscriptionMeta(subName, meta);
+  if (persist) {
+    saveSubscriptionMeta(subName, meta);
+  }
   const proxies = parsed.proxies;
   const proxyGroups = parsed["proxy-groups"];
   return {
@@ -4743,13 +5085,16 @@ async function downloadSubscription(url, subName = "default", signal) {
     username: meta.username
   };
 }
-async function downloadMergedSubscription(urls, subName, signal) {
+async function downloadMergedSubscription(urls, subName, signal, persist = true) {
+  const internal = new AbortController();
+  const combinedSignal = signal ? AbortSignal.any([signal, internal.signal]) : internal.signal;
   const responses = await Promise.all(
     urls.map(async (url, index) => {
       try {
-        const response = await HTTP_CLIENT.get(url, { responseType: "text", signal });
+        const response = await HTTP_CLIENT.get(url, { responseType: "text", signal: combinedSignal });
         return { url, index, response, error: null };
       } catch (e) {
+        internal.abort();
         return { url, index, response: null, error: e };
       }
     })
@@ -4780,9 +5125,13 @@ async function downloadMergedSubscription(urls, subName, signal) {
   }
   base.proxies = baseProxies;
   const mergedContent = dumpYaml(base);
-  saveSubscriptionRawConfig(subName, mergedContent);
+  if (persist) {
+    saveSubscriptionRawConfig(subName, mergedContent);
+  }
   const meta = extractSubscriptionMeta(responses[0].response?.headers);
-  saveSubscriptionMeta(subName, meta);
+  if (persist) {
+    saveSubscriptionMeta(subName, meta);
+  }
   const proxyGroups = base["proxy-groups"];
   return {
     proxies: baseProxies.length,
@@ -4798,7 +5147,8 @@ function prepareConfigForStart(mode, subName = "default") {
   if (!rawContent) {
     throw new Error(`\u672A\u627E\u5230\u8BA2\u9605\u914D\u7F6E "${subName}"\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605`);
   }
-  const buildResult = buildConfig(rawContent, mode);
+  const subUrl = getSubscriptions().find((s) => s.name === subName)?.url;
+  const buildResult = buildConfig(rawContent, mode, { subName, subUrl });
   if (buildResult.warnings.length > 0) {
     for (const warning of buildResult.warnings) {
       console.log(`${colors.yellow("\u81EA\u52A8\u4FEE\u590D:")} ${warning}`);
@@ -4857,16 +5207,23 @@ async function autoUpdateStaleSubscription(options = {}) {
   }
   const timeoutMs = options.timeout ?? DEFAULT_AUTO_UPDATE_TIMEOUT;
   const controller = new AbortController();
-  let results;
+  const results = [];
+  const updatePromise = Promise.all(
+    staleSubs.map(
+      (sub) => tryUpdateOne(sub, controller.signal).then((r) => {
+        results.push(r);
+        return r;
+      })
+    )
+  );
   try {
-    results = await withTimeout(Promise.all(staleSubs.map((sub) => tryUpdateOne(sub, controller.signal))), timeoutMs);
+    await withTimeout(updatePromise, timeoutMs);
   } catch (e) {
-    if (e instanceof TimeoutError) {
-      controller.abort();
-      console.log(colors.yellow(`\u81EA\u52A8\u66F4\u65B0\u8D85\u65F6 (${timeoutMs / 1e3}s)\uFF0C\u8DF3\u8FC7\u66F4\u65B0\uFF0C\u4F7F\u7528\u7F13\u5B58\u914D\u7F6E`));
-      return { total: staleSubs.length, updated: 0, failed: staleSubs.length };
-    }
-    throw e;
+    if (!(e instanceof TimeoutError)) throw e;
+    controller.abort();
+    await updatePromise.catch(() => {
+    });
+    console.log(colors.yellow(`\u81EA\u52A8\u66F4\u65B0\u8D85\u65F6 (${timeoutMs / 1e3}s)\uFF0C\u5DF2\u5B8C\u6210\u7684\u66F4\u65B0\u751F\u6548\uFF0C\u5176\u4F59\u4F7F\u7528\u7F13\u5B58\u914D\u7F6E`));
   }
   let updatedCount = 0;
   for (const r of results) {
@@ -4908,7 +5265,8 @@ async function testSubscriptionProxies(subName, options = {}) {
   if (proxies.length === 0) {
     return { total: 0, alive: 0, dead: 0, results: [] };
   }
-  const client = createHttpClient({ timeout: timeout + 3e3 });
+  const secret = apiBase === CONTROLLER_BASE_URL ? readSettings().controller_secret : void 0;
+  const client = createHttpClient({ timeout: timeout + 3e3, secret });
   const results = new Array(proxies.length);
   let completedCount = 0;
   let nextIndex = 0;
@@ -4949,6 +5307,19 @@ function normalizeProxyNamesBeforeSave(parsed) {
       group.proxies = group.proxies.map((name) => renameMap.get(name) || name);
     }
   }
+  const rules = parsed.raw.rules;
+  if (Array.isArray(rules)) {
+    parsed.raw.rules = rules.map((rule) => {
+      if (typeof rule !== "string") return rule;
+      const parts = rule.split(",");
+      if (parts.length < 2) return rule;
+      const targetIdx = parts[parts.length - 1].trim().toLowerCase() === "no-resolve" && parts.length >= 3 ? parts.length - 2 : parts.length - 1;
+      const target = parts[targetIdx].trim();
+      const renamed = renameMap.get(target);
+      if (renamed) parts[targetIdx] = renamed;
+      return parts.join(",");
+    });
+  }
   return renameMap.size;
 }
 function cleanDeadProxies(parsed, deadNames) {
@@ -4978,11 +5349,14 @@ function cleanDeadProxies(parsed, deadNames) {
         group.proxies = group.proxies.filter((name) => !removedGroupNames.has(name));
       }
     }
+  }
+  const removedTargets = /* @__PURE__ */ new Set([...removedGroupNames, ...deadNames]);
+  if (removedTargets.size > 0) {
     const rules = parsed.raw.rules;
     if (Array.isArray(rules)) {
       parsed.raw.rules = rules.filter((rule) => {
         if (typeof rule !== "string") return true;
-        return !removedGroupNames.has(getRuleTarget(rule));
+        return !removedTargets.has(getRuleTarget(rule));
       });
     }
   }
@@ -5344,7 +5718,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, asset.name);
+  const tempPath = path6.join(DIRS.kernel, path6.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");
@@ -5357,6 +5731,12 @@ async function downloadKernel(progressCallback, mirror, releaseInfo) {
     ["-L", "--progress-bar", "--connect-timeout", "30", "--max-time", String(Math.floor(KERNEL_DOWNLOAD_TIMEOUT / 1e3)), "-o", tempPath, downloadUrl],
     { stdio: "inherit" }
   );
+  if (curlResult.error) {
+    if (curlResult.error.code === "ENOENT") {
+      throw new Error("\u672A\u627E\u5230 curl \u547D\u4EE4\uFF0C\u8BF7\u5148\u5B89\u88C5 curl \u540E\u91CD\u8BD5");
+    }
+    throw new Error(`\u4E0B\u8F7D\u5931\u8D25: ${curlResult.error.message}`);
+  }
   if (curlResult.status !== 0) {
     try {
       fs7.unlinkSync(tempPath);
@@ -5374,6 +5754,15 @@ 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 });
+      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);
+      for (const entry of entries) {
+        if (entry.startsWith("/") || entry.split("/").includes("..")) {
+          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 });
       if (tarResult.error) throw tarResult.error;
       if (tarResult.status !== 0) throw new Error(`tar \u9000\u51FA\u7801 ${tarResult.status}`);
@@ -5568,7 +5957,7 @@ function cmdLogs(args) {
 }
 
 // src/commands/overwrite.ts
-import path8 from "path";
+import path7 from "path";
 
 // src/runtime.ts
 function getRuntimeMode() {
@@ -5596,256 +5985,30 @@ async function launchOrRestart(mode) {
   return result.pid;
 }
 
-// src/commands/status.ts
-function printStatus() {
-  const status = getStatus();
-  const state = getRunningState();
-  const info = getConfigInfo();
-  const overwriteEnabled = isOverwriteEnabled();
-  const overwriteFiles = listOverwriteFile().files;
-  const activeSub = getActiveSubscription();
-  const { running, pid, daemon: daemonManaged } = state;
-  console.log("");
-  let modeLabel = "";
-  if (info && running) {
-    modeLabel = colors.cyan(info.tun ? " (TUN)" : " (Mixed)");
-  }
-  const statusText = running ? colors.green("\u25CF \u8FD0\u884C\u4E2D") : colors.yellow("\u4E0D\u5728\u8FD0\u884C");
-  console.log(`${colors.gray("\u72B6\u6001: ")}${statusText}${modeLabel}`);
-  console.log(`${colors.gray("\u5185\u6838: ")}${status.kernelVersion || "\u672A\u5B89\u88C5"}`);
-  if (pid) {
-    console.log(`${colors.gray("PID:  ")}${pid}`);
-    if (!daemonManaged && status.processInfo) {
-      console.log(`${colors.gray("\u5185\u5B58: ")}${status.processInfo.memory}`);
-    }
-  }
-  if (info) {
-    if (info.mixedPort) {
-      console.log(`${colors.gray("\u7AEF\u53E3: ")}${info.mixedPort}`);
-    } else {
-      const ports = [];
-      if (info.httpPort) ports.push(`HTTP:${info.httpPort}`);
-      if (info.socksPort) ports.push(`SOCKS:${info.socksPort}`);
-      console.log(`${colors.gray("\u7AEF\u53E3: ")}${ports.length > 0 ? ports.join(", ") : "\u672A\u77E5"}`);
-    }
-  }
-  if (activeSub) {
-    let subLine = `${colors.gray("\u8BA2\u9605: ")}${activeSub.name}`;
-    if (info) {
-      subLine += ` (${formatProxySummary(info)})`;
-    }
-    console.log(subLine);
-  } else {
-    console.log(`${colors.gray("\u8BA2\u9605: ")}\u672A\u914D\u7F6E`);
-  }
-  if (overwriteEnabled && overwriteFiles.length > 0) {
-    const names = overwriteFiles.map((f) => f.name.replace(/^overwrite\.?/, "").replace(/\.ya?ml$/, "") || "\u4E3B\u6587\u4EF6").join(", ");
-    console.log(`${colors.gray("\u8986\u5199: ")}${colors.green("\u5DF2\u542F\u7528")} (${names})`);
-  } else if (overwriteEnabled) {
-    console.log(`${colors.gray("\u8986\u5199: ")}${colors.green("\u5DF2\u542F\u7528")} (\u65E0\u6587\u4EF6)`);
-  } else {
-    console.log(`${colors.gray("\u8986\u5199: ")}${colors.yellow("\u5DF2\u7981\u7528")}`);
-  }
-  if (isDaemonEnabled()) {
-    console.log(`${colors.gray("\u4FDD\u6D3B: ")}${colors.green("\u5DF2\u542F\u7528")} ${colors.gray("(\u5F00\u673A\u81EA\u542F + \u5D29\u6E83\u91CD\u542F)")}`);
-  }
-  console.log("");
-}
-
-// src/commands/stop.ts
-function handleStopResult(result) {
-  if (result.remaining && result.remaining.length > 0) {
-    console.error(`${colors.red("\u90E8\u5206\u8FDB\u7A0B\u672A\u7EC8\u6B62:")} ${result.remaining.join(", ")}`);
-    console.error("\u8BF7\u624B\u52A8\u8FD0\u884C: sudo pkill -9 mihomo");
-    process.exit(1);
-  }
-}
-async function cmdStop() {
-  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 pids = getMihomoPids();
-  if (pids.length === 0) {
-    console.log(colors.yellow("\u4E0D\u5728\u8FD0\u884C"));
-    return;
-  }
-  console.log(`\u505C\u6B62 ${pids.length} \u4E2A\u8FDB\u7A0B...`);
-  handleStopResult(stop());
-  console.log(colors.green("\u5DF2\u505C\u6B62\u8FDB\u7A0B"));
-}
-
-// src/test-instance.ts
-import { spawn as spawn2 } from "child_process";
-import fs8 from "fs";
-import path7 from "path";
-
-// src/lifecycle.ts
-var cleanupFns = /* @__PURE__ */ new Set();
-function registerCleanup(fn) {
-  cleanupFns.add(fn);
-  return () => {
-    cleanupFns.delete(fn);
-  };
-}
-function runCleanup() {
-  for (const fn of cleanupFns) {
-    try {
-      fn();
-    } catch {
-    }
-  }
-  cleanupFns.clear();
-}
-
-// src/test-instance.ts
-var TEST_DIR = path7.join(USER_DATA_DIR, "test");
-var TEST_DIRS = {
-  data: path7.join(TEST_DIR, "data"),
-  runtime: path7.join(TEST_DIR, "runtime")
-};
-var TEST_PATHS = {
-  configFile: path7.join(TEST_DIRS.runtime, "config.yaml"),
-  pidFile: path7.join(TEST_DIRS.runtime, "pid"),
-  logFile: path7.join(TEST_DIR, "test.log")
-};
-var TEST_API = `http://${TEST_CONFIG["external-controller"]}`;
-function ensureTestDirs() {
-  for (const dir of Object.values(TEST_DIRS)) {
-    fs8.mkdirSync(dir, { recursive: true, mode: 448 });
-  }
-}
-function cleanupTestDir() {
-  rmrf(TEST_DIR);
-}
-function buildTestConfig(subName) {
-  ensureTestDirs();
-  const rawContent = readSubscriptionRawConfig(subName);
-  if (!rawContent) {
-    throw new Error(`\u672A\u627E\u5230\u8BA2\u9605\u914D\u7F6E "${subName}"`);
-  }
-  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`);
-  }
-  const nameCount = /* @__PURE__ */ new Map();
-  for (const proxy of proxies) {
-    const count = (nameCount.get(proxy.name) || 0) + 1;
-    nameCount.set(proxy.name, count);
-    if (count > 1) {
-      proxy.name = `${proxy.name} #${count}`;
-    }
-  }
-  const config = {
-    ...TEST_CONFIG,
-    proxies,
-    "proxy-groups": [
-      {
-        name: "PROXY",
-        type: "select",
-        proxies: proxies.map((p) => p.name)
-      }
-    ],
-    rules: ["MATCH,PROXY"]
-  };
-  const content = dumpYaml(config);
-  fs8.writeFileSync(TEST_PATHS.configFile, content, { mode: 384 });
-}
-async function startTestInstance() {
-  const binary = PATHS.mihomoBinary;
-  if (!fs8.existsSync(binary)) throw new Error("\u672A\u627E\u5230 mihomo \u5185\u6838");
-  stopTestInstance();
-  const logFd = fs8.openSync(TEST_PATHS.logFile, "a");
-  const child = spawn2(binary, ["-d", TEST_DIRS.data, "-f", TEST_PATHS.configFile], {
-    detached: true,
-    stdio: ["ignore", logFd, logFd]
-  });
-  fs8.closeSync(logFd);
-  child.unref();
-  const pid = child.pid;
-  fs8.writeFileSync(TEST_PATHS.pidFile, pid.toString(), { mode: 384 });
-  const client = createHttpClient({ timeout: 2e3 });
-  let ready = false;
-  for (let i = 0; i < 60; i++) {
-    if (!isProcessRunning(pid)) break;
-    try {
-      await client.get(`${TEST_API}/version`);
-      ready = true;
-      break;
-    } catch {
-      await sleep(500);
-    }
-  }
-  if (!isProcessRunning(pid)) {
-    let errorDetail = "";
-    try {
-      errorDetail = fs8.readFileSync(TEST_PATHS.logFile, "utf8").slice(-1e3);
-    } catch {
-    }
-    throw new Error(`\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");
-  }
-}
-function stopTestInstance() {
-  let pid;
-  try {
-    pid = parseInt(fs8.readFileSync(TEST_PATHS.pidFile, "utf8").trim(), 10);
-  } catch {
-    return;
-  }
-  if (pid > 0 && isProcessRunning(pid)) {
-    process.kill(pid, "SIGKILL");
-    for (let i = 0; i < 20; i++) {
-      if (!isProcessRunning(pid)) break;
-      sleepSync(100);
-    }
-  }
-  try {
-    fs8.unlinkSync(TEST_PATHS.pidFile);
-  } catch {
-  }
-}
-async function withTestInstance(subName, fn) {
-  cleanupTestDir();
-  buildTestConfig(subName);
-  const unregister = registerCleanup(() => {
-    stopTestInstance();
-    cleanupTestDir();
-  });
-  try {
-    await startTestInstance();
-    return await fn(TEST_API);
-  } finally {
-    unregister();
-    stopTestInstance();
-    cleanupTestDir();
-  }
-}
-
-// src/commands/subscription.ts
-var IS_TTY = process.stdout.isTTY === true;
-var BAR_WIDTH = 20;
-function createProgressPrinter(totalRounds = 1) {
-  let alive = 0;
-  let dead = 0;
-  const resultMap = /* @__PURE__ */ new Map();
-  function render(done, total) {
-    if (!IS_TTY) return;
-    const pct = Math.round(done / total * 100);
-    const filled = Math.round(done / total * BAR_WIDTH);
-    const bar = "\u2588".repeat(filled) + "\u2591".repeat(BAR_WIDTH - filled);
-    process.stdout.write(`\r${bar} ${done}/${total} (${pct}%) | ${colors.green(`\u2713${alive}`)} ${colors.red(`\u2717${dead}`)}`);
+// src/progress.ts
+var IS_TTY = process.stdout.isTTY === true;
+var BAR_WIDTH = 20;
+function createProgressPrinter(totalRounds = 1) {
+  let alive = 0;
+  let dead = 0;
+  const resultMap = /* @__PURE__ */ new Map();
+  function render(done, total) {
+    if (!IS_TTY) return;
+    const pct = Math.round(done / total * 100);
+    const filled = Math.round(done / total * BAR_WIDTH);
+    const bar = "\u2588".repeat(filled) + "\u2591".repeat(BAR_WIDTH - filled);
+    process.stdout.write(`\r${bar} ${done}/${total} (${pct}%) | ${colors.green(`\u2713${alive}`)} ${colors.red(`\u2717${dead}`)}`);
   }
   return {
     onResult(result, index, total, round = 1) {
       if (resultMap.size === 0 && totalRounds > 1) {
         console.log(`--- \u7B2C 1 \u8F6E\u6D4B\u8BD5 (${total} \u4E2A\u8282\u70B9) ---`);
       }
+      const prev = resultMap.get(result.name);
+      if (prev) {
+        if (prev.result.delay !== null) alive--;
+        else dead--;
+      }
       if (result.delay !== null) alive++;
       else dead++;
       resultMap.set(result.name, { result, round });
@@ -5864,6 +6027,7 @@ function createProgressPrinter(totalRounds = 1) {
         process.stdout.write("\n");
       }
       console.log("");
+      if (!IS_TTY) return;
       const entries = [...resultMap.values()];
       entries.sort((a, b) => a.result.name.localeCompare(b.result.name));
       const total = entries.length;
@@ -5892,687 +6056,935 @@ function formatCleanSummary(result) {
 function formatTestSummary(summary) {
   return `\u7ED3\u679C: ${colors.green(`${summary.alive} \u5B58\u6D3B`)} / ${colors.red(`${summary.dead} \u5931\u8D25`)} / ${summary.total} \u603B\u8BA1`;
 }
-function githubRepoUrl(rawUrl) {
-  const match = rawUrl.match(/raw\.githubusercontent\.com\/([^/]+\/[^/]+)/);
-  if (match) return `https://github.com/${match[1]}`;
-  return null;
-}
-function resolveTestTarget(args) {
-  const subs = getSubscriptions();
-  if (subs.length === 0) {
-    console.error("\u9519\u8BEF: \u6CA1\u6709\u8BA2\u9605");
-    process.exit(1);
+
+// src/commands/status.ts
+function printStatus() {
+  const status = getStatus();
+  const state = getRunningState();
+  const info = getConfigInfo();
+  const overwriteEnabled = isOverwriteEnabled();
+  const overwriteFiles = listOverwriteFile().files;
+  const activeSub = getActiveSubscription();
+  const { running, pid, daemon: daemonManaged } = state;
+  console.log("");
+  let modeLabel = "";
+  if (info) {
+    modeLabel = colors.cyan(info.tun ? " (TUN)" : " (Mixed)");
   }
-  const nameArg = getNonFlagArg(args, 2);
-  const timeout = parseIntArg(args, "-t", "--timeout", DEFAULT_TEST_TIMEOUT);
-  const concurrency = parseIntArg(args, "-j", "--concurrency", DEFAULT_TEST_CONCURRENCY);
-  let target;
-  if (nameArg) {
-    const matches = findSubscriptionFuzzy(subs, nameArg);
-    target = pickSingleSubscription(matches, nameArg);
-  } else {
-    const activeSub = getActiveSubscription();
-    if (!activeSub) {
-      console.error("\u9519\u8BEF: \u6CA1\u6709\u6D3B\u8DC3\u8BA2\u9605\uFF0C\u8BF7\u6307\u5B9A\u8BA2\u9605\u540D\u79F0");
-      process.exit(1);
+  const statusText = running ? colors.green("\u25CF \u8FD0\u884C\u4E2D") : colors.yellow("\u4E0D\u5728\u8FD0\u884C");
+  console.log(`${colors.gray("\u72B6\u6001: ")}${statusText}${modeLabel}`);
+  console.log(`${colors.gray("\u5185\u6838: ")}${status.kernelVersion || "\u672A\u5B89\u88C5"}`);
+  if (pid) {
+    console.log(`${colors.gray("PID:  ")}${pid}`);
+    if (!daemonManaged && status.processInfo) {
+      console.log(`${colors.gray("\u5185\u5B58: ")}${status.processInfo.memory}`);
     }
-    target = activeSub;
-  }
-  return { target, timeout, concurrency };
-}
-function printRestartHintIfRunning() {
-  if (getRunningState().running) {
-    console.log(colors.yellow("\u63D0\u793A: \u8FD0\u884C\u4E2D\u7684\u5B9E\u4F8B\u4ECD\u4F7F\u7528\u65E7\u914D\u7F6E\uFF0C\u6267\u884C mihomo start \u4F7F\u66F4\u65B0\u751F\u6548"));
-    console.log("");
   }
-}
-async function printSubscriptionList(options) {
-  if (options?.autoUpdate !== false) {
-    const updateResult = await autoUpdateStaleSubscription();
-    if (updateResult.total > 0) console.log("");
+  if (info) {
+    if (info.tun) {
+      const extra = info.mixedPort ? `\uFF0C\u53E6\u76D1\u542C ${info.mixedPort}` : "";
+      console.log(`${colors.gray("\u7AEF\u53E3: ")}TUN \u63A5\u7BA1${extra}`);
+    } else if (info.mixedPort) {
+      console.log(`${colors.gray("\u7AEF\u53E3: ")}${info.mixedPort}`);
+    } else {
+      const ports = [];
+      if (info.httpPort) ports.push(`HTTP:${info.httpPort}`);
+      if (info.socksPort) ports.push(`SOCKS:${info.socksPort}`);
+      console.log(`${colors.gray("\u7AEF\u53E3: ")}${ports.length > 0 ? ports.join(", ") : "\u672A\u77E5"}`);
+    }
   }
-  const subs = getSubscriptionsWithCache();
-  if (subs.length === 0) {
-    console.log("\u6CA1\u6709\u8BA2\u9605");
-    console.log("");
-    console.log("\u6DFB\u52A0\u8BA2\u9605: mihomo sub add <url> [name]");
-    console.log("");
-    return;
+  if (activeSub) {
+    let subLine = `${colors.gray("\u8BA2\u9605: ")}${activeSub.name}`;
+    if (info) {
+      subLine += ` (${formatProxySummary(info)})`;
+    }
+    console.log(subLine);
+  } else {
+    console.log(`${colors.gray("\u8BA2\u9605: ")}\u672A\u914D\u7F6E`);
+  }
+  if (overwriteEnabled && overwriteFiles.length > 0) {
+    const names = overwriteFiles.map((f) => f.name.replace(/^overwrite\.?/, "").replace(/\.ya?ml$/, "") || "\u4E3B\u6587\u4EF6").join(", ");
+    console.log(`${colors.gray("\u8986\u5199: ")}${colors.green("\u5DF2\u542F\u7528")} (${names})`);
+  } else if (overwriteEnabled) {
+    console.log(`${colors.gray("\u8986\u5199: ")}${colors.green("\u5DF2\u542F\u7528")} (\u65E0\u6587\u4EF6)`);
+  } else {
+    console.log(`${colors.gray("\u8986\u5199: ")}${colors.yellow("\u5DF2\u7981\u7528")}`);
+  }
+  if (isDaemonEnabled()) {
+    console.log(`${colors.gray("\u4FDD\u6D3B: ")}${colors.green("\u5DF2\u542F\u7528")} ${colors.gray("(\u5F00\u673A\u81EA\u542F + \u5D29\u6E83\u91CD\u542F)")}`);
   }
-  const activeSub = getActiveSubscription();
-  console.log(colors.cyan("\u8BA2\u9605\u5217\u8868:"));
-  subs.forEach((s, i) => {
-    const time = formatDate(s.updated_at);
-    const defaultMark = activeSub && s.name === activeSub.name ? colors.green(" [\u4F7F\u7528\u4E2D]") : "";
-    const mergeBadge = isMultiUrl(s.url) ? colors.cyan(` [\u5408\u5E76 ${splitUrls(s.url).length} \u6E90]`) : "";
-    const interval = resolveUpdateInterval(s.url, s.update_interval);
-    console.log(`  ${i + 1}. ${s.name}${defaultMark}${mergeBadge}`);
-    console.log(`    ${colors.gray("\u66F4\u65B0: ")}${time} (\u95F4\u9694: ${interval}h)`);
-    if (s.username) {
-      console.log(`    ${colors.gray("\u7528\u6237: ")}${s.username}`);
-    }
-    if (s.download !== void 0 || s.total !== void 0) {
-      const used = (s.upload || 0) + (s.download || 0);
-      const usedStr = formatBytes(used);
-      const totalStr = formatBytes(s.total);
-      let percentStr = "";
-      if (s.total && s.total > 0) {
-        const percent = Math.min(used / s.total * 100, 100);
-        percentStr = ` (${percent.toFixed(1)}%)`;
-      }
-      console.log(`    ${colors.gray("\u6D41\u91CF: ")}${usedStr} / ${totalStr}${percentStr}`);
-    }
-    if (s.expire !== void 0) {
-      console.log(`    ${colors.gray("\u5230\u671F: ")}${formatTimestamp(s.expire)}`);
-    }
-    if (s.web_page_url) {
-      console.log(`    ${colors.gray("\u9875\u9762: ")}${s.web_page_url}`);
-    }
-  });
-  console.log("");
-  console.log("\u5207\u6362\u8BA2\u9605: mihomo sub use <name>");
-  console.log("\u65B0\u589E\u8BA2\u9605: mihomo sub add <url> [name]");
-  console.log("\u66F4\u65B0\u8BA2\u9605: mihomo sub update [name]");
-  console.log("\u5220\u9664\u8BA2\u9605: mihomo sub remove <name>");
-  console.log("\u6D4B\u8BD5\u8282\u70B9: mihomo sub test [name]");
-  console.log("\u6E05\u7406\u8282\u70B9: mihomo sub clean [name]");
-  console.log("\u6253\u5F00\u9875\u9762: mihomo sub web [name]");
   console.log("");
 }
-async function cmdSubscription(args) {
-  const action = args[1];
-  if (!action || action === "list") {
-    await printSubscriptionList();
+
+// src/commands/stop.ts
+function handleStopResult(result) {
+  if (result.remaining && result.remaining.length > 0) {
+    console.error(`${colors.red("\u90E8\u5206\u8FDB\u7A0B\u672A\u7EC8\u6B62:")} ${result.remaining.join(", ")}`);
+    console.error("\u8BF7\u624B\u52A8\u8FD0\u884C: sudo pkill -9 mihomo");
+    process.exit(1);
+  }
+}
+async function cmdStop() {
+  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;
   }
-  if (action === "add") {
-    const url = args[2];
-    const name = args[3] || "default";
-    if (!url) {
-      console.error("\u9519\u8BEF: \u8BF7\u63D0\u4F9B\u6709\u6548\u7684\u8BA2\u9605 URL");
+  const pids = getMihomoPids();
+  if (pids.length === 0) {
+    console.log(colors.yellow("\u4E0D\u5728\u8FD0\u884C"));
+    return;
+  }
+  console.log(`\u505C\u6B62 ${pids.length} \u4E2A\u8FDB\u7A0B...`);
+  handleStopResult(stop());
+  console.log(colors.green("\u5DF2\u505C\u6B62\u8FDB\u7A0B"));
+}
+
+// src/commands/start.ts
+async function cmdStart(args) {
+  if (!hasKernel()) {
+    console.error('\u9519\u8BEF: \u672A\u627E\u5230\u5185\u6838\uFF0C\u8BF7\u8FD0\u884C "mihomo kernel"');
+    process.exit(1);
+  }
+  const targetMode = args[1] === "tun" ? "tun" : "mixed";
+  const daemonEnabled = isDaemonEnabled();
+  if (targetMode === "tun" && daemonEnabled) {
+    console.error(`${colors.red("\u9519\u8BEF:")} \u4FDD\u6D3B\u5DF2\u542F\u7528\uFF08\u4EC5\u652F\u6301 Mixed \u6A21\u5F0F\uFF09\uFF0C\u65E0\u6CD5\u542F\u52A8 TUN`);
+    console.error("\u8BF7\u5148\u5173\u95ED\u4FDD\u6D3B: mihomo daemon off");
+    process.exit(1);
+  }
+  const rounds = parseIntArg(args, "-r", "--rounds", DEFAULT_CLEAN_ROUNDS);
+  const timeout = parseIntArg(args, "-t", "--timeout", DEFAULT_TEST_TIMEOUT);
+  const concurrency = parseIntArg(args, "-j", "--concurrency", DEFAULT_TEST_CONCURRENCY);
+  const skipUpdate = hasFlag(args, "-s", "--no-update");
+  const skipClean = hasFlag(args, "--no-clean");
+  const updateTimeout = parseIntArg(args, "-u", "--update-timeout", DEFAULT_AUTO_UPDATE_TIMEOUT);
+  const sub = getActiveSubscription();
+  if (!sub) {
+    console.error("\u9519\u8BEF: \u6CA1\u6709\u8BA2\u9605\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605");
+    process.exit(1);
+  }
+  if (!skipUpdate) {
+    await autoUpdateStaleSubscription({ timeout: updateTimeout });
+  }
+  if (!daemonEnabled) {
+    if (hasRootResidue()) {
+      console.error(`${colors.red("\u9519\u8BEF:")} \u5B58\u5728\u9700\u8981 root \u6743\u9650\u6E05\u7406\u7684\u6B8B\u7559\u8FDB\u7A0B/\u6587\u4EF6`);
+      console.error(`\u8BF7\u5148\u624B\u52A8\u6E05\u7406: sudo pkill -9 mihomo && sudo rm -f ${PATHS.pidFile}`);
+      console.error("\u6216\u5207\u6362\u5230 TUN \u6A21\u5F0F\u542F\u52A8\uFF08\u81EA\u52A8\u6E05\u7406\uFF09: mihomo start tun");
       process.exit(1);
     }
-    if (isMultiUrl(url)) {
-      const urls = splitUrls(url);
-      for (const u of urls) {
-        if (!u.startsWith("http")) {
-          console.error(`\u9519\u8BEF: \u65E0\u6548\u7684 URL: ${u}`);
+    const status = getStatus();
+    const hasProcess = status.running || status.allProcesses.length > 0;
+    if (hasProcess) {
+      const count = status.allProcesses.length > 0 ? status.allProcesses.length : 1;
+      console.log(`\u505C\u6B62 ${count} \u4E2A\u8FDB\u7A0B...`);
+    }
+    handleStopResult(stop());
+    if (hasProcess) {
+      console.log(`${colors.green("\u5DF2\u505C\u6B62\u8FDB\u7A0B")}
+`);
+    }
+  }
+  let configInfo;
+  try {
+    configInfo = prepareConfigForStart(targetMode, sub.name);
+  } catch (e) {
+    console.error(`${colors.red("\u914D\u7F6E\u9519\u8BEF:")} ${e.message}`);
+    process.exit(1);
+  }
+  const modeLabel = targetMode === "tun" ? "TUN" : "Mixed";
+  console.log([colors.cyan(modeLabel), sub.name, formatProxySummary(configInfo)].join(" \xB7 "));
+  try {
+    const pid = await launchOrRestart(targetMode);
+    const label = daemonEnabled ? "\u5DF2\u542F\u52A8 (\u4FDD\u6D3B)" : "\u5DF2\u542F\u52A8";
+    console.log(`${colors.green(label)}${pid ? ` (PID ${pid})` : ""}`);
+  } catch (e) {
+    const msg = e.message;
+    const lines = msg.split("\n");
+    console.error(`${colors.red("\u542F\u52A8\u5931\u8D25:")} ${lines[0]}`);
+    if (lines.length > 1) {
+      for (const line of lines.slice(1)) console.error(line);
+    }
+    process.exit(1);
+  }
+  const cleanThreshold = isGithubUrl(sub.url) ? AUTO_CLEAN_THRESHOLD_GITHUB : AUTO_CLEAN_THRESHOLD;
+  if (!skipClean && configInfo.proxies > cleanThreshold) {
+    const cache = readSubscriptionCache();
+    const lastCleanAt = cache[sub.name]?.last_auto_clean_at;
+    const withinCooldown = !!lastCleanAt && Date.now() - new Date(lastCleanAt).getTime() < AUTO_CLEAN_COOLDOWN_HOURS * 60 * 60 * 1e3;
+    if (!withinCooldown) {
+      console.log("");
+      console.log(`\u8282\u70B9\u6570 ${configInfo.proxies} \u8D85\u8FC7 ${cleanThreshold}\uFF0C\u81EA\u52A8\u6E05\u7406\uFF08${AUTO_CLEAN_COOLDOWN_HOURS}h \u5185\u4EC5\u4E00\u6B21\uFF0C--no-clean \u8DF3\u8FC7\uFF09...`);
+      console.log("");
+      await sleep(1e3);
+      const progress = createProgressPrinter(rounds);
+      const cleanResult = await autoCleanSubscription(sub.name, {
+        timeout,
+        concurrency,
+        rounds,
+        onResult: progress.onResult,
+        onRetryRound: progress.onRetryRound
+      });
+      progress.finish();
+      console.log(formatTestSummary(cleanResult.summary));
+      if (cleanResult.skipped) {
+        console.log(colors.yellow("\u5B58\u6D3B\u8282\u70B9\u4E0D\u8DB3 1%\uFF0C\u8DF3\u8FC7\u6E05\u7406\u3002\u8BF7\u68C0\u67E5\u539F\u59CB\u8BA2\u9605\u662F\u5426\u6709\u6548"));
+      } else if (cleanResult.removedProxies > 0) {
+        console.log(`${colors.green("\u5DF2\u6E05\u7406")}: ${formatCleanSummary(cleanResult)}`);
+        console.log("");
+        console.log("\u91CD\u65B0\u52A0\u8F7D\u914D\u7F6E...");
+        if (!daemonEnabled) handleStopResult(stop());
+        try {
+          configInfo = prepareConfigForStart(targetMode, sub.name);
+          const pid = await launchOrRestart(targetMode);
+          console.log(`${colors.green("\u5DF2\u91CD\u542F")}${pid ? ` (PID ${pid})` : ""} \xB7 ${formatProxySummary(configInfo)}`);
+        } catch (e) {
+          console.error(`${colors.red("\u91CD\u542F\u5931\u8D25:")} ${e.message.split("\n")[0]}`);
           process.exit(1);
         }
       }
-      console.log(`\u6DFB\u52A0\u5408\u5E76\u8BA2\u9605: ${name} (${urls.length} \u4E2A\u6E90)`);
-      try {
-        addSubscription(url, name);
-        setDefaultSubscription(name);
-        const info = await downloadMergedSubscription(urls, name);
-        console.log(`\u5DF2\u6DFB\u52A0\u5E76\u5207\u6362\u5230 "${name}" (${formatProxySummary(info)}, \u5408\u5E76 ${urls.length} \u6E90)`);
-      } catch (e) {
-        console.error(`\u6DFB\u52A0\u5931\u8D25: ${e.message}`);
-        process.exit(1);
-      }
-    } else {
-      if (!url.startsWith("http")) {
-        console.error("\u9519\u8BEF: \u8BF7\u63D0\u4F9B\u6709\u6548\u7684\u8BA2\u9605 URL");
-        process.exit(1);
+      saveSubscriptionCache(sub.name, { last_auto_clean_at: (/* @__PURE__ */ new Date()).toISOString() });
+    }
+  }
+  printStatus();
+}
+
+// src/commands/overwrite.ts
+function printOverwriteList() {
+  const info = listOverwriteFile();
+  const statusText = info.enabled ? colors.green("\u5DF2\u542F\u7528") : colors.yellow("\u5DF2\u7981\u7528");
+  console.log(`${colors.gray("\u72B6\u6001: ")}${statusText}`);
+  console.log(`${colors.gray("\u4F4D\u7F6E: ")}${info.dir}`);
+  console.log("");
+  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("");
+  } else {
+    console.log(`${colors.cyan("\u8986\u5199\u6587\u4EF6")} (${info.files.length} \u4E2A\uFF0C\u6309\u987A\u5E8F\u52A0\u8F7D):`);
+    console.log("");
+    info.files.forEach((f, i) => {
+      const num = i < 10 ? ` ${i}` : `${i}`;
+      console.log(`  ${num}. ${f.name}`);
+      if (f.scope) {
+        console.log(`    ${colors.gray("\u4F5C\u7528\u57DF: ")}${f.scope}`);
       }
-      console.log(`\u6DFB\u52A0\u8BA2\u9605: ${name}`);
-      try {
-        addSubscription(url, name);
-        setDefaultSubscription(name);
-        const info = await downloadSubscription(url, 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) {
-        console.error(`\u6DFB\u52A0\u5931\u8D25: ${e.message}`);
-        process.exit(1);
+      if (f.keys.length > 0) {
+        console.log(`    ${colors.gray("\u5B57\u6BB5: ")}${f.keys.join(", ")}`);
       }
-    }
+    });
     console.log("");
-    await printSubscriptionList();
-    return;
   }
-  if (action === "update") {
-    const name = args[2];
-    const subs = getSubscriptions();
-    if (subs.length === 0) {
-      console.error("\u9519\u8BEF: \u6CA1\u6709\u8BA2\u9605");
-      process.exit(1);
-    }
-    if (!name) {
-      console.log(`\u66F4\u65B0\u6240\u6709 ${subs.length} \u4E2A\u8BA2\u9605...`);
-      const results = await Promise.all(subs.map((sub) => tryUpdateOne(sub)));
-      let ok = 0;
-      for (const r of results) {
-        if (r.success) ok++;
-        printUpdateResult(r);
-      }
-      if (ok === 0) process.exit(1);
+  console.log("\u542F\u7528\u8986\u5199: mihomo ow on");
+  console.log("\u7981\u7528\u8986\u5199: mihomo ow off");
+  console.log("");
+}
+async function cmdOverwrite(args) {
+  const action = args?.[1];
+  const currentMode = getRuntimeMode();
+  const restartNeeded = isRestartNeededOnChange();
+  if (action === "on" || action === "enable") {
+    if (isOverwriteEnabled()) {
+      console.log("\u8986\u5199\u914D\u7F6E\u5DF2\u662F\u542F\u7528\u72B6\u6001");
       console.log("");
-      printRestartHintIfRunning();
-      await printSubscriptionList();
+      printOverwriteList();
       return;
     }
-    const matches = findSubscriptionFuzzy(subs, name);
-    const target = pickSingleSubscription(matches, name);
-    console.log(`\u66F4\u65B0\u8BA2\u9605: ${target.name}`);
-    const result = await tryUpdateOne(target);
-    if (!result.success) {
-      console.error(`\u66F4\u65B0\u5931\u8D25: ${(result.error || "").split("\n")[0]}`);
-      process.exit(1);
+    setOverwriteEnabled(true);
+    console.log("\u5DF2\u542F\u7528\u8986\u5199\u914D\u7F6E");
+    if (restartNeeded) {
+      console.log("");
+      await cmdStart(["start", currentMode, ...extractStartOptions(args)]);
+      return;
     }
-    console.log(`\u5DF2\u66F4\u65B0 (${formatProxySummary(result)})`);
     console.log("");
-    printRestartHintIfRunning();
-    await printSubscriptionList();
+    printOverwriteList();
     return;
   }
-  if (action === "use") {
-    const name = args[2];
-    const subs = getSubscriptions();
-    if (!name) {
-      console.error("\u9519\u8BEF: \u8BF7\u6307\u5B9A\u8BA2\u9605\u540D\u79F0");
-      if (subs.length > 0) {
-        console.log("\n\u53EF\u7528\u8BA2\u9605:");
-        for (const s of subs) console.log(`  ${s.name}`);
-      }
-      process.exit(1);
-    }
-    const matches = findSubscriptionFuzzy(subs, name);
-    const target = pickSingleSubscription(matches, name);
-    const currentDefault = getActiveSubscription();
-    const isAlreadyDefault = currentDefault && currentDefault.name === target.name;
-    if (isAlreadyDefault) {
-      console.log(`"${target.name}" \u5DF2\u662F\u5F53\u524D\u4F7F\u7528\u7684\u8BA2\u9605`);
+  if (action === "off" || action === "disable") {
+    if (!isOverwriteEnabled()) {
+      console.log("\u8986\u5199\u914D\u7F6E\u5DF2\u662F\u7981\u7528\u72B6\u6001");
       console.log("");
-      await printSubscriptionList();
+      printOverwriteList();
       return;
     }
-    const currentMode = getRuntimeMode();
-    const restartNeeded = isRestartNeededOnChange();
-    const success = setDefaultSubscription(target.name);
-    if (success) {
-      console.log(`\u5DF2\u5207\u6362\u5230 "${target.name}"`);
-    } else {
-      console.error(`\u9519\u8BEF: \u672A\u627E\u5230\u8BA2\u9605 "${name}"`);
-      process.exit(1);
-    }
+    setOverwriteEnabled(false);
+    console.log("\u5DF2\u7981\u7528\u8986\u5199\u914D\u7F6E");
     if (restartNeeded) {
       console.log("");
-      await cmdStart(["start", currentMode]);
+      await cmdStart(["start", currentMode, ...extractStartOptions(args)]);
       return;
     }
     console.log("");
-    await printSubscriptionList();
+    printOverwriteList();
     return;
   }
-  if (action === "web" || action === "open") {
-    const name = args[2];
-    const subs = getSubscriptionsWithCache();
-    if (subs.length === 0) {
-      console.error("\u9519\u8BEF: \u6CA1\u6709\u8BA2\u9605");
-      process.exit(1);
-    }
-    let target;
-    if (name) {
-      const matches = findSubscriptionFuzzy(subs, name);
-      target = pickSingleSubscription(matches, name);
+  console.log("");
+  printOverwriteList();
+}
+
+// src/commands/reset.ts
+import fs8 from "fs";
+import readline from "readline";
+var RESET_TARGETS = [
+  {
+    id: "subs",
+    aliases: ["sub", "subs", "subscription", "subscriptions"],
+    label: "\u8BA2\u9605",
+    paths: () => [DIRS.subscriptions],
+    needsStop: true,
+    // 同步清空 settings 里的订阅列表：只删缓存文件会留下"列表存在但无配置"的半重置状态
+    // （start 会报"未找到订阅配置"）。active_subscription 一并清除
+    onAfter: () => writeSettings({ subscriptions: void 0, active_subscription: void 0 })
+  },
+  {
+    id: "logs",
+    aliases: ["log", "logs"],
+    label: "\u65E5\u5FD7",
+    paths: () => [DIRS.logs],
+    needsStop: false
+  },
+  {
+    id: "data",
+    aliases: ["data"],
+    label: "\u8FD0\u884C\u6570\u636E",
+    paths: () => [DIRS.data],
+    needsStop: true
+  },
+  {
+    id: "runtime",
+    aliases: ["runtime"],
+    label: "\u8FD0\u884C\u65F6",
+    paths: () => [DIRS.runtime],
+    needsStop: true
+  },
+  {
+    id: "settings",
+    aliases: ["setting", "settings", "config"],
+    label: "\u8BBE\u7F6E",
+    paths: () => [PATHS.settingsFile],
+    needsStop: false
+  },
+  {
+    id: "kernel",
+    aliases: ["kernel", "core"],
+    label: "\u5185\u6838",
+    paths: () => [DIRS.kernel],
+    needsStop: false,
+    onAfter: () => clearKernelVersionCache(),
+    checkEmpty: () => !hasKernel(),
+    emptyMsg: "\u5185\u6838\u672A\u5B89\u88C5\uFF0C\u65E0\u9700\u5220\u9664",
+    warnIfRunning: true
+  },
+  {
+    id: "overwrites",
+    aliases: ["overwrite", "overwrites", "ow"],
+    label: "\u8986\u5199",
+    paths: () => {
+      const dir = USER_DATA_DIR;
+      if (!fs8.existsSync(dir)) return [];
+      return fs8.readdirSync(dir).filter(isOverwriteFilename).map((f) => `${dir}/${f}`);
+    },
+    needsStop: false
+  },
+  {
+    id: "daemon",
+    aliases: ["daemon"],
+    label: "\u4FDD\u6D3B",
+    // 卸载由确认后的 disablesDaemon 段统一处理（需 sudo，受取消保护）；
+    // 此处 paths 返回空（plist 在系统目录，用户态删不掉，且不应提前删破坏卸载），
+    // onAfter 因幂等守卫（plist 已删）成为 no-op，仅作单独 reset 未走前段时的兜底。
+    paths: () => [],
+    needsStop: false,
+    onAfter: () => disableDaemon(),
+    checkEmpty: () => !isDaemonEnabled(),
+    emptyMsg: "\u4FDD\u6D3B\u672A\u542F\u7528\uFF0C\u65E0\u9700\u5220\u9664"
+  }
+];
+function resolveResetTargets(names) {
+  const matched = [];
+  const unmatched = [];
+  for (const name of names) {
+    const t = RESET_TARGETS.find((t2) => t2.aliases.includes(name.toLowerCase()));
+    if (t) {
+      if (!matched.find((m) => m.id === t.id)) matched.push(t);
     } else {
-      target = getActiveSubscription() || subs[0];
-    }
-    const cached = subs.find((s) => s.name === target.name);
-    let webPageUrl = cached?.web_page_url;
-    if (!webPageUrl) {
-      console.log("\u8BA2\u9605\u4FE1\u606F\u4E2D\u7F3A\u5C11\u9875\u9762\u5730\u5740\uFF0C\u6B63\u5728\u66F4\u65B0\u8BA2\u9605...");
-      try {
-        await downloadSubscription(target.url, target.name);
-        const cache = readSubscriptionCache();
-        if (cache[target.name]?.web_page_url) {
-          webPageUrl = cache[target.name].web_page_url;
-        } else {
-          console.error("\u9519\u8BEF: \u8BE5\u8BA2\u9605\u6CA1\u6709\u63D0\u4F9B\u9875\u9762\u5730\u5740");
-          process.exit(1);
-        }
-      } catch (e) {
-        console.error(`\u66F4\u65B0\u5931\u8D25: ${e.message}`);
-        process.exit(1);
-      }
-    }
-    console.log(`\u6253\u5F00\u8BA2\u9605\u9875\u9762: ${webPageUrl}`);
-    const opened = openUrl(webPageUrl);
-    if (!opened) {
-      console.log("\u8BF7\u624B\u52A8\u8BBF\u95EE\u4E0A\u9762\u7684\u5730\u5740");
+      unmatched.push(name);
     }
-    return;
   }
-  if (action === "remove" || action === "rm" || action === "delete") {
-    const name = args[2];
-    const subs = getSubscriptions();
-    if (!name) {
-      console.error("\u9519\u8BEF: \u8BF7\u6307\u5B9A\u8981\u5220\u9664\u7684\u8BA2\u9605\u540D\u79F0");
-      if (subs.length > 0) {
-        console.log("\n\u53EF\u7528\u8BA2\u9605:");
-        for (const s of subs) console.log(`  ${s.name}`);
-      }
-      process.exit(1);
-    }
-    const matches = findSubscriptionFuzzy(subs, name);
-    const target = pickSingleSubscription(matches, name);
-    const switchedTo = removeSubscription(target.name);
-    console.log(`\u5DF2\u5220\u9664\u8BA2\u9605 "${target.name}"`);
-    if (switchedTo) {
-      console.log(`\u5DF2\u81EA\u52A8\u5207\u6362\u5230 "${switchedTo}"`);
-    }
+  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("-"));
+  const KNOWN_FLAGS = /* @__PURE__ */ new Set(["--full", "--yes", "-y"]);
+  const unknownFlags = flags.filter((f) => !KNOWN_FLAGS.has(f));
+  if (unknownFlags.length > 0) {
+    console.error(`\u9519\u8BEF: \u672A\u77E5\u7684\u9009\u9879: ${unknownFlags.join(", ")}`);
     console.log("");
-    await printSubscriptionList({ autoUpdate: false });
-    return;
+    console.log("\u53EF\u7528\u9009\u9879: --full\uFF08\u5220\u5168\u90E8\uFF09, -y/--yes\uFF08\u8DF3\u8FC7\u786E\u8BA4\uFF09");
+    process.exit(1);
   }
-  if (action === "clean") {
-    const { target, timeout, concurrency } = resolveTestTarget(args);
-    const rounds = parseIntArg(args, "-r", "--rounds", DEFAULT_CLEAN_ROUNDS);
-    console.log(`\u6E05\u7406\u8BA2\u9605 "${target.name}"...`);
-    console.log(`\u8D85\u65F6: ${timeout}ms  \u5E76\u53D1: ${concurrency}`);
-    console.log("");
-    const progress = createProgressPrinter(rounds);
-    const result = await withTestInstance(target.name, async (apiBase) => {
-      return autoCleanSubscription(target.name, {
-        timeout,
-        concurrency,
-        rounds,
-        apiBase,
-        onResult: progress.onResult,
-        onRetryRound: progress.onRetryRound
-      });
-    });
-    progress.finish();
-    console.log(formatTestSummary(result.summary));
-    if (result.skipped) {
+  const fullReset = flags.includes("--full");
+  const skipConfirm = flags.includes("--yes") || flags.includes("-y");
+  let targets;
+  if (fullReset) {
+    targets = RESET_TARGETS;
+  } else if (names.length > 0) {
+    const { matched, unmatched } = resolveResetTargets(names);
+    if (unmatched.length > 0) {
+      console.error(`\u9519\u8BEF: \u672A\u77E5\u7684\u91CD\u7F6E\u76EE\u6807: ${unmatched.join(", ")}`);
       console.log("");
-      console.log(colors.yellow("\u5B58\u6D3B\u8282\u70B9\u4E0D\u8DB3 1%\uFF0C\u8DF3\u8FC7\u6E05\u7406\u3002\u8BF7\u68C0\u67E5\u539F\u59CB\u8BA2\u9605\u662F\u5426\u6709\u6548"));
-    } else if (result.removedProxies > 0) {
-      console.log(`${colors.green("\u5DF2\u6E05\u7406")}: ${formatCleanSummary(result)}`);
-      if (getRunningState().running) {
-        console.log("");
-        console.log("\u63D0\u793A: \u9700\u8981\u91CD\u542F mihomo \u4F7F\u66F4\u6539\u751F\u6548 (mihomo start)");
+      console.log(`\u53EF\u7528\u76EE\u6807: ${RESET_TARGETS.map((t) => t.aliases[0]).join(", ")}`);
+      console.log("");
+      console.log("\u793A\u4F8B:");
+      console.log("  mihomo reset sub log      # \u5220\u9664\u8BA2\u9605\u548C\u65E5\u5FD7");
+      console.log("  mihomo reset kernel       # \u53EA\u5220\u5185\u6838");
+      console.log("  mihomo reset --full       # \u5220\u9664\u5168\u90E8");
+      console.log("  mihomo reset              # \u5220\u9664\u5168\u90E8\uFF08\u4FDD\u7559\u8BBE\u7F6E\u3001\u5185\u6838\u3001\u8986\u5199\uFF09");
+      process.exit(1);
+    }
+    targets = matched;
+  } else {
+    targets = RESET_TARGETS.filter((t) => !["settings", "kernel", "overwrites", "daemon"].includes(t.id));
+  }
+  for (const t of targets) {
+    if (t.checkEmpty?.()) {
+      if (targets.length === 1) {
+        console.log(t.emptyMsg);
+        return;
       }
     }
-    return;
   }
-  if (action === "test") {
-    const { target, timeout, concurrency } = resolveTestTarget(args);
-    console.log(`\u6D4B\u8BD5\u8BA2\u9605 "${target.name}" \u7684\u8282\u70B9\u8FDE\u901A\u6027...`);
-    console.log(`\u8D85\u65F6: ${timeout}ms  \u5E76\u53D1: ${concurrency}`);
-    console.log("");
-    const progress = createProgressPrinter();
-    const summary = await withTestInstance(target.name, async (apiBase) => {
-      return testSubscriptionProxies(target.name, {
-        timeout,
-        concurrency,
-        apiBase,
-        onResult: progress.onResult
-      });
-    });
-    progress.finish();
-    console.log(formatTestSummary(summary));
-    return;
+  const needsStop = targets.some((t) => t.needsStop);
+  const warnRunning = targets.some((t) => t.warnIfRunning);
+  const kernelTargeted = targets.some((t) => t.id === "kernel");
+  const daemonTargeted = targets.some((t) => t.id === "daemon");
+  const disablesDaemon = needsStop || kernelTargeted || daemonTargeted;
+  const pids = needsStop || warnRunning ? getMihomoPids() : [];
+  if (warnRunning && pids.length > 0) {
+    console.log(colors.yellow(`\u8B66\u544A: mihomo \u6B63\u5728\u8FD0\u884C (PID ${pids.join(", ")})\uFF0C\u5220\u9664\u5185\u6838\u540E\u5C06\u65E0\u6CD5\u91CD\u65B0\u542F\u52A8`));
   }
-  console.error("\u9519\u8BEF: \u672A\u77E5\u7684\u8BA2\u9605\u547D\u4EE4");
-  console.log("\u7528\u6CD5: mihomo sub [list|use|add|update|remove|web|test|clean]");
-  process.exit(1);
-}
-
-// src/commands/start.ts
-async function cmdStart(args) {
-  if (!hasKernel()) {
-    console.error('\u9519\u8BEF: \u672A\u627E\u5230\u5185\u6838\uFF0C\u8BF7\u8FD0\u884C "mihomo kernel"');
-    process.exit(1);
-  }
-  const targetMode = args[1] === "tun" ? "tun" : "mixed";
-  const daemonEnabled = isDaemonEnabled();
-  if (targetMode === "tun" && daemonEnabled) {
-    console.error(`${colors.red("\u9519\u8BEF:")} \u4FDD\u6D3B\u5DF2\u542F\u7528\uFF08\u4EC5\u652F\u6301 Mixed \u6A21\u5F0F\uFF09\uFF0C\u65E0\u6CD5\u542F\u52A8 TUN`);
-    console.error("\u8BF7\u5148\u5173\u95ED\u4FDD\u6D3B: mihomo daemon off");
-    process.exit(1);
+  if (disablesDaemon && isDaemonEnabled()) {
+    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"));
   }
-  const rounds = parseIntArg(args, "-r", "--rounds", DEFAULT_CLEAN_ROUNDS);
-  const timeout = parseIntArg(args, "-t", "--timeout", DEFAULT_TEST_TIMEOUT);
-  const concurrency = parseIntArg(args, "-j", "--concurrency", DEFAULT_TEST_CONCURRENCY);
-  const skipUpdate = hasFlag(args, "-s", "--no-update");
-  const updateTimeout = parseIntArg(args, "-u", "--update-timeout", DEFAULT_AUTO_UPDATE_TIMEOUT);
-  const sub = getActiveSubscription();
-  if (!sub) {
-    console.error("\u9519\u8BEF: \u6CA1\u6709\u8BA2\u9605\uFF0C\u8BF7\u5148\u6DFB\u52A0\u8BA2\u9605");
-    process.exit(1);
+  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 (!skipUpdate) {
-    await autoUpdateStaleSubscription({ timeout: updateTimeout });
+  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 (!daemonEnabled) {
-    const status = getStatus();
-    const hasProcess = status.running || status.allProcesses.length > 0;
-    if (hasProcess) {
-      const count = status.allProcesses.length > 0 ? status.allProcesses.length : 1;
-      console.log(`\u505C\u6B62 ${count} \u4E2A\u8FDB\u7A0B...`);
+  if (needsStop && getMihomoPids().length > 0) {
+    console.log("\u505C\u6B62\u8FDB\u7A0B...");
+    cleanupAll();
+    for (let i = 0; i < PROCESS_WAIT_ATTEMPTS; i++) {
+      if (getMihomoPids().length === 0) break;
+      await new Promise((r) => setTimeout(r, PROCESS_WAIT_INTERVAL));
     }
-    handleStopResult(stop());
-    if (hasProcess) {
-      console.log(`${colors.green("\u5DF2\u505C\u6B62\u8FDB\u7A0B")}
-`);
+  }
+  for (const t of targets) {
+    for (const p of t.paths()) {
+      if (fs8.existsSync(p)) {
+        try {
+          rmrf(p);
+        } catch (e) {
+          console.warn(`  \u8B66\u544A: \u65E0\u6CD5\u5220\u9664 ${p}: ${e.message}`);
+        }
+      }
     }
+    t.onAfter?.();
   }
-  let configInfo;
-  try {
-    configInfo = prepareConfigForStart(targetMode, sub.name);
-  } catch (e) {
-    console.error(`${colors.red("\u914D\u7F6E\u9519\u8BEF:")} ${e.message}`);
-    process.exit(1);
+  ensureDirs();
+  if (targets.some((t) => t.id === "settings")) {
+    invalidateSettingsCache();
   }
-  const modeLabel = targetMode === "tun" ? "TUN" : "Mixed";
-  console.log([colors.cyan(modeLabel), sub.name, formatProxySummary(configInfo)].join(" \xB7 "));
-  try {
-    const pid = await launchOrRestart(targetMode);
-    const label = daemonEnabled ? "\u5DF2\u542F\u52A8 (\u4FDD\u6D3B)" : "\u5DF2\u542F\u52A8";
-    console.log(`${colors.green(label)}${pid ? ` (PID ${pid})` : ""}`);
-  } catch (e) {
-    const msg = e.message;
-    const lines = msg.split("\n");
-    console.error(`${colors.red("\u542F\u52A8\u5931\u8D25:")} ${lines[0]}`);
-    if (lines.length > 1) {
-      for (const line of lines.slice(1)) console.error(line);
+  console.log(colors.green(`\u5DF2\u91CD\u7F6E: ${targets.map((t) => t.label).join("\u3001")}`));
+}
+
+// src/test-instance.ts
+import { spawn as spawn2 } from "child_process";
+import fs9 from "fs";
+import path8 from "path";
+var TEST_DIR = path8.join(USER_DATA_DIR, "test");
+var TEST_DIRS = {
+  data: path8.join(TEST_DIR, "data"),
+  runtime: path8.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")
+};
+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 });
+  }
+}
+function cleanupTestDir() {
+  rmrf(TEST_DIR);
+}
+function buildTestConfig(subName) {
+  ensureTestDirs();
+  const rawContent = readSubscriptionRawConfig(subName);
+  if (!rawContent) {
+    throw new Error(`\u672A\u627E\u5230\u8BA2\u9605\u914D\u7F6E "${subName}"`);
+  }
+  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`);
+  }
+  const nameCount = /* @__PURE__ */ new Map();
+  for (const proxy of proxies) {
+    const count = (nameCount.get(proxy.name) || 0) + 1;
+    nameCount.set(proxy.name, count);
+    if (count > 1) {
+      proxy.name = `${proxy.name} #${count}`;
     }
-    process.exit(1);
   }
-  const cleanThreshold = isGithubUrl(sub.url) ? AUTO_CLEAN_THRESHOLD_GITHUB : AUTO_CLEAN_THRESHOLD;
-  if (configInfo.proxies > cleanThreshold) {
-    console.log("");
-    console.log(`\u8282\u70B9\u6570 ${configInfo.proxies} \u8D85\u8FC7 ${cleanThreshold}\uFF0C\u81EA\u52A8\u6E05\u7406...`);
-    console.log("");
-    await sleep(1e3);
-    const progress = createProgressPrinter(rounds);
-    const cleanResult = await autoCleanSubscription(sub.name, {
-      timeout,
-      concurrency,
-      rounds,
-      onResult: progress.onResult,
-      onRetryRound: progress.onRetryRound
-    });
-    progress.finish();
-    console.log(formatTestSummary(cleanResult.summary));
-    if (cleanResult.skipped) {
-      console.log(colors.yellow("\u5B58\u6D3B\u8282\u70B9\u4E0D\u8DB3 1%\uFF0C\u8DF3\u8FC7\u6E05\u7406\u3002\u8BF7\u68C0\u67E5\u539F\u59CB\u8BA2\u9605\u662F\u5426\u6709\u6548"));
-    } else if (cleanResult.removedProxies > 0) {
-      console.log(`${colors.green("\u5DF2\u6E05\u7406")}: ${formatCleanSummary(cleanResult)}`);
-      console.log("");
-      console.log("\u91CD\u65B0\u52A0\u8F7D\u914D\u7F6E...");
-      if (!daemonEnabled) handleStopResult(stop());
-      try {
-        configInfo = prepareConfigForStart(targetMode, sub.name);
-        const pid = await launchOrRestart(targetMode);
-        console.log(`${colors.green("\u5DF2\u91CD\u542F")}${pid ? ` (PID ${pid})` : ""} \xB7 ${formatProxySummary(configInfo)}`);
-      } catch (e) {
-        console.error(`${colors.red("\u91CD\u542F\u5931\u8D25:")} ${e.message.split("\n")[0]}`);
-        process.exit(1);
+  const config = {
+    ...TEST_CONFIG,
+    proxies,
+    "proxy-groups": [
+      {
+        name: "PROXY",
+        type: "select",
+        proxies: proxies.map((p) => p.name)
       }
+    ],
+    rules: ["MATCH,PROXY"]
+  };
+  const content = dumpYaml(config);
+  fs9.writeFileSync(TEST_PATHS.configFile, content, { mode: 384 });
+}
+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');
+  stopTestInstance();
+  const logFd = fs9.openSync(TEST_PATHS.logFile, "a");
+  const child = spawn2(binary, ["-d", TEST_DIRS.data, "-f", TEST_PATHS.configFile], {
+    detached: true,
+    stdio: ["ignore", logFd, logFd]
+  });
+  child.on("error", () => {
+  });
+  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");
+  fs9.writeFileSync(TEST_PATHS.pidFile, pid.toString(), { mode: 384 });
+  const client = createHttpClient({ timeout: 2e3 });
+  let ready = false;
+  for (let i = 0; i < 60; i++) {
+    if (!isProcessRunning(pid)) break;
+    try {
+      await client.get(`${TEST_API}/version`);
+      ready = true;
+      break;
+    } catch {
+      await sleep(500);
     }
   }
-  printStatus();
+  if (!isProcessRunning(pid)) {
+    let errorDetail = "";
+    try {
+      errorDetail = fs9.readFileSync(TEST_PATHS.logFile, "utf8").slice(-1e3);
+    } catch {
+    }
+    throw new Error(`\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");
+  }
+}
+function stopTestInstance() {
+  let pid;
+  try {
+    pid = parseInt(fs9.readFileSync(TEST_PATHS.pidFile, "utf8").trim(), 10);
+  } catch {
+    return;
+  }
+  if (pid > 0 && isProcessRunning(pid) && isProcessCommandMatching(pid, TEST_PATHS.configFile)) {
+    process.kill(pid, "SIGKILL");
+    for (let i = 0; i < 20; i++) {
+      if (!isProcessRunning(pid)) break;
+      sleepSync(100);
+    }
+  }
+  try {
+    fs9.unlinkSync(TEST_PATHS.pidFile);
+  } catch {
+  }
+}
+async function withTestInstance(subName, fn) {
+  cleanupTestDir();
+  buildTestConfig(subName);
+  const unregister = registerCleanup(() => {
+    stopTestInstance();
+    cleanupTestDir();
+  });
+  try {
+    await startTestInstance();
+    return await fn(TEST_API);
+  } finally {
+    unregister();
+    stopTestInstance();
+    cleanupTestDir();
+  }
 }
 
-// src/commands/overwrite.ts
-function printOverwriteList() {
-  const info = listOverwriteFile();
-  const statusText = info.enabled ? colors.green("\u5DF2\u542F\u7528") : colors.yellow("\u5DF2\u7981\u7528");
-  console.log(`${colors.gray("\u72B6\u6001: ")}${statusText}`);
-  console.log(`${colors.gray("\u4F4D\u7F6E: ")}${info.dir}`);
-  console.log("");
-  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 ${path8.join(info.dir, "overwrite.yaml")}`);
-    console.log(`         \u6216        ${path8.join(info.dir, "overwrite.dns.yaml")}`);
-    console.log("");
+// src/commands/subscription.ts
+function githubRepoUrl(rawUrl) {
+  const match = rawUrl.match(/raw\.githubusercontent\.com\/([^/]+\/[^/]+)/);
+  if (match) return `https://github.com/${match[1]}`;
+  return null;
+}
+function resolveTestTarget(args) {
+  const subs = getSubscriptions();
+  if (subs.length === 0) {
+    console.error("\u9519\u8BEF: \u6CA1\u6709\u8BA2\u9605");
+    process.exit(1);
+  }
+  const nameArg = getNonFlagArg(args, 2);
+  const timeout = parseIntArg(args, "-t", "--timeout", DEFAULT_TEST_TIMEOUT);
+  const concurrency = parseIntArg(args, "-j", "--concurrency", DEFAULT_TEST_CONCURRENCY);
+  let target;
+  if (nameArg) {
+    const matches = findSubscriptionFuzzy(subs, nameArg);
+    target = pickSingleSubscription(matches, nameArg);
   } else {
-    console.log(`${colors.cyan("\u8986\u5199\u6587\u4EF6")} (${info.files.length} \u4E2A\uFF0C\u6309\u987A\u5E8F\u52A0\u8F7D):`);
-    console.log("");
-    info.files.forEach((f, i) => {
-      const num = i < 10 ? ` ${i}` : `${i}`;
-      console.log(`  ${num}. ${f.name}`);
-      if (f.keys.length > 0) {
-        console.log(`    ${colors.gray("\u5B57\u6BB5: ")}${f.keys.join(", ")}`);
-      }
-    });
+    const activeSub = getActiveSubscription();
+    if (!activeSub) {
+      console.error("\u9519\u8BEF: \u6CA1\u6709\u6D3B\u8DC3\u8BA2\u9605\uFF0C\u8BF7\u6307\u5B9A\u8BA2\u9605\u540D\u79F0");
+      process.exit(1);
+    }
+    target = activeSub;
+  }
+  return { target, timeout, concurrency };
+}
+function printRestartHintIfRunning() {
+  if (getRunningState().running) {
+    console.log(colors.yellow("\u63D0\u793A: \u8FD0\u884C\u4E2D\u7684\u5B9E\u4F8B\u4ECD\u4F7F\u7528\u65E7\u914D\u7F6E\uFF0C\u6267\u884C mihomo start \u4F7F\u66F4\u65B0\u751F\u6548"));
     console.log("");
   }
-  console.log("\u542F\u7528\u8986\u5199: mihomo ow on");
-  console.log("\u7981\u7528\u8986\u5199: mihomo ow off");
-  console.log("");
 }
-async function cmdOverwrite(args) {
-  const action = args?.[1];
-  const currentMode = getRuntimeMode();
-  const restartNeeded = isRestartNeededOnChange();
-  if (action === "on" || action === "enable") {
-    if (isOverwriteEnabled()) {
-      console.log("\u8986\u5199\u914D\u7F6E\u5DF2\u662F\u542F\u7528\u72B6\u6001");
-      console.log("");
-      printOverwriteList();
-      return;
-    }
-    setOverwriteEnabled(true);
-    console.log("\u5DF2\u542F\u7528\u8986\u5199\u914D\u7F6E");
-    if (restartNeeded) {
-      console.log("");
-      await cmdStart(["start", currentMode]);
-      return;
-    }
+function printSubscriptionList() {
+  const subs = getSubscriptionsWithCache();
+  if (subs.length === 0) {
+    console.log("\u6CA1\u6709\u8BA2\u9605");
+    console.log("");
+    console.log("\u6DFB\u52A0\u8BA2\u9605: mihomo sub add <url> [name]");
     console.log("");
-    printOverwriteList();
     return;
   }
-  if (action === "off" || action === "disable") {
-    if (!isOverwriteEnabled()) {
-      console.log("\u8986\u5199\u914D\u7F6E\u5DF2\u662F\u7981\u7528\u72B6\u6001");
-      console.log("");
-      printOverwriteList();
-      return;
+  const activeSub = getActiveSubscription();
+  console.log(colors.cyan("\u8BA2\u9605\u5217\u8868:"));
+  subs.forEach((s, i) => {
+    const time = formatDate(s.updated_at);
+    const defaultMark = activeSub && s.name === activeSub.name ? colors.green(" [\u4F7F\u7528\u4E2D]") : "";
+    const mergeBadge = isMultiUrl(s.url) ? colors.cyan(` [\u5408\u5E76 ${splitUrls(s.url).length} \u6E90]`) : "";
+    const interval = resolveUpdateInterval(s.url, s.update_interval);
+    console.log(`  ${i + 1}. ${s.name}${defaultMark}${mergeBadge}`);
+    console.log(`    ${colors.gray("\u66F4\u65B0: ")}${time} (\u95F4\u9694: ${interval}h)`);
+    if (s.username) {
+      console.log(`    ${colors.gray("\u7528\u6237: ")}${s.username}`);
     }
-    setOverwriteEnabled(false);
-    console.log("\u5DF2\u7981\u7528\u8986\u5199\u914D\u7F6E");
-    if (restartNeeded) {
-      console.log("");
-      await cmdStart(["start", currentMode]);
-      return;
+    if (s.download !== void 0 || s.total !== void 0) {
+      const used = (s.upload || 0) + (s.download || 0);
+      const usedStr = formatBytes(used);
+      const totalStr = formatBytes(s.total);
+      let percentStr = "";
+      if (s.total && s.total > 0) {
+        const percent = Math.min(used / s.total * 100, 100);
+        percentStr = ` (${percent.toFixed(1)}%)`;
+      }
+      console.log(`    ${colors.gray("\u6D41\u91CF: ")}${usedStr} / ${totalStr}${percentStr}`);
     }
-    console.log("");
-    printOverwriteList();
-    return;
-  }
+    if (s.expire !== void 0) {
+      console.log(`    ${colors.gray("\u5230\u671F: ")}${formatTimestamp(s.expire)}`);
+    }
+    if (s.web_page_url) {
+      console.log(`    ${colors.gray("\u9875\u9762: ")}${s.web_page_url}`);
+    }
+  });
+  console.log("");
+  console.log("\u5207\u6362\u8BA2\u9605: mihomo sub use <name>");
+  console.log("\u65B0\u589E\u8BA2\u9605: mihomo sub add <url> [name]");
+  console.log("\u66F4\u65B0\u8BA2\u9605: mihomo sub update [name]");
+  console.log("\u5220\u9664\u8BA2\u9605: mihomo sub remove <name>");
+  console.log("\u6D4B\u8BD5\u8282\u70B9: mihomo sub test [name]");
+  console.log("\u6E05\u7406\u8282\u70B9: mihomo sub clean [name]");
+  console.log("\u6253\u5F00\u9875\u9762: mihomo sub web [name]");
   console.log("");
-  printOverwriteList();
 }
-
-// src/commands/reset.ts
-import fs9 from "fs";
-import readline from "readline";
-var RESET_TARGETS = [
-  {
-    id: "subs",
-    aliases: ["sub", "subs", "subscription", "subscriptions"],
-    label: "\u8BA2\u9605",
-    paths: () => [DIRS.subscriptions],
-    needsStop: true
-  },
-  {
-    id: "logs",
-    aliases: ["log", "logs"],
-    label: "\u65E5\u5FD7",
-    paths: () => [DIRS.logs],
-    needsStop: false
-  },
-  {
-    id: "data",
-    aliases: ["data"],
-    label: "\u8FD0\u884C\u6570\u636E",
-    paths: () => [DIRS.data],
-    needsStop: true
-  },
-  {
-    id: "runtime",
-    aliases: ["runtime"],
-    label: "\u8FD0\u884C\u65F6",
-    paths: () => [DIRS.runtime],
-    needsStop: true
-  },
-  {
-    id: "settings",
-    aliases: ["setting", "settings", "config"],
-    label: "\u8BBE\u7F6E",
-    paths: () => [PATHS.settingsFile],
-    needsStop: false
-  },
-  {
-    id: "kernel",
-    aliases: ["kernel", "core"],
-    label: "\u5185\u6838",
-    paths: () => [DIRS.kernel],
-    needsStop: false,
-    onAfter: () => clearKernelVersionCache(),
-    checkEmpty: () => !hasKernel(),
-    emptyMsg: "\u5185\u6838\u672A\u5B89\u88C5\uFF0C\u65E0\u9700\u5220\u9664",
-    warnIfRunning: true
-  },
-  {
-    id: "overwrites",
-    aliases: ["overwrite", "overwrites", "ow"],
-    label: "\u8986\u5199",
-    paths: () => {
-      const dir = USER_DATA_DIR;
-      if (!fs9.existsSync(dir)) return [];
-      return fs9.readdirSync(dir).filter(isOverwriteFilename).map((f) => `${dir}/${f}`);
-    },
-    needsStop: false
-  },
-  {
-    id: "daemon",
-    aliases: ["daemon"],
-    label: "\u4FDD\u6D3B",
-    // 卸载由确认后的 disablesDaemon 段统一处理（需 sudo，受取消保护）；
-    // 此处 paths 返回空（plist 在系统目录，用户态删不掉，且不应提前删破坏卸载），
-    // onAfter 因幂等守卫（plist 已删）成为 no-op，仅作单独 reset 未走前段时的兜底。
-    paths: () => [],
-    needsStop: false,
-    onAfter: () => disableDaemon(),
-    checkEmpty: () => !isDaemonEnabled(),
-    emptyMsg: "\u4FDD\u6D3B\u672A\u542F\u7528\uFF0C\u65E0\u9700\u5220\u9664"
+async function cmdSubscription(args) {
+  const action = args[1];
+  if (!action || action === "list") {
+    printSubscriptionList();
+    return;
   }
-];
-function resolveResetTargets(names) {
-  const matched = [];
-  const unmatched = [];
-  for (const name of names) {
-    const t = RESET_TARGETS.find((t2) => t2.aliases.includes(name.toLowerCase()));
-    if (t) {
-      if (!matched.find((m) => m.id === t.id)) matched.push(t);
+  if (action === "add") {
+    const url = args[2]?.trim();
+    const name = args[3] || "default";
+    if (!url) {
+      console.error("\u9519\u8BEF: \u8BF7\u63D0\u4F9B\u6709\u6548\u7684\u8BA2\u9605 URL");
+      process.exit(1);
+    }
+    if (isMultiUrl(url)) {
+      const urls = splitUrls(url);
+      if (urls.length === 0) {
+        console.error("\u9519\u8BEF: \u8BF7\u63D0\u4F9B\u6709\u6548\u7684\u8BA2\u9605 URL");
+        process.exit(1);
+      }
+      for (const u of urls) {
+        if (!isValidHttpUrl(u)) {
+          console.error(`\u9519\u8BEF: \u65E0\u6548\u7684 URL: ${u}`);
+          process.exit(1);
+        }
+      }
+      const normalizedUrl = urls.join(",");
+      console.log(`\u6DFB\u52A0\u5408\u5E76\u8BA2\u9605: ${name} (${urls.length} \u4E2A\u6E90)`);
+      try {
+        addSubscription(normalizedUrl, name);
+        setDefaultSubscription(name);
+        const info = await downloadMergedSubscription(urls, name);
+        console.log(`\u5DF2\u6DFB\u52A0\u5E76\u5207\u6362\u5230 "${name}" (${formatProxySummary(info)}, \u5408\u5E76 ${urls.length} \u6E90)`);
+      } catch (e) {
+        removeSubscription(name);
+        console.error(`\u6DFB\u52A0\u5931\u8D25: ${e.message}`);
+        process.exit(1);
+      }
     } else {
-      unmatched.push(name);
+      if (!isValidHttpUrl(url)) {
+        console.error("\u9519\u8BEF: \u8BF7\u63D0\u4F9B\u6709\u6548\u7684\u8BA2\u9605 URL\uFF08\u9700\u4EE5 http:// \u6216 https:// \u5F00\u5934\uFF09");
+        process.exit(1);
+      }
+      console.log(`\u6DFB\u52A0\u8BA2\u9605: ${name}`);
+      try {
+        addSubscription(url, name);
+        setDefaultSubscription(name);
+        const info = await downloadSubscription(url, 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);
+        console.error(`\u6DFB\u52A0\u5931\u8D25: ${e.message}`);
+        process.exit(1);
+      }
     }
+    console.log("");
+    printSubscriptionList();
+    return;
   }
-  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("-"));
-  const fullReset = flags.includes("--full") || flags.includes("-f");
-  const skipConfirm = flags.includes("--yes") || flags.includes("-y");
-  let targets;
-  if (fullReset) {
-    targets = RESET_TARGETS;
-  } else if (names.length > 0) {
-    const { matched, unmatched } = resolveResetTargets(names);
-    if (unmatched.length > 0) {
-      console.error(`\u9519\u8BEF: \u672A\u77E5\u7684\u91CD\u7F6E\u76EE\u6807: ${unmatched.join(", ")}`);
-      console.log("");
-      console.log(`\u53EF\u7528\u76EE\u6807: ${RESET_TARGETS.map((t) => t.aliases[0]).join(", ")}`);
+  if (action === "update") {
+    const name = args[2];
+    const subs = getSubscriptions();
+    if (subs.length === 0) {
+      console.error("\u9519\u8BEF: \u6CA1\u6709\u8BA2\u9605");
+      process.exit(1);
+    }
+    if (!name) {
+      console.log(`\u66F4\u65B0\u6240\u6709 ${subs.length} \u4E2A\u8BA2\u9605...`);
+      const results = await Promise.all(subs.map((sub) => tryUpdateOne(sub)));
+      let ok = 0;
+      for (const r of results) {
+        if (r.success) ok++;
+        printUpdateResult(r);
+      }
+      if (ok === 0) process.exit(1);
       console.log("");
-      console.log("\u793A\u4F8B:");
-      console.log("  mihomo reset sub log      # \u5220\u9664\u8BA2\u9605\u548C\u65E5\u5FD7");
-      console.log("  mihomo reset kernel       # \u53EA\u5220\u5185\u6838");
-      console.log("  mihomo reset --full       # \u5220\u9664\u5168\u90E8");
-      console.log("  mihomo reset              # \u5220\u9664\u5168\u90E8\uFF08\u4FDD\u7559\u8BBE\u7F6E\u3001\u5185\u6838\u3001\u8986\u5199\uFF09");
+      printRestartHintIfRunning();
+      printSubscriptionList();
+      return;
+    }
+    const matches = findSubscriptionFuzzy(subs, name);
+    const target = pickSingleSubscription(matches, name);
+    console.log(`\u66F4\u65B0\u8BA2\u9605: ${target.name}`);
+    const result = await tryUpdateOne(target);
+    if (!result.success) {
+      console.error(`\u66F4\u65B0\u5931\u8D25: ${(result.error || "").split("\n")[0]}`);
       process.exit(1);
     }
-    targets = matched;
-  } else {
-    targets = RESET_TARGETS.filter((t) => !["settings", "kernel", "overwrites", "daemon"].includes(t.id));
+    console.log(`\u5DF2\u66F4\u65B0 (${formatProxySummary(result)})`);
+    console.log("");
+    printRestartHintIfRunning();
+    printSubscriptionList();
+    return;
   }
-  for (const t of targets) {
-    if (t.checkEmpty?.()) {
-      if (targets.length === 1) {
-        console.log(t.emptyMsg);
-        return;
+  if (action === "use") {
+    const name = args[2];
+    const subs = getSubscriptions();
+    if (!name) {
+      console.error("\u9519\u8BEF: \u8BF7\u6307\u5B9A\u8BA2\u9605\u540D\u79F0");
+      if (subs.length > 0) {
+        console.log("\n\u53EF\u7528\u8BA2\u9605:");
+        for (const s of subs) console.log(`  ${s.name}`);
       }
+      process.exit(1);
     }
-  }
-  const needsStop = targets.some((t) => t.needsStop);
-  const warnRunning = targets.some((t) => t.warnIfRunning);
-  const kernelTargeted = targets.some((t) => t.id === "kernel");
-  const daemonTargeted = targets.some((t) => t.id === "daemon");
-  const disablesDaemon = needsStop || kernelTargeted || daemonTargeted;
-  const pids = needsStop || warnRunning ? getMihomoPids() : [];
-  if (warnRunning && pids.length > 0) {
-    console.log(colors.yellow(`\u8B66\u544A: mihomo \u6B63\u5728\u8FD0\u884C (PID ${pids.join(", ")})\uFF0C\u5220\u9664\u5185\u6838\u540E\u5C06\u65E0\u6CD5\u91CD\u65B0\u542F\u52A8`));
-  }
-  if (disablesDaemon && isDaemonEnabled()) {
-    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");
+    const matches = findSubscriptionFuzzy(subs, name);
+    const target = pickSingleSubscription(matches, name);
+    const currentDefault = getActiveSubscription();
+    const isAlreadyDefault = currentDefault && currentDefault.name === target.name;
+    if (isAlreadyDefault) {
+      console.log(`"${target.name}" \u5DF2\u662F\u5F53\u524D\u4F7F\u7528\u7684\u8BA2\u9605`);
+      console.log("");
+      printSubscriptionList();
+      return;
+    }
+    const currentMode = getRuntimeMode();
+    const restartNeeded = isRestartNeededOnChange();
+    const success = setDefaultSubscription(target.name);
+    if (success) {
+      console.log(`\u5DF2\u5207\u6362\u5230 "${target.name}"`);
+    } else {
+      console.error(`\u9519\u8BEF: \u672A\u627E\u5230\u8BA2\u9605 "${name}"`);
+      process.exit(1);
+    }
+    if (restartNeeded) {
+      console.log("");
+      await cmdStart(["start", currentMode, ...extractStartOptions(args)]);
+      return;
+    }
+    console.log("");
+    printSubscriptionList();
     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 (action === "web" || action === "open") {
+    const name = args[2];
+    const subs = getSubscriptionsWithCache();
+    if (subs.length === 0) {
+      console.error("\u9519\u8BEF: \u6CA1\u6709\u8BA2\u9605");
+      process.exit(1);
+    }
+    let target;
+    if (name) {
+      const matches = findSubscriptionFuzzy(subs, name);
+      target = pickSingleSubscription(matches, name);
+    } else {
+      target = getActiveSubscription() || subs[0];
+    }
+    const cached = subs.find((s) => s.name === target.name);
+    let webPageUrl = cached?.web_page_url;
+    if (!webPageUrl) {
+      console.log("\u8BA2\u9605\u4FE1\u606F\u4E2D\u7F3A\u5C11\u9875\u9762\u5730\u5740\uFF0C\u6B63\u5728\u67E5\u8BE2\u8BA2\u9605...");
+      try {
+        const info = isMultiUrl(target.url) ? await downloadMergedSubscription(splitUrls(target.url), target.name, void 0, false) : await downloadSubscription(target.url, target.name, void 0, false);
+        if (info.webPageUrl) {
+          webPageUrl = info.webPageUrl;
+        } else {
+          console.error("\u9519\u8BEF: \u8BE5\u8BA2\u9605\u6CA1\u6709\u63D0\u4F9B\u9875\u9762\u5730\u5740");
+          process.exit(1);
+        }
+      } catch (e) {
+        console.error(`\u67E5\u8BE2\u5931\u8D25: ${e.message}`);
+        process.exit(1);
+      }
+    }
+    console.log(`\u6253\u5F00\u8BA2\u9605\u9875\u9762: ${webPageUrl}`);
+    const opened = openUrl(webPageUrl);
+    if (!opened) {
+      console.log("\u8BF7\u624B\u52A8\u8BBF\u95EE\u4E0A\u9762\u7684\u5730\u5740");
     }
+    return;
   }
-  if (needsStop && getMihomoPids().length > 0) {
-    console.log("\u505C\u6B62\u8FDB\u7A0B...");
-    cleanupAll();
-    for (let i = 0; i < PROCESS_WAIT_ATTEMPTS; i++) {
-      if (getMihomoPids().length === 0) break;
-      await new Promise((r) => setTimeout(r, PROCESS_WAIT_INTERVAL));
+  if (action === "remove" || action === "rm" || action === "delete") {
+    const name = args[2];
+    const subs = getSubscriptions();
+    if (!name) {
+      console.error("\u9519\u8BEF: \u8BF7\u6307\u5B9A\u8981\u5220\u9664\u7684\u8BA2\u9605\u540D\u79F0");
+      if (subs.length > 0) {
+        console.log("\n\u53EF\u7528\u8BA2\u9605:");
+        for (const s of subs) console.log(`  ${s.name}`);
+      }
+      process.exit(1);
+    }
+    const matches = findSubscriptionFuzzy(subs, name);
+    const target = pickSingleSubscription(matches, name);
+    const switchedTo = removeSubscription(target.name);
+    console.log(`\u5DF2\u5220\u9664\u8BA2\u9605 "${target.name}"`);
+    if (switchedTo) {
+      console.log(`\u5DF2\u81EA\u52A8\u5207\u6362\u5230 "${switchedTo}"`);
     }
+    console.log("");
+    printSubscriptionList();
+    return;
   }
-  for (const t of targets) {
-    for (const p of t.paths()) {
-      if (fs9.existsSync(p)) {
-        try {
-          rmrf(p);
-        } catch (e) {
-          console.warn(`  \u8B66\u544A: \u65E0\u6CD5\u5220\u9664 ${p}: ${e.message}`);
-        }
+  if (action === "clean") {
+    const { target, timeout, concurrency } = resolveTestTarget(args);
+    const rounds = parseIntArg(args, "-r", "--rounds", DEFAULT_CLEAN_ROUNDS);
+    console.log(`\u6E05\u7406\u8BA2\u9605 "${target.name}"...`);
+    console.log(`\u8D85\u65F6: ${timeout}ms  \u5E76\u53D1: ${concurrency}`);
+    console.log("");
+    const progress = createProgressPrinter(rounds);
+    const result = await withTestInstance(target.name, async (apiBase) => {
+      return autoCleanSubscription(target.name, {
+        timeout,
+        concurrency,
+        rounds,
+        apiBase,
+        onResult: progress.onResult,
+        onRetryRound: progress.onRetryRound
+      });
+    });
+    progress.finish();
+    console.log(formatTestSummary(result.summary));
+    if (result.skipped) {
+      console.log("");
+      console.log(colors.yellow("\u5B58\u6D3B\u8282\u70B9\u4E0D\u8DB3 1%\uFF0C\u8DF3\u8FC7\u6E05\u7406\u3002\u8BF7\u68C0\u67E5\u539F\u59CB\u8BA2\u9605\u662F\u5426\u6709\u6548"));
+    } else if (result.removedProxies > 0) {
+      console.log(`${colors.green("\u5DF2\u6E05\u7406")}: ${formatCleanSummary(result)}`);
+      if (getRunningState().running) {
+        console.log("");
+        console.log("\u63D0\u793A: \u9700\u8981\u91CD\u542F mihomo \u4F7F\u66F4\u6539\u751F\u6548 (mihomo start)");
       }
     }
-    t.onAfter?.();
+    return;
   }
-  ensureDirs();
-  if (targets.some((t) => t.id === "settings")) {
-    invalidateSettingsCache();
+  if (action === "test") {
+    const { target, timeout, concurrency } = resolveTestTarget(args);
+    console.log(`\u6D4B\u8BD5\u8BA2\u9605 "${target.name}" \u7684\u8282\u70B9\u8FDE\u901A\u6027...`);
+    console.log(`\u8D85\u65F6: ${timeout}ms  \u5E76\u53D1: ${concurrency}`);
+    console.log("");
+    const progress = createProgressPrinter();
+    const summary = await withTestInstance(target.name, async (apiBase) => {
+      return testSubscriptionProxies(target.name, {
+        timeout,
+        concurrency,
+        apiBase,
+        onResult: progress.onResult
+      });
+    });
+    progress.finish();
+    console.log(formatTestSummary(summary));
+    return;
   }
-  console.log(colors.green(`\u5DF2\u91CD\u7F6E: ${targets.map((t) => t.label).join("\u3001")}`));
+  console.error("\u9519\u8BEF: \u672A\u77E5\u7684\u8BA2\u9605\u547D\u4EE4");
+  console.log("\u7528\u6CD5: mihomo sub [list|use|add|update|remove|web|test|clean]");
+  process.exit(1);
 }
 
 // src/commands/test.ts
@@ -6640,7 +7052,14 @@ async function cmdClean(args) {
     const mode = getRuntimeMode();
     const daemonManaged = isDaemonEnabled();
     try {
-      if (!daemonManaged) handleStopResult(stop());
+      if (!daemonManaged) {
+        if (hasRootResidue()) {
+          console.error(`${colors.red("\u9519\u8BEF:")} \u4E3B\u5B9E\u4F8B\u4EE5 root \u8FD0\u884C\uFF08TUN\uFF09\uFF0C\u505C\u6B62\u5B83\u9700\u8981 sudo`);
+          console.error("\u8BF7\u6539\u7528 mihomo sub clean\uFF08\u9694\u79BB\u5B9E\u4F8B\u6D4B\u901F\uFF0C\u65E0\u9700\u505C\u6B62\u4E3B\u5B9E\u4F8B\uFF09");
+          process.exit(1);
+        }
+        handleStopResult(stop());
+      }
       const configInfo = prepareConfigForStart(mode, activeSub.name);
       const pid = await launchOrRestart(mode);
       const label = daemonManaged ? "\u5DF2\u91CD\u542F (\u4FDD\u6D3B)" : "\u5DF2\u91CD\u542F";
@@ -6663,6 +7082,10 @@ function cmdUI(args) {
   const url = UI_URLS[uiName];
   console.log(`\u6253\u5F00 Web UI: ${uiName}`);
   console.log(`\u5730\u5740: ${url}`);
+  const secret = readSettings().controller_secret;
+  if (secret) {
+    console.log("\u5DF2\u914D\u7F6E\u8BBF\u95EE\u5BC6\u94A5\uFF08UI \u8FDE\u63A5 127.0.0.1:9090 \u65F6\u9700\u8F93\u5165\uFF0C\u5BC6\u94A5\u89C1 settings.json\uFF09");
+  }
   const success = openUrl(url);
   if (!success) {
     console.log("\u8BF7\u624B\u52A8\u8BBF\u95EE\u4E0A\u9762\u7684\u5730\u5740");
@@ -6684,11 +7107,16 @@ async function cmdUpdate() {
       if (code === 0) {
         resolve();
       } else {
+        console.error("\u66F4\u65B0\u5931\u8D25\u3002\u82E5\u4E3A\u6743\u9650\u95EE\u9898\uFF08EACCES\uFF09\uFF0C\u53EF\u5C1D\u8BD5: sudo npm install -g mihomo-cli");
         process.exit(code || 1);
       }
     });
     npm.on("error", (e) => {
-      console.error(`\u6267\u884C\u5931\u8D25: ${e.message}`);
+      if (e.message.includes("EACCES") || e.message.includes("permission")) {
+        console.error("\u6743\u9650\u4E0D\u8DB3\uFF0C\u53EF\u5C1D\u8BD5: sudo npm install -g mihomo-cli");
+      } else {
+        console.error(`\u6267\u884C\u5931\u8D25: ${e.message}`);
+      }
       process.exit(1);
     });
   });
@@ -6716,7 +7144,7 @@ var COMMANDS = [
     aliases: ["up"],
     handler: cmdStart,
     group: "control",
-    usage: ["start [tun|mixed] [-s] [-u ms]     \u542F\u52A8/\u5207\u6362\u4EE3\u7406 (\u9ED8\u8BA4 mixed)", "      [-r N] [-t ms] [-j N]"]
+    usage: ["start [tun|mixed] [-s] [-u ms]     \u542F\u52A8/\u5207\u6362\u4EE3\u7406 (\u9ED8\u8BA4 mixed)", "      [-r N] [-t ms] [-j N] [--no-clean]"]
   },
   {
     name: "tun",
@@ -6775,8 +7203,8 @@ var COMMANDS = [
       "subscription update [name]   \u66F4\u65B0\u8BA2\u9605\uFF08\u65E0\u53C2\u66F4\u65B0\u6240\u6709\uFF09",
       "subscription remove <name>   \u5220\u9664\u8BA2\u9605",
       "subscription web [name]      \u6253\u5F00\u8BA2\u9605\u9875\u9762",
-      "subscription test [name]     \u6D4B\u8BD5\u8282\u70B9\u8FDE\u901A\u6027",
-      "subscription clean [name]    \u6D4B\u901F\u5E76\u6E05\u7406\u5931\u8D25\u8282\u70B9"
+      "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"
     ]
   },
   {
@@ -6792,14 +7220,14 @@ var COMMANDS = [
     aliases: [],
     handler: cmdTest,
     group: "subscription",
-    usage: ["test [-t ms] [-j N]           \u5FEB\u901F\u6D4B\u8BD5\u5F53\u524D\u8282\u70B9\u8FDE\u901A\u6027"]
+    usage: ["test [-t ms] [-j N]           \u6D4B\u8BD5\u5F53\u524D\u8282\u70B9\uFF08\u7ECF\u8FD0\u884C\u4E2D\u7684\u4E3B\u5B9E\u4F8B\uFF09"]
   },
   {
     name: "clean",
     aliases: [],
     handler: cmdClean,
     group: "subscription",
-    usage: ["clean [-t ms] [-j N] [-r N]   \u6E05\u7406\u5931\u8D25\u8282\u70B9\u5E76\u81EA\u52A8\u91CD\u542F"]
+    usage: ["clean [-t ms] [-j N] [-r N]   \u6E05\u7406\u5931\u8D25\u8282\u70B9\u5E76\u91CD\u542F\uFF08\u7ECF\u4E3B\u5B9E\u4F8B\uFF09"]
   },
   // === 配置 ===
   {
@@ -6867,7 +7295,7 @@ var COMMANDS = [
     aliases: [],
     handler: cmdReset,
     group: "system",
-    usage: ["reset [\u76EE\u6807...] [--full]   \u91CD\u7F6E: \u7559\u7A7A\u4FDD\u7559\u8BBE\u7F6E/\u5185\u6838/\u8986\u5199, \u6307\u5B9A\u76EE\u6807\u5220\u5BF9\u5E94\u9879, --full \u5220\u5168\u90E8"]
+    usage: ["reset [\u76EE\u6807...] [--full] [-y]   \u91CD\u7F6E: \u7559\u7A7A\u4FDD\u7559\u8BBE\u7F6E/\u5185\u6838/\u8986\u5199, \u6307\u5B9A\u76EE\u6807\u5220\u5BF9\u5E94\u9879, --full \u5220\u5168\u90E8, -y \u8DF3\u8FC7\u786E\u8BA4"]
   },
   // === meta(不在分组清单展示,help 末尾单列) ===
   {
@@ -6903,7 +7331,9 @@ function findCommand(token) {
 
 // src/index.ts
 process.on("SIGINT", () => {
-  console.log("\n\u6B63\u5728\u9000\u51FA...");
+  if (!isSilentSigint()) {
+    console.log("\n\u6B63\u5728\u9000\u51FA...");
+  }
   runCleanup();
   process.exit(130);
 });
@@ -6961,5 +7391,5 @@ main().catch((e) => {
 /*! Bundled license information:
 
 js-yaml/dist/js-yaml.mjs:
-  (*! js-yaml 5.2.1 https://github.com/nodeca/js-yaml @license MIT *)
+  (*! js-yaml 5.3.0 https://github.com/nodeca/js-yaml @license MIT *)
 */