@jonathanleelx/meddle 0.5.0-beta.2 → 0.5.0-beta.21

package/CONFIG_STRUCTURE.md

@@ -173,6 +173,11 @@ https://localhost:13001/micro/app?a=1
     "默认规则",
     "beta-rules"
   ],
+  "ruleFileOrder": [
+    "默认规则",
+    "beta-rules",
+    "disabled-rules"
+  ],
   "mocksFilePath": "",
   "pluginMode": "off",
   "clientAliases": {
@@ -198,6 +203,7 @@ https://localhost:13001/micro/app?a=1
 | `fontSize` | 界面缩放百分比字符串，例如 `100` |
 | `detailBodySizeKB` | 日志详情保存的请求/响应体截断阈值（KB），默认 `256`；调大可保留更大 body 便于排查，但会增加内存占用（最多 `MAX_DETAIL_SIZE=200` 条同时驻留）。作用范围为单个 session，解析顺序：当前 session 的 `settings.json` → 默认 session（`~/.meddle/settings.json`，仅非默认 session 继承）→ 环境变量 `MEDDLE_MAX_DETAIL_BODY_KB` → 默认 `256`。修改后下次请求即生效（基于 mtime 缓存检测） |
 | `activeRuleFiles` | 当前启用的路由规则文件名称，顺序即合并顺序 |
+| `ruleFileOrder` | Web 规则文件 Tab 的完整显示顺序（含禁用文件）；启用文件的合并顺序与其在该数组中的相对顺序一致 |
 | `mocksFilePath` | 自定义 Mock JSON 路径；空值使用默认位置 |
 | `pluginMode` | 插件 Pipeline 模式：`off`、`shadow` 或 `on` |
 | `clientAliases` | 客户端 IP 到设备名称的映射 |
@@ -223,8 +229,8 @@ https://localhost:13001/micro/app?a=1
 
 ### 路由规则
 
-1. 读取 `~/.meddle/settings.json` 中的 `activeRuleFiles`。
-2. 按数组顺序读取 `~/.meddle/route-rules/<名称>.txt`。
+1. 读取 `~/.meddle/settings.json` 中的 `activeRuleFiles`（及可选的 `ruleFileOrder`）。
+2. 按 `activeRuleFiles` 数组顺序读取 `~/.meddle/route-rules/<名称>.txt`。启用文件的相对顺序与 Tab 栏（`ruleFileOrder`）中启用文件的相对顺序保持一致。
 3. 合并规则并按顺序匹配。
 4. 如果目录为空，首次启动会创建一个默认规则文件并将其设为启用状态。
 5. 规则文件修改后会自动重新加载。

package/README.md

@@ -36,6 +36,8 @@ irm https://raw.githubusercontent.com/JonathanLee-LX/meddle/main/scripts/install
 
 二进制产物随 [GitHub Release](https://github.com/JonathanLee-LX/meddle/releases) 发布，也可手动下载。安装目录默认 `~/.local/bin`（已有 `~/.meddle/bin` 旧安装时原地升级），可通过 `MEDDLE_BIN_DIR` 环境变量自定义。`meddle update` 始终更新到当前运行二进制所在目录。
 
+**私有仓库：** `meddle update`（含 `meddle update --beta`）/ 安装脚本下载 Release 资产时会读取 `GH_TOKEN`（优先）或 `GITHUB_TOKEN`（`repo` 或 fine-grained `contents:read`）。私有仓安装后升级也需要设置 token；未设置时会表现为 404（checksum sidecar missing）。也可手动：`gh release download -R JonathanLee-LX/meddle -p 'meddle-*'`。
+
 ### 命令
 
 ```bash

package/bin/commands/mock/add.js

@@ -12,23 +12,40 @@ const args = process.argv.slice(3)
 const jsonFlag = args.includes('--json')
 output.setJsonMode(jsonFlag)
 
+function parseCorsFlag(options) {
+  if (!options.cors) return
+  const corsHeaders = {
+    'Access-Control-Allow-Origin': '{origin}',
+    'Access-Control-Allow-Credentials': 'true',
+    'Access-Control-Allow-Methods': '*',
+    'Access-Control-Allow-Headers': '*',
+  }
+  options.headers = { ...corsHeaders, ...(options.headers || {}) }
+  delete options.cors
+}
+
 function parseArgs(args) {
   const options = {}
   for (let i = 0; i < args.length; i++) {
     if (args[i] === '--name') options.name = args[++i]
     else if (args[i] === '--pattern') options.urlPattern = args[++i]
+    else if (args[i] === '--query') options.query = args[++i]
     else if (args[i] === '--method') options.method = args[++i]
     else if (args[i] === '--status') options.statusCode = parseInt(args[++i], 10)
     else if (args[i] === '--body') options.body = args[++i]
     else if (args[i] === '--delay') options.delay = parseInt(args[++i], 10)
+    else if (args[i] === '--cors') options.cors = true
     else if (args[i] === '--headers') {
+      const raw = args[++i]
       try {
-        options.headers = JSON.parse(args[++i])
+        options.headers = JSON.parse(raw)
       } catch (_) {
-        options.headers = {}
+        output.error('Invalid --headers JSON: ' + raw)
+        process.exit(1)
       }
     }
   }
+  parseCorsFlag(options)
   return options
 }
 
@@ -49,6 +66,7 @@ async function run() {
   const rule = {
     name: options.name,
     urlPattern: options.urlPattern,
+    query: options.query || '',
     method: options.method || '*',
     statusCode: options.statusCode || 200,
     delay: options.delay || 0,
@@ -61,6 +79,7 @@ async function run() {
   const running = await isProxyRunning()
 
   let result
+  let fileOnly = false
   if (running) {
     try {
       result = await apiPost('/api/mocks', rule)
@@ -68,25 +87,35 @@ async function run() {
     } catch (e) {
       // Fallback to file mode
       result = addMockRule(rule)
+      fileOnly = true
     }
   } else {
     result = addMockRule(rule)
+    fileOnly = true
   }
 
+  if (fileOnly) output.warnFileOnlyMode()
+
   if (jsonFlag) {
-    output.jsonRaw(result)
+    output.jsonRaw(fileOnly
+      ? { ...result, fileOnly: true, warning: output.FILE_ONLY_WARNING }
+      : result)
     return
   }
 
   output.header('Mock Rule Added')
   output.success(`#${result.id}: ${result.name}`)
   output.kv('Pattern', result.urlPattern)
+  if (result.query) output.kv('Query', result.query)
   output.kv('Method', result.method)
   output.kv('Status', result.statusCode)
   output.kv('Delay', `${result.delay}ms`)
+  if (result.headers && Object.keys(result.headers).length > 0) {
+    output.kv('Headers', JSON.stringify(result.headers))
+  }
 }
 
 run().catch(e => {
   output.error(e.message)
   process.exit(1)
-})
+})

