mihomo-cli 1.2.5 → 1.3.1

package/index.js

@@ -1,16 +1,25 @@
 #!/usr/bin/env node
 
+// 内置模块
 const path = require('path');
-const { spawn } = require('child_process');
+const { spawn, exec } = require('child_process');
+const { promisify } = require('util');
+const readline = require('readline');
 
+// 第三方模块
+// （无第三方模块依赖）
+
+// 本地模块
 const config = require('./src/config');
 const kernel = require('./src/kernel');
 const subscription = require('./src/subscription');
-const processMgr = require('./src/process');
+const processManager = require('./src/process');
 const overwrite = require('./src/overwrite');
 const utils = require('./src/utils');
 
-const VERSION = require('./package.json').version;
+const execAsync = promisify(exec);
+const VERSION = utils.VERSION;
+const { colors } = utils;
 
 const UI_URLS = {
   zash: 'https://board.zash.run.place',
@@ -49,20 +58,28 @@ process.on('unhandledRejection', reason => {
 });
 
 function printShortHelp() {
-  console.log('\nmihomo-cli v' + VERSION + '  (mihomo help 查看完整帮助)\n');
+  console.log('\n' + colors.cyan(colors.bold('mihomo-cli v' + VERSION)) + '  (mihomo help 查看完整帮助)\n');
   console.log(
     '常用命令:\n' +
-      '  start [tun|mixed]    启动/切换代理\n' +
-      '  ui [zash|dash|yacd]  打开 Web UI\n' +
-      '  ow [on|off]          覆写配置\n' +
-      '  sub [use|update]     订阅管理\n',
+      '  ' +
+      colors.bold('start') +
+      ' [tun|mixed]    启动/切换代理\n' +
+      '  ' +
+      colors.bold('sub') +
+      ' [use|update]     订阅管理\n' +
+      '  ' +
+      colors.bold('ow') +
+      ' [on|off]          覆写配置\n' +
+      '  ' +
+      colors.bold('ui') +
+      ' [zash|dash|yacd]  打开 Web UI\n',
   );
 }
 
 function printHelp() {
   console.log(
-    '\nmihomo-cli v' +
-      VERSION +
+    '\n' +
+      colors.cyan(colors.bold('mihomo-cli v' + VERSION)) +
       '\n' +
       '\n' +
       '命令别名: mihomo, mmc, mh\n' +
@@ -70,47 +87,95 @@ function printHelp() {
       '用法:\n' +
       '  mihomo <命令> [选项]\n' +
       '\n' +
-      '控制:\n' +
-      '  start [tun|mixed]            启动/切换代理 (默认 mixed)\n' +
-      '  stop                         停止代理\n' +
-      '  status                       查看状态\n' +
+      colors.cyan('控制:') +
+      '\n' +
+      '  ' +
+      colors.bold('start') +
+      ' [tun|mixed]            启动/切换代理 (默认 mixed)\n' +
+      '  ' +
+      colors.bold('stop') +
+      '                         停止代理\n' +
+      '  ' +
+      colors.bold('status') +
+      '                       查看状态\n' +
+      '\n' +
+      colors.cyan('界面:') +
+      '\n' +
+      '  ' +
+      colors.bold('ui') +
+      ' [zash|dash|yacd]          打开 Web UI (默认 zash)\n' +
+      '  ' +
+      colors.bold('log') +
+      ' [-o]                     实时日志（-o 打开文件）\n' +
+      '  ' +
+      colors.bold('logs') +
+      ' [编号] [-n N] [-o]      日志列表（0=当前，1+=归档）\n' +
+      '\n' +
+      colors.cyan('订阅:') +
+      '\n' +
+      '  ' +
+      colors.bold('subscription') +
+      '                 列出所有订阅（别名 sub）\n' +
+      '  ' +
+      colors.bold('subscription') +
+      ' add <url> [name]  添加订阅\n' +
+      '  ' +
+      colors.bold('subscription') +
+      ' update [name]   更新订阅（无参更新所有）\n' +
+      '  ' +
+      colors.bold('subscription') +
+      ' use <name>      切换默认订阅\n' +
+      '  ' +
+      colors.bold('subscription') +
+      ' web [name]      打开订阅页面\n' +
       '\n' +
-      '界面:\n' +
-      '  ui [zash|dash|yacd]          打开 Web UI (默认 zash)\n' +
-      '  log [-o]                     实时日志（-o 打开文件）\n' +
-      '  logs [编号] [-n N] [-o]      日志列表（0=当前，1+=归档）\n' +
+      colors.cyan('配置:') +
       '\n' +
-      '订阅:\n' +
-      '  subscription                 列出所有订阅（别名 sub）\n' +
-      '  subscription add <url> [name]  添加订阅\n' +
-      '  subscription update [name]   更新订阅（无参更新所有）\n' +
-      '  subscription use <name>      切换默认订阅\n' +
-      '  subscription web [name]      打开订阅页面\n' +
+      '  ' +
+      colors.bold('overwrite') +
+      '                   查看覆写状态（别名 ow）\n' +
+      '  ' +
+      colors.bold('overwrite') +
+      ' on|off            启用/禁用覆写配置\n' +
+      '  ' +
+      colors.bold('directory') +
+      '                   显示数据目录位置（别名 dir）\n' +
+      '  ' +
+      colors.bold('directory') +
+      ' open [target]     打开目录: root|subs|logs|overwrites|...\n' +
       '\n' +
-      '配置:\n' +
-      '  overwrite                   查看覆写状态（别名 ow）\n' +
-      '  overwrite on|off            启用/禁用覆写配置\n' +
-      '  directory                   显示数据目录位置（别名 dir）\n' +
-      '  directory open [target]     打开目录: root|subs|logs|overwrites|...\n' +
+      colors.cyan('系统:') +
       '\n' +
-      '系统:\n' +
-      '  kernel [镜像|--no-mirror]    更新内核\n' +
-      '  update                       更新 mihomo-cli (npm install -g)\n' +
-      '  reset [--full]               重置用户数据 (--full 同时删除内核)\n' +
-      '  help, -h                     显示帮助\n' +
-      '  version, -v                  显示版本\n' +
+      '  ' +
+      colors.bold('kernel') +
+      ' [镜像|--no-mirror]    更新内核\n' +
+      '  ' +
+      colors.bold('update') +
+      '                       更新 mihomo-cli (npm install -g)\n' +
+      '  ' +
+      colors.bold('reset') +
+      ' [--full]               重置用户数据 (--full 同时删除内核)\n' +
+      '  ' +
+      colors.bold('help') +
+      ', -h                     显示帮助\n' +
+      '  ' +
+      colors.bold('version') +
+      ', -v                  显示版本\n' +
+      '\n' +
+      colors.cyan('示例:') +
       '\n' +
-      '示例:\n' +
       '  mihomo start              # 启动/重启 Mixed 模式\n' +
       '  mihomo start tun          # 切换到 TUN 透明代理模式\n' +
       '  mihomo sub add <url>      # 添加订阅 (sub 是 subscription 别名)\n' +
       '  mihomo ui                 # 打开 Web UI\n' +
       '\n' +
-      '模式说明:\n' +
+      colors.cyan('模式说明:') +
+      '\n' +
       '  mixed  HTTP + SOCKS5 混合端口 (默认)\n' +
       '  tun    透明代理，全局自动路由，需要 sudo\n' +
       '\n' +
-      '数据目录:\n' +
+      colors.cyan('数据目录:') +
+      '\n' +
       '  环境变量 MIHOMO_CLI_DIR 可自定义位置\n' +
       '  默认: ' +
       config.USER_DATA_DIR +
@@ -120,153 +185,66 @@ function printHelp() {
 
 function printVersion() {
   const kv = config.getKernelVersion() || '未安装';
-  console.log('mihomo-cli v' + VERSION);
-  console.log('内核: ' + kv);
-  console.log('数据目录: ' + config.USER_DATA_DIR);
+  console.log(colors.cyan(colors.bold('mihomo-cli v' + VERSION)));
+  console.log(colors.gray('内核: ') + kv);
+  console.log(colors.gray('数据目录: ') + config.USER_DATA_DIR);
 }
 
 function printStatus() {
-  const status = processMgr.getStatus();
+  const status = processManager.getStatus();
   const info = config.getConfigInfo();
-  const owEnabled = overwrite.isOverwriteEnabled();
-  const owFiles = overwrite.listOverwriteFile().files;
-  const activeSub = getActiveSubscription();
+  const overwriteEnabled = overwrite.isOverwriteEnabled();
+  const overwriteFiles = overwrite.listOverwriteFile().files;
+  const activeSub = subscription.getActiveSubscription();
 
   console.log('');
   let modeLabel = '';
   if (info && status.running) {
-    modeLabel = info.tun ? ' (TUN)' : ' (Mixed)';
+    modeLabel = colors.cyan(info.tun ? ' (TUN)' : ' (Mixed)');
   }
-  console.log('状态: ' + (status.running ? '运行中' : '已停止') + modeLabel);
-  console.log('内核: ' + (status.kernelVersion || '未安装'));
+  const statusText = status.running ? colors.green('运行中') : colors.yellow('已停止');
+  console.log(colors.gray('状态: ') + statusText + modeLabel);
+  console.log(colors.gray('内核: ') + (status.kernelVersion || '未安装'));
 
   if (status.pid) {
-    console.log('PID:  ' + status.pid);
+    console.log(colors.gray('PID:  ') + status.pid);
     if (status.processInfo) {
-      console.log('内存: ' + status.processInfo.memory);
+      console.log(colors.gray('内存: ') + status.processInfo.memory);
     }
   }
 
   if (info) {
     if (info.mixedPort) {
-      console.log('端口: ' + info.mixedPort);
+      console.log(colors.gray('端口: ') + info.mixedPort);
     } else {
       let ports = [];
       if (info.httpPort) ports.push('HTTP:' + info.httpPort);
       if (info.socksPort) ports.push('SOCKS:' + info.socksPort);
-      console.log('端口: ' + (ports.length > 0 ? ports.join(', ') : '未知'));
+      console.log(colors.gray('端口: ') + (ports.length > 0 ? ports.join(', ') : '未知'));
     }
   }
 
   if (activeSub) {
-    let subLine = '订阅: ' + activeSub.name;
+    let subLine = colors.gray('订阅: ') + activeSub.name;
     if (info) {
       subLine += ' (' + subscription.formatProxySummary(info) + ')';
     }
     console.log(subLine);
   } else {
-    console.log('订阅: 未配置');
+    console.log(colors.gray('订阅: ') + '未配置');
   }
 
-  if (owEnabled && owFiles.length > 0) {
-    const names = owFiles.map(f => f.name).join(', ');
-    console.log('覆写: 已启用 (' + names + ')');
-  } else if (owEnabled) {
-    console.log('覆写: 已启用 (无文件)');
+  if (overwriteEnabled && overwriteFiles.length > 0) {
+    const names = overwriteFiles.map(f => f.name).join(', ');
+    console.log(colors.gray('覆写: ') + colors.green('已启用') + ' (' + names + ')');
+  } else if (overwriteEnabled) {
+    console.log(colors.gray('覆写: ') + colors.green('已启用') + ' (无文件)');
   } else {
-    console.log('覆写: 已禁用');
+    console.log(colors.gray('覆写: ') + colors.yellow('已禁用'));
   }
   console.log('');
 }
 
-function getActiveSubscription() {
-  const subs = config.getSubscriptions();
-  if (subs.length === 0) {
-    return null;
-  }
-  return subs[0];
-}
-
-function findSubscriptionFuzzy(subs, pattern) {
-  const lowerPattern = pattern.toLowerCase();
-  let exact = [];
-  let prefix = [];
-  let includes = [];
-
-  for (const s of subs) {
-    const name = s.name.toLowerCase();
-    if (name === lowerPattern) {
-      exact.push(s);
-    } else if (name.startsWith(lowerPattern)) {
-      prefix.push(s);
-    } else if (name.includes(lowerPattern)) {
-      includes.push(s);
-    }
-  }
-
-  if (exact.length > 0) return exact;
-  if (prefix.length > 0) return prefix;
-  return includes;
-}
-
-function pickSingleSubscription(subs, pattern) {
-  if (subs.length === 0) {
-    console.error('错误: 未找到匹配 "' + pattern + '" 的订阅');
-    process.exit(1);
-  }
-  if (subs.length === 1) {
-    return subs[0];
-  }
-  console.error('错误: 匹配到多个订阅，请更精确指定');
-  console.log('\n匹配的订阅:');
-  subs.forEach(s => console.log('  ' + s.name));
-  process.exit(1);
-}
-
-
-function openLogFile(logPath, label) {
-  const displayLabel = label || logPath;
-  console.log('用系统默认程序打开: ' + displayLabel);
-  const success = processMgr.openUrl(logPath);
-  if (!success) {
-    console.log('请手动打开: ' + logPath);
-  }
-}
-
-function openDir(dirPath, label) {
-  const displayLabel = label || dirPath;
-  console.log('正在打开: ' + displayLabel);
-  const success = processMgr.openUrl(dirPath);
-  if (!success) {
-    console.log('请手动打开: ' + dirPath);
-  }
-}
-
-function viewLogWithTail(logPath, options) {
-  const follow = options && options.follow;
-  const lines = (options && options.lines) || 100;
-
-  console.log('日志: ' + logPath);
-  if (follow) {
-    console.log('按 Ctrl+C 退出\n');
-  } else {
-    console.log('显示最后 ' + lines + ' 行\n');
-  }
-
-  const tailArgs = [];
-  if (follow) tailArgs.push('-f');
-  tailArgs.push('-n', lines.toString());
-  tailArgs.push(logPath);
-
-  const tail = spawn('tail', tailArgs, { stdio: 'inherit' });
-
-  tail.on('close', () => process.exit(0));
-  tail.on('error', e => {
-    console.error('无法读取日志: ' + e.message);
-    process.exit(1);
-  });
-}
-
 async function cmdStart(args) {
   if (!config.hasKernel()) {
     console.error('错误: 未找到内核，请运行 "mihomo kernel"');
@@ -275,7 +253,7 @@ async function cmdStart(args) {
 
   const targetMode = args[1] === 'tun' ? 'tun' : 'mixed';
 
-  const sub = getActiveSubscription();
+  const sub = subscription.getActiveSubscription();
   if (!sub) {
     console.error('错误: 没有订阅，请先添加订阅');
     process.exit(1);
@@ -283,8 +261,7 @@ async function cmdStart(args) {
 
   await subscription.autoUpdateStaleSubscription();
 
-  // 每次 start 都先确保完全干净的状态（停止进程 + 清理运行时文件）
-  const status = processMgr.getStatus();
+  const status = processManager.getStatus();
   const hasProcess = status.running || status.allProcesses.length > 0;
 
   if (hasProcess) {
@@ -292,56 +269,55 @@ async function cmdStart(args) {
     console.log('停止 ' + count + ' 个进程...');
   }
 
-  // 总是调用 stop（即使没进程也会清理 PID 文件和运行时目录）
-  const stopResult = processMgr.stop(true);
+  const stopResult = processManager.stop(true);
 
   if (stopResult.remaining && stopResult.remaining.length > 0) {
-    console.error('部分进程未终止: ' + stopResult.remaining.join(', '));
+    console.error(colors.red('部分进程未终止:') + ' ' + stopResult.remaining.join(', '));
     console.error('请手动运行: sudo pkill -9 mihomo');
     process.exit(1);
   }
 
   if (hasProcess) {
-    console.log('已停止\n');
+    console.log(colors.green('已停止') + '\n');
   }
 
-  let cfgInfo;
+  let configInfo;
   try {
-    cfgInfo = subscription.prepareConfigForStart(targetMode, sub.name);
+    configInfo = subscription.prepareConfigForStart(targetMode, sub.name);
   } catch (e) {
-    console.error('配置错误: ' + e.message);
+    console.error(colors.red('配置错误:') + ' ' + e.message);
     process.exit(1);
   }
 
   const modeLabel = targetMode === 'tun' ? 'TUN' : 'Mixed';
-  console.log([modeLabel, sub.name, subscription.formatProxySummary(cfgInfo)].join(' · '));
+  console.log([colors.cyan(modeLabel), sub.name, subscription.formatProxySummary(configInfo)].join(' · '));
 
   try {
-    const result = await processMgr.start(targetMode);
-    console.log('已启动 (PID ' + result.pid + ')');
+    const result = await processManager.start(targetMode);
+    console.log(colors.green('已启动') + ' (PID ' + result.pid + ')');
     printStatus();
   } catch (e) {
-    console.error('启动失败: ' + e.message.split('\n')[0]);
+    console.error(colors.red('启动失败:') + ' ' + e.message.split('\n')[0]);
     process.exit(1);
   }
 }
 
 async function cmdStop() {
-  const pids = processMgr.getAllMihomoPids();
+  const pids = processManager.getAllMihomoPids();
   if (pids.length === 0) {
-    console.log('未在运行');
+    console.log(colors.yellow('未在运行'));
     return;
   }
 
   console.log('停止 ' + pids.length + ' 个进程...');
-  const result = processMgr.stop(true);
+  const result = processManager.stop(true);
 
   if (result.remaining && result.remaining.length > 0) {
-    console.error('部分进程未终止: ' + result.remaining.join(', '));
+    console.error(colors.red('部分进程未终止:') + ' ' + result.remaining.join(', '));
     console.error('请手动运行: sudo pkill -9 mihomo');
     process.exit(1);
   }
-  console.log('已停止');
+  console.log(colors.green('已停止'));
 }
 
 function cmdUI(args) {
@@ -357,21 +333,21 @@ function cmdUI(args) {
   console.log('打开 Web UI: ' + uiName);
   console.log('地址: ' + url);
 
-  const success = processMgr.openUrl(url);
+  const success = processManager.openUrl(url);
   if (!success) {
     console.log('请手动访问上面的地址');
   }
 }
 
 function cmdLog(args) {
-  const logPath = processMgr.getLogPath();
+  const logPath = processManager.getLogPath();
 
   if (utils.hasFlag(args, '-o', '--open')) {
-    openLogFile(logPath);
+    processManager.openLogFile(logPath);
     return;
   }
 
-  viewLogWithTail(logPath, { follow: true, lines: 50 });
+  processManager.viewLogWithTail(logPath, { follow: true, lines: 50 });
 }
 
 function cmdLogs(args) {
@@ -383,12 +359,11 @@ function cmdLogs(args) {
     let logPath;
 
     if (targetName === 'current' || targetName === '0') {
-      logPath = processMgr.getLogPath();
+      logPath = processManager.getLogPath();
     } else {
-      // 纯数字 1+ 表示归档日志的位置（最新=1）
       const parsedIdx = parseInt(targetName);
       if (!isNaN(parsedIdx) && parsedIdx > 0 && String(parsedIdx) === targetName) {
-        const archiveLogs = processMgr.listLogs();
+        const archiveLogs = processManager.listLogs();
         const archive = archiveLogs.archives[parsedIdx - 1];
         if (!archive) {
           console.error('错误: 未找到日志 "' + targetName + '"');
@@ -397,7 +372,7 @@ function cmdLogs(args) {
         }
         logPath = archive.path;
       } else {
-        logPath = processMgr.getLogPathByName(targetName);
+        logPath = processManager.getLogPathByName(targetName);
       }
     }
 
@@ -408,15 +383,15 @@ function cmdLogs(args) {
     }
 
     if (openInViewer) {
-      openLogFile(logPath);
+      processManager.openLogFile(logPath);
       return;
     }
 
-    viewLogWithTail(logPath, { follow: false, lines });
+    processManager.viewLogWithTail(logPath, { follow: false, lines });
     return;
   }
 
-  const logs = processMgr.listLogs();
+  const logs = processManager.listLogs();
   const all = [];
 
   if (logs.current) {
@@ -462,55 +437,8 @@ function cmdLogs(args) {
   console.log('');
 }
 
-// 解析镜像参数
-function parseMirrorArg(args) {
-  // 返回: { mirror: 镜像URL|null, isOverride: boolean }
-  // mirror = null 表示禁用镜像
-  // mirror = undefined 表示使用默认/配置
-
-  if (!args || args.length < 2) {
-    return { mirror: undefined, isOverride: false };
-  }
-
-  // 检查 --no-mirror
-  if (args.includes('--no-mirror') || args.includes('--direct')) {
-    return { mirror: null, isOverride: true };
-  }
-
-  // 检查 --mirror <值>
-  const mirrorIdx = args.indexOf('--mirror');
-  if (mirrorIdx >= 0 && mirrorIdx + 1 < args.length) {
-    let mirrorVal = args[mirrorIdx + 1];
-    return { mirror: normalizeMirrorUrl(mirrorVal), isOverride: true };
-  }
-
-  // 第一个非 flag 参数作为镜像
-  for (let i = 1; i < args.length; i++) {
-    const arg = args[i];
-    if (!arg.startsWith('-')) {
-      return { mirror: normalizeMirrorUrl(arg), isOverride: true };
-    }
-  }
-
-  return { mirror: undefined, isOverride: false };
-}
-
-function normalizeMirrorUrl(val) {
-  if (!val) return null;
-  if (val === 'direct' || val === 'no' || val === 'none') return null;
-
-  let url = val;
-  if (!url.startsWith('http')) {
-    url = 'https://' + url;
-  }
-  if (!url.endsWith('/')) {
-    url += '/';
-  }
-  return url;
-}
-
 async function cmdKernel(args) {
-  const mirrorInfo = parseMirrorArg(args);
+  const mirrorInfo = utils.parseMirrorArg(args);
   const effectiveMirror = mirrorInfo.isOverride ? mirrorInfo.mirror : config.getGitHubMirror();
   const isDefault = !mirrorInfo.isOverride && effectiveMirror === config.DEFAULT_GITHUB_MIRROR;
 
@@ -553,7 +481,7 @@ async function cmdKernel(args) {
     console.log('\n正在下载...');
     const result = await kernel.downloadKernel(msg => {
       console.log(msg);
-    }, mirrorInfo.mirror); // 传递镜像参数（undefined = 用配置，null = 禁用）
+    }, mirrorInfo.mirror);
     console.log('已更新到 ' + result.version);
   } catch (e) {
     console.error('更新失败: ' + e.message);
@@ -575,16 +503,16 @@ async function printSubscriptionList() {
     console.log('');
     return;
   }
-  console.log('订阅列表:');
+  console.log(colors.cyan('订阅列表:'));
   subs.forEach((s, i) => {
     const time = utils.formatDate(s.updated_at);
-    const defaultMark = i === 0 ? ' [默认]' : '';
+    const defaultMark = i === 0 ? colors.green(' [默认]') : '';
     const interval = s.update_interval || subscription.DEFAULT_UPDATE_INTERVAL_HOURS;
     console.log('  ' + (i + 1) + '. ' + s.name + defaultMark);
-    console.log('    更新: ' + time + ' (间隔: ' + interval + 'h)');
+    console.log('    ' + colors.gray('更新:') + ' ' + time + ' (间隔: ' + interval + 'h)');
 
     if (s.username) {
-      console.log('    用户: ' + s.username);
+      console.log('    ' + colors.gray('用户:') + ' ' + s.username);
     }
     if (s.download !== undefined || s.total !== undefined) {
       const used = (s.upload || 0) + (s.download || 0);
@@ -595,13 +523,13 @@ async function printSubscriptionList() {
         const percent = Math.min((used / s.total) * 100, 100);
         percentStr = ' (' + percent.toFixed(1) + '%)';
       }
-      console.log('    流量: ' + usedStr + ' / ' + totalStr + percentStr);
+      console.log('    ' + colors.gray('流量:') + ' ' + usedStr + ' / ' + totalStr + percentStr);
     }
     if (s.expire !== undefined) {
-      console.log('    到期: ' + utils.formatTimestamp(s.expire));
+      console.log('    ' + colors.gray('到期:') + ' ' + utils.formatTimestamp(s.expire));
     }
     if (s.web_page_url) {
-      console.log('    页面: ' + s.web_page_url);
+      console.log('    ' + colors.gray('页面:') + ' ' + s.web_page_url);
     }
   });
   console.log('');
@@ -659,9 +587,9 @@ async function cmdSubscription(args) {
       results.forEach(r => {
         if (r.success) {
           ok++;
-          console.log('✓ ' + r.name + ': 已更新 (' + subscription.formatProxySummary(r) + ')');
+          console.log(colors.green('✓') + ' ' + r.name + ': ' + colors.green('已更新') + ' (' + subscription.formatProxySummary(r) + ')');
         } else {
-          console.log('✗ ' + r.name + ': 失败 (' + r.error.split('\n')[0] + ')');
+          console.log(colors.red('✗') + ' ' + r.name + ': ' + colors.red('失败') + ' (' + r.error.split('\n')[0] + ')');
         }
       });
       if (ok === 0) process.exit(1);
@@ -670,8 +598,8 @@ async function cmdSubscription(args) {
       return;
     }
 
-    const matches = findSubscriptionFuzzy(subs, name);
-    const target = pickSingleSubscription(matches, name);
+    const matches = subscription.findSubscriptionFuzzy(subs, name);
+    const target = subscription.pickSingleSubscription(matches, name);
 
     console.log('更新订阅: ' + target.name);
     try {
@@ -699,11 +627,10 @@ async function cmdSubscription(args) {
       process.exit(1);
     }
 
-    const matches = findSubscriptionFuzzy(subs, name);
-    const target = pickSingleSubscription(matches, name);
+    const matches = subscription.findSubscriptionFuzzy(subs, name);
+    const target = subscription.pickSingleSubscription(matches, name);
 
-    // 检查是否已是当前默认订阅
-    const currentDefault = getActiveSubscription();
+    const currentDefault = subscription.getActiveSubscription();
     const isAlreadyDefault = currentDefault && currentDefault.name === target.name;
 
     if (isAlreadyDefault) {
@@ -713,10 +640,9 @@ async function cmdSubscription(args) {
       return;
     }
 
-    // 检查当前运行状态和模式
-    const status = processMgr.getStatus();
-    const cfgInfo = config.getConfigInfo();
-    const currentMode = cfgInfo && cfgInfo.tun ? 'tun' : 'mixed';
+    const status = processManager.getStatus();
+    const configInfo = config.getConfigInfo();
+    const currentMode = configInfo && configInfo.tun ? 'tun' : 'mixed';
 
     const success = config.setDefaultSubscription(target.name);
     if (success) {
@@ -726,7 +652,6 @@ async function cmdSubscription(args) {
       process.exit(1);
     }
 
-    // 如果正在运行，自动重启
     if (status.running) {
       console.log('');
       await cmdStart(['start', currentMode]);
@@ -749,8 +674,8 @@ async function cmdSubscription(args) {
 
     let target;
     if (name) {
-      const matches = findSubscriptionFuzzy(subs, name);
-      target = pickSingleSubscription(matches, name);
+      const matches = subscription.findSubscriptionFuzzy(subs, name);
+      target = subscription.pickSingleSubscription(matches, name);
     } else {
       target = subs[0];
     }
@@ -759,8 +684,7 @@ async function cmdSubscription(args) {
     if (!webPageUrl) {
       console.log('订阅信息中缺少页面地址，正在更新订阅...');
       try {
-        const info = await subscription.downloadSubscription(target.url, target.name);
-        // 重新读取缓存获取 web_page_url
+        await subscription.downloadSubscription(target.url, target.name);
         const cache = config.readSubscriptionsCache();
         if (cache[target.name] && cache[target.name].web_page_url) {
           webPageUrl = cache[target.name].web_page_url;
@@ -775,7 +699,7 @@ async function cmdSubscription(args) {
     }
 
     console.log('打开订阅页面: ' + webPageUrl);
-    const opened = processMgr.openUrl(webPageUrl);
+    const opened = processManager.openUrl(webPageUrl);
     if (!opened) {
       console.log('请手动访问上面的地址');
     }
@@ -787,38 +711,57 @@ async function cmdSubscription(args) {
   process.exit(1);
 }
 
-function cmdUpdate() {
-  console.log('更新 mihomo-cli...');
+async function cmdUpdate() {
+  console.log('当前版本: ' + colors.cyan(VERSION));
+  console.log('');
+  console.log('正在更新 mihomo-cli...');
   console.log('');
 
-  const npm = spawn('npm', ['install', '-g', 'mihomo-cli'], { stdio: 'inherit' });
+  await new Promise(resolve => {
+    const npm = spawn('npm', ['install', '-g', 'mihomo-cli'], { stdio: 'inherit' });
 
-  npm.on('close', code => {
-    if (code === 0) {
-      console.log('');
-      console.log('更新完成');
-    } else {
-      process.exit(code);
-    }
-  });
+    npm.on('close', code => {
+      if (code === 0) {
+        resolve();
+      } else {
+        process.exit(code);
+      }
+    });
 
-  npm.on('error', e => {
-    console.error('执行失败: ' + e.message);
-    process.exit(1);
+    npm.on('error', e => {
+      console.error('执行失败: ' + e.message);
+      process.exit(1);
+    });
   });
+
+  try {
+    const { stdout } = await execAsync('npm list -g mihomo-cli --json --depth=0');
+    const result = JSON.parse(stdout);
+    const newVersion = result.dependencies?.['mihomo-cli']?.version;
+
+    console.log('');
+    if (newVersion) {
+      console.log('更新完成，最新版本: ' + colors.green(newVersion));
+    } else {
+      console.log('更新完成');
+    }
+  } catch {
+    console.log('');
+    console.log('更新完成');
+  }
 }
 
 async function cmdReset(args) {
   const fullReset = args && (args.includes('--full') || args.includes('-f'));
   const skipConfirm = args && (args.includes('--yes') || args.includes('-y'));
 
-  const pids = processMgr.getAllMihomoPids();
+  const pids = processManager.getAllMihomoPids();
   if (pids.length > 0) {
     console.log('停止 ' + pids.length + ' 个进程...');
-    processMgr.cleanupAll(true);
-    for (let i = 0; i < 50; i++) {
-      if (processMgr.getAllMihomoPids().length === 0) break;
-      await new Promise(r => setTimeout(r, 100));
+    processManager.cleanupAll(true);
+    for (let i = 0; i < processManager.PROCESS_WAIT_ATTEMPTS; i++) {
+      if (processManager.getAllMihomoPids().length === 0) break;
+      await new Promise(r => setTimeout(r, processManager.PROCESS_WAIT_INTERVAL));
     }
   }
 
@@ -826,7 +769,6 @@ async function cmdReset(args) {
   console.log(mode);
 
   if (!skipConfirm) {
-    const readline = require('readline');
     const rl = readline.createInterface({
       input: process.stdin,
       output: process.stdout,
@@ -851,8 +793,9 @@ async function cmdReset(args) {
 
 function printOverwriteList() {
   const info = overwrite.listOverwriteFile();
-  console.log('状态: ' + (info.enabled ? '已启用' : '已禁用'));
-  console.log('目录: ' + info.dir);
+  const statusText = info.enabled ? colors.green('已启用') : colors.yellow('已禁用');
+  console.log(colors.gray('状态:') + ' ' + statusText);
+  console.log(colors.gray('目录:') + ' ' + info.dir);
   console.log('');
   if (info.files.length === 0) {
     console.log('暂无覆写文件');
@@ -860,13 +803,13 @@ function printOverwriteList() {
     console.log('用法示例: 创建文件 ' + path.join(info.dir, '01-custom.yaml'));
     console.log('');
   } else {
-    console.log('覆写文件 (' + info.files.length + ' 个，按顺序加载):');
+    console.log(colors.cyan('覆写文件') + ' (' + info.files.length + ' 个，按顺序加载):');
     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('    字段: ' + f.keys.join(', '));
+        console.log('    ' + colors.gray('字段:') + ' ' + f.keys.join(', '));
       }
     });
     console.log('');
@@ -879,13 +822,11 @@ function printOverwriteList() {
 async function cmdOverwrite(args) {
   const action = args && args[1];
 
-  // 检查当前运行状态和模式
-  const status = processMgr.getStatus();
-  const cfgInfo = config.getConfigInfo();
-  const currentMode = cfgInfo && cfgInfo.tun ? 'tun' : 'mixed';
+  const status = processManager.getStatus();
+  const configInfo = config.getConfigInfo();
+  const currentMode = configInfo && configInfo.tun ? 'tun' : 'mixed';
 
   if (action === 'on' || action === 'enable') {
-    // 如果已经启用，提示后直接返回
     if (overwrite.isOverwriteEnabled()) {
       console.log('覆写配置已是启用状态');
       console.log('');
@@ -896,7 +837,6 @@ async function cmdOverwrite(args) {
     overwrite.setOverwriteEnabled(true);
     console.log('已启用覆写配置');
 
-    // 如果正在运行，自动重启
     if (status.running) {
       console.log('');
       await cmdStart(['start', currentMode]);
@@ -909,7 +849,6 @@ async function cmdOverwrite(args) {
   }
 
   if (action === 'off' || action === 'disable') {
-    // 如果已经禁用，提示后直接返回
     if (!overwrite.isOverwriteEnabled()) {
       console.log('覆写配置已是禁用状态');
       console.log('');
@@ -920,7 +859,6 @@ async function cmdOverwrite(args) {
     overwrite.setOverwriteEnabled(false);
     console.log('已禁用覆写配置');
 
-    // 如果正在运行，自动重启
     if (status.running) {
       console.log('');
       await cmdStart(['start', currentMode]);
@@ -932,23 +870,10 @@ async function cmdOverwrite(args) {
     return;
   }
 
-  // 无参数、list、ls 都显示文件列表
   console.log('');
   printOverwriteList();
 }
 
-// 目录目标映射（精确匹配）
-const DIRECTORY_TARGETS = {
-  root: { path: null, label: '根目录' },
-  subs: { path: config.DIRS.subscriptions, label: '订阅目录' },
-  logs: { path: config.DIRS.logs, label: '日志目录' },
-  data: { path: config.DIRS.data, label: 'mihomo 数据目录' },
-  runtime: { path: config.DIRS.runtime, label: '运行时目录' },
-  overwrites: { path: config.DIRS.overwrites, label: '覆写目录' },
-  settings: { path: config.PATHS.settingsFile, label: '设置文件' },
-  kernel: { path: config.DIRS.core, label: '内核目录' },
-};
-
 function cmdDirectory(args) {
   const action = args && args[1];
 
@@ -956,14 +881,23 @@ function cmdDirectory(args) {
     const target = args[2];
 
     if (!target || target === 'root') {
-      openDir(config.USER_DATA_DIR, '根目录');
+      const displayLabel = '根目录';
+      console.log('正在打开: ' + displayLabel);
+      const success = processManager.openUrl(config.USER_DATA_DIR);
+      if (!success) {
+        console.log('请手动打开: ' + config.USER_DATA_DIR);
+      }
       return;
     }
 
-    const targetInfo = DIRECTORY_TARGETS[target.toLowerCase()];
+    const targetInfo = config.DIRECTORY_TARGETS[target.toLowerCase()];
     if (targetInfo) {
-      const path = targetInfo.path || config.USER_DATA_DIR;
-      openDir(path, targetInfo.label);
+      const targetPath = targetInfo.path || config.USER_DATA_DIR;
+      console.log('正在打开: ' + targetInfo.label);
+      const success = processManager.openUrl(targetPath);
+      if (!success) {
+        console.log('请手动打开: ' + targetPath);
+      }
       return;
     }
 
@@ -982,7 +916,6 @@ function cmdDirectory(args) {
     process.exit(1);
   }
 
-  // 无参数或未知参数：显示目录列表
   console.log('');
   console.log('数据目录位置:');
   console.log('  根目录: ' + config.USER_DATA_DIR);
@@ -1059,7 +992,7 @@ async function main() {
     case 'upd':
     case 'update':
     case 'upgrade':
-      cmdUpdate();
+      await cmdUpdate();
       break;
     case 'sub':
     case 'subscription':