package/bin/commands/mock/delete.js

@@ -24,6 +24,7 @@ async function run() {
 
   const running = await isProxyRunning()
 
+  let fileOnly = false
   if (running) {
     try {
       await apiDelete(`/api/mocks/${id}`)
@@ -34,6 +35,7 @@ async function run() {
         output.error(`Mock rule not found: id=${id}`)
         process.exit(1)
       }
+      fileOnly = true
     }
   } else {
     const deleted = deleteMockRule(id)
@@ -41,10 +43,15 @@ async function run() {
       output.error(`Mock rule not found: id=${id}`)
       process.exit(1)
     }
+    fileOnly = true
   }
 
+  if (fileOnly) output.warnFileOnlyMode()
+
   if (jsonFlag) {
-    output.jsonRaw({ success: true, id })
+    output.jsonRaw(fileOnly
+      ? { success: true, id, fileOnly: true, warning: output.FILE_ONLY_WARNING }
+      : { success: true, id })
     return
   }
 

package/bin/commands/mock/index.js

@@ -32,19 +32,23 @@ Mock Commands:
   meddle mock enable <id>             Enable a mock rule
   meddle mock disable <id>            Disable a mock rule
 
-Add Options:
+Add / Update Options:
   --name <n>       Rule name
-  --pattern <p>    URL pattern (regex or string)
+  --pattern <p>    URL pattern (regex or string; may include query)
+  --query <q>      Query match (exact key=value params, e.g. window_key=A; not prefix)
   --method <m>     HTTP method (GET, POST, *, default: *)
   --status <s>     Response status code (default: 200)
   --body <b>       Response body content
   --delay <d>      Response delay in ms (default: 0)
+  --headers <json> Response headers JSON (values may use {origin})
+  --cors           Shortcut: credentials-friendly CORS headers with {origin}
 
 Examples:
   meddle mock list
   meddle mock add --name "API Mock" --pattern "example.com/api" --status 200
-  meddle mock update 1 --status 404
+  meddle mock add --name "Policy A" --pattern "/ops/.*/policy" --query "window_key=A" --body '{"key":"A"}' --cors
+  meddle mock update 1 --status 404 --headers '{"X-Debug":"1"}'
   meddle mock delete 1
 `)
     process.exit(1)
-}
+}

package/bin/commands/mock/list.js

@@ -48,6 +48,7 @@ async function run() {
     output.section('Active Rules')
     active.forEach(rule => {
       output.success(`#${rule.id}: ${rule.name} (${rule.urlPattern})`)
+      if (rule.query) output.kv('Query', rule.query, 4)
       output.kv('Status', rule.statusCode, 4)
       output.kv('Method', rule.method || '*', 4)
       output.kv('Delay', `${rule.delay || 0}ms`, 4)

package/bin/commands/mock/toggle.js

@@ -28,6 +28,7 @@ async function run() {
   const running = await isProxyRunning()
 
   let result
+  let fileOnly = false
   if (running) {
     try {
       result = await apiPut(`/api/mocks/${id}`, { enabled })
@@ -39,6 +40,7 @@ async function run() {
         output.error(`Mock rule not found: id=${id}`)
         process.exit(1)
       }
+      fileOnly = true
     }
   } else {
     result = updateMockRule(id, { enabled })
@@ -46,10 +48,15 @@ async function run() {
       output.error(`Mock rule not found: id=${id}`)
       process.exit(1)
     }
+    fileOnly = true
   }
 
+  if (fileOnly) output.warnFileOnlyMode()
+
   if (jsonFlag) {
-    output.jsonRaw(result)
+    output.jsonRaw(fileOnly
+      ? { ...result, fileOnly: true, warning: output.FILE_ONLY_WARNING }
+      : result)
     return
   }
 

package/bin/commands/mock/update.js

@@ -5,13 +5,25 @@
 const output = require('../../lib/output')
 const { isProxyRunning } = require('../../lib/proxy-detect')
 const { apiPut } = require('../../lib/api-client')
-const { updateMockRule, loadMockRules, saveMockRules } = require('../../lib/file-access')
+const { updateMockRule } = require('../../lib/file-access')
 
 // Parse arguments (skip 'mock' and 'update' from argv)
 const args = process.argv.slice(4)
 const jsonFlag = args.includes('--json')
 output.setJsonMode(jsonFlag)
 
+function parseCorsFlag(options) {
+  if (!options.cors) return
+  const corsHeaders = {
+    'Access-Control-Allow-Origin': '{origin}',
+    'Access-Control-Allow-Credentials': 'true',
+    'Access-Control-Allow-Methods': '*',
+    'Access-Control-Allow-Headers': '*',
+  }
+  options.headers = { ...corsHeaders, ...(options.headers || {}) }
+  delete options.cors
+}
+
 function parseArgs(args) {
   // First positional arg is id
   let id = null
@@ -20,15 +32,19 @@ function parseArgs(args) {
   for (let i = 0; i < args.length; i++) {
     if (args[i] === '--name') options.name = args[++i]
     else if (args[i] === '--pattern') options.urlPattern = args[++i]
+    else if (args[i] === '--query') options.query = args[++i]
     else if (args[i] === '--method') options.method = args[++i]
     else if (args[i] === '--status') options.statusCode = parseInt(args[++i], 10)
     else if (args[i] === '--body') options.body = args[++i]
     else if (args[i] === '--delay') options.delay = parseInt(args[++i], 10)
+    else if (args[i] === '--cors') options.cors = true
     else if (args[i] === '--headers') {
+      const raw = args[++i]
       try {
-        options.headers = JSON.parse(args[++i])
+        options.headers = JSON.parse(raw)
       } catch (_) {
-        options.headers = {}
+        output.error('Invalid --headers JSON: ' + raw)
+        process.exit(1)
       }
     }
     else if (!args[i].startsWith('--') && id === null) {
@@ -36,6 +52,7 @@ function parseArgs(args) {
     }
   }
 
+  parseCorsFlag(options)
   return { id, options }
 }
 
@@ -55,6 +72,7 @@ async function run() {
   const running = await isProxyRunning()
 
   let result
+  let fileOnly = false
   if (running) {
     try {
       result = await apiPut(`/api/mocks/${id}`, options)
@@ -66,6 +84,7 @@ async function run() {
         output.error(`Mock rule not found: id=${id}`)
         process.exit(1)
       }
+      fileOnly = true
     }
   } else {
     result = updateMockRule(id, options)
@@ -73,22 +92,29 @@ async function run() {
       output.error(`Mock rule not found: id=${id}`)
       process.exit(1)
     }
+    fileOnly = true
   }
 
+  if (fileOnly) output.warnFileOnlyMode()
+
   if (jsonFlag) {
-    output.jsonRaw(result)
+    output.jsonRaw(fileOnly
+      ? { ...result, fileOnly: true, warning: output.FILE_ONLY_WARNING }
+      : result)
     return
   }
 
   output.header('Mock Rule Updated')
   output.success(`#${result.id}: ${result.name}`)
   if (options.urlPattern) output.kv('Pattern', result.urlPattern)
+  if (options.query !== undefined) output.kv('Query', result.query || '(none)')
   if (options.method) output.kv('Method', result.method)
   if (options.statusCode) output.kv('Status', result.statusCode)
   if (options.delay) output.kv('Delay', `${result.delay}ms`)
+  if (options.headers) output.kv('Headers', JSON.stringify(result.headers || {}))
 }
 
 run().catch(e => {
   output.error(e.message)
   process.exit(1)
-})
+})

package/bin/commands/route/active.js

@@ -64,8 +64,10 @@ async function run() {
         // Disable all, then enable target
         files.forEach(f => setRuleFileEnabled(f.name, f.name === targetFile))
 
+        output.warnFileOnlyMode()
+
         if (jsonFlag) {
-          output.jsonRaw({ success: true, activeFile: targetFile })
+          output.jsonRaw({ success: true, activeFile: targetFile, fileOnly: true, warning: output.FILE_ONLY_WARNING })
           return
         }
 
@@ -83,8 +85,10 @@ async function run() {
 
       files.forEach(f => setRuleFileEnabled(f.name, f.name === targetFile))
 
+      output.warnFileOnlyMode()
+
       if (jsonFlag) {
-        output.jsonRaw({ success: true, activeFile: targetFile })
+        output.jsonRaw({ success: true, activeFile: targetFile, fileOnly: true, warning: output.FILE_ONLY_WARNING })
         return
       }
 

package/bin/commands/route/add.js

@@ -81,12 +81,17 @@ async function run() {
 
       const newContent = ruleMapToEprcText(ruleMap)
       saveRuleFileContent(fileName, newContent)
+      output.warnFileOnlyMode()
 
       if (jsonFlag) {
-        output.jsonRaw({ success: true, file: fileName, pattern: pat, target: tgt })
+        output.jsonRaw({ success: true, file: fileName, pattern: pat, target: tgt,
+        fileOnly: true,
+        warning: output.FILE_ONLY_WARNING
+      })
         return
       }
 
+
       output.header('Route Rule Added')
       output.success(`${pat} -> ${tgt}`)
       output.kv('File', fileName)
@@ -109,12 +114,17 @@ async function run() {
 
     const newContent = ruleMapToEprcText(ruleMap)
     saveRuleFileContent(fileName, newContent)
+    output.warnFileOnlyMode()
 
     if (jsonFlag) {
-      output.jsonRaw({ success: true, file: fileName, pattern: pat, target: tgt })
+      output.jsonRaw({ success: true, file: fileName, pattern: pat, target: tgt,
+      fileOnly: true,
+      warning: output.FILE_ONLY_WARNING
+    })
       return
     }
 
+
     output.header('Route Rule Added')
     output.success(`${pat} -> ${tgt}`)
     output.kv('File', fileName)

package/bin/commands/route/create.js

@@ -34,6 +34,7 @@ async function run() {
   const running = await isProxyRunning()
 
   let result
+  let fileOnly = false
   if (running) {
     try {
       result = await apiPost('/api/rule-files', {
@@ -46,6 +47,7 @@ async function run() {
       // Fallback to file mode
       try {
         result = createRuleFile(fileName, content, true)
+        fileOnly = true
       } catch (err) {
         output.error(err.message)
         process.exit(1)
@@ -54,14 +56,19 @@ async function run() {
   } else {
     try {
       result = createRuleFile(fileName, content, true)
+      fileOnly = true
     } catch (err) {
       output.error(err.message)
       process.exit(1)
     }
   }
 
+  if (fileOnly) output.warnFileOnlyMode()
+
   if (jsonFlag) {
-    output.jsonRaw(result)
+    output.jsonRaw(fileOnly
+      ? { ...result, fileOnly: true, warning: output.FILE_ONLY_WARNING }
+      : result)
     return
   }
 

package/bin/commands/route/delete.js

@@ -75,12 +75,17 @@ async function run() {
       delete ruleMap[internalKey]
       const newContent = ruleMapToEprcText(ruleMap)
       saveRuleFileContent(fileName, newContent)
+      output.warnFileOnlyMode()
 
       if (jsonFlag) {
-        output.jsonRaw({ success: true, file: fileName, pattern: pat })
+        output.jsonRaw({ success: true, file: fileName, pattern: pat,
+        fileOnly: true,
+        warning: output.FILE_ONLY_WARNING
+      })
         return
       }
 
+
       output.header('Route Rule Deleted')
       output.success(pat)
       output.kv('File', fileName)
@@ -102,12 +107,17 @@ async function run() {
     delete ruleMap[internalKey]
     const newContent = ruleMapToEprcText(ruleMap)
     saveRuleFileContent(fileName, newContent)
+    output.warnFileOnlyMode()
 
     if (jsonFlag) {
-      output.jsonRaw({ success: true, file: fileName, pattern: pat })
+      output.jsonRaw({ success: true, file: fileName, pattern: pat,
+      fileOnly: true,
+      warning: output.FILE_ONLY_WARNING
+    })
       return
     }
 
+
     output.header('Route Rule Deleted')
     output.success(pat)
     output.kv('File', fileName)

package/bin/commands/route/update.js

@@ -81,12 +81,17 @@ async function run() {
       ruleMap[internalKey] = bm ? tgt + bm[0] : tgt
       const newContent = ruleMapToEprcText(ruleMap)
       saveRuleFileContent(fileName, newContent)
+      output.warnFileOnlyMode()
 
       if (jsonFlag) {
-        output.jsonRaw({ success: true, file: fileName, pattern: pat, newTarget: tgt })
+        output.jsonRaw({ success: true, file: fileName, pattern: pat, newTarget: tgt,
+        fileOnly: true,
+        warning: output.FILE_ONLY_WARNING
+      })
         return
       }
 
+
       output.header('Route Rule Updated')
       output.success(`${pat} -> ${tgt}`)
       output.kv('File', fileName)
@@ -108,12 +113,17 @@ async function run() {
     ruleMap[internalKey] = bm ? tgt + bm[0] : tgt
     const newContent = ruleMapToEprcText(ruleMap)
     saveRuleFileContent(fileName, newContent)
+    output.warnFileOnlyMode()
 
     if (jsonFlag) {
-      output.jsonRaw({ success: true, file: fileName, pattern: pat, newTarget: tgt })
+      output.jsonRaw({ success: true, file: fileName, pattern: pat, newTarget: tgt,
+      fileOnly: true,
+      warning: output.FILE_ONLY_WARNING
+    })
       return
     }
 
+
     output.header('Route Rule Updated')
     output.success(`${pat} -> ${tgt}`)
     output.kv('File', fileName)

package/bin/commands/update.js

@@ -77,6 +77,10 @@ meddle update - 检查并升级 meddle
   meddle update --auto on|off     启用/禁用自动更新 (默认关闭)
   meddle update status            查看安装方式、当前版本和自动更新开关
   meddle update --help, -h        显示帮助
+
+私有仓库二进制更新需要设置 GH_TOKEN 或 GITHUB_TOKEN（优先 GH_TOKEN；
+权限：repo，或 fine-grained contents:read）。也可：
+  gh release download -R JonathanLee-LX/meddle -p 'meddle-*'
 `)
 }
 

package/bin/lib/file-access.js

@@ -75,23 +75,49 @@ function loadMockRules() {
   return []
 }
 
+function readMocksFileMeta(mocksPath) {
+  try {
+    if (fs.existsSync(mocksPath)) {
+      const data = JSON.parse(fs.readFileSync(mocksPath, 'utf8'))
+      return { nextId: Number(data.nextId) || 0, lastId: Number(data.lastId) || 0 }
+    }
+  } catch (_) {}
+  return { nextId: 0, lastId: 0 }
+}
+
+function maxRuleId(rules) {
+  let maxId = 0
+  rules.forEach(r => {
+    if (r && Number.isInteger(r.id) && r.id > maxId) maxId = r.id
+  })
+  return maxId
+}
+
+/**
+ * Next id to hand out. Shares the server's `nextId` field so ids stay
+ * monotonic across CLI file-mode and the running proxy (issue #115); also
+ * honours the legacy CLI `lastId` field.
+ */
+function nextMockId(rules, meta) {
+  return Math.max(1, meta.nextId || 0, (meta.lastId || 0) + 1, maxRuleId(rules) + 1)
+}
+
 /**
  * Save mock rules to file
  */
-function saveMockRules(rules) {
+function saveMockRules(rules, nextId) {
   const mocksPath = getMocksPath()
   const dir = path.dirname(mocksPath)
   if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true })
 
-  // Find max id for sequence
-  let maxId = 0
-  rules.forEach(r => {
-    if (r.id > maxId) maxId = r.id
-  })
-
+  const meta = readMocksFileMeta(mocksPath)
+  const seq = Math.max(nextId || 0, nextMockId(rules, meta))
   const data = {
+    // `nextId` is what the proxy reads; keep it so deleting the newest rule
+    // does not make its id reusable (issue #115). `lastId` kept for older CLIs.
+    nextId: seq,
     rules,
-    lastId: maxId
+    lastId: seq - 1
   }
   fs.writeFileSync(mocksPath, JSON.stringify(data, null, 2), 'utf8')
 }
@@ -103,23 +129,14 @@ function addMockRule(rule) {
   const rules = loadMockRules()
   const mocksPath = getMocksPath()
 
-  // Get next id
-  let nextId = 1
-  try {
-    if (fs.existsSync(mocksPath)) {
-      const data = JSON.parse(fs.readFileSync(mocksPath, 'utf8'))
-      nextId = (data.lastId || 0) + 1
-    }
-  } catch (_) {}
-  if (rules.length > 0) {
-    const maxId = Math.max(...rules.map(r => r.id))
-    if (maxId >= nextId) nextId = maxId + 1
-  }
+  // Issue #115: never reuse an existing (or previously handed-out) id, and
+  // ignore any id the caller put on the rule — add never overwrites.
+  const nextId = nextMockId(rules, readMocksFileMeta(mocksPath))
 
-  rule.id = nextId
-  rules.push(rule)
-  saveMockRules(rules)
-  return rule
+  const created = { ...rule, id: nextId }
+  rules.push(created)
+  saveMockRules(rules, nextId + 1)
+  return created
 }
 
 /**
@@ -167,6 +184,30 @@ function getRuleFilePath(name) {
 /**
  * List all rule files
  */
+function getRuleFileOrderNames() {
+  const settings = loadSettings()
+  const arr = settings.ruleFileOrder
+  return Array.isArray(arr) ? arr.filter((name) => typeof name === 'string') : []
+}
+
+function resolveRuleFileOrder(diskNames, storedOrder, activeNames) {
+  const diskSet = new Set(diskNames)
+  const ordered = []
+  const seen = new Set()
+  const pushUnique = (name) => {
+    if (!diskSet.has(name) || seen.has(name)) return
+    ordered.push(name)
+    seen.add(name)
+  }
+  if (storedOrder.length > 0) {
+    for (const name of storedOrder) pushUnique(name)
+  } else {
+    for (const name of activeNames) pushUnique(name)
+  }
+  for (const name of diskNames) pushUnique(name)
+  return ordered
+}
+
 function listRuleFiles() {
   ensureRouteRulesDir()
   const activeNames = getActiveRuleFileNames()
@@ -175,7 +216,9 @@ function listRuleFiles() {
     .filter(f => f.endsWith('.txt'))
     .map(f => f.replace(/\.txt$/, ''))
 
-  return files.map(name => {
+  const ordered = resolveRuleFileOrder(files, getRuleFileOrderNames(), activeNames)
+
+  return ordered.map(name => {
     const filePath = getRuleFilePath(name)
     let ruleCount = 0
     let excludeCount = 0