@spaceflow/review 0.82.0 → 1.0.0

package/dist/index.js

@@ -3,34 +3,10 @@ import { access, mkdir, readFile, readdir, unlink, writeFile } from "fs/promises
 import { basename, dirname, extname, isAbsolute, join, normalize, relative } from "path";
 import { homedir } from "os";
 import { execFileSync, execSync, spawn } from "child_process";
-import micromatch_0 from "micromatch";
+import micromatch from "micromatch";
 import { existsSync } from "fs";
-var __webpack_modules__ = ({});
-// The module cache
-var __webpack_module_cache__ = {};
-
-// The require function
-function __webpack_require__(moduleId) {
-
-// Check if module is in cache
-var cachedModule = __webpack_module_cache__[moduleId];
-if (cachedModule !== undefined) {
-return cachedModule.exports;
-}
-// Create a new module (and put it into the cache)
-var module = (__webpack_module_cache__[moduleId] = {
-exports: {}
-});
-// Execute the module function
-__webpack_modules__[moduleId](module, module.exports, __webpack_require__);
-
-// Return the exports of the module
-return module.exports;
-
-}
-
-// expose the modules object (__webpack_modules__)
-__webpack_require__.m = __webpack_modules__;
+// The require scope
+var __webpack_require__ = {};
 
 // webpack/runtime/define_property_getters
 (() => {
@@ -42,95 +18,9 @@ __webpack_require__.d = (exports, definition) => {
     }
 };
 })();
-// webpack/runtime/ensure_chunk
-(() => {
-__webpack_require__.f = {};
-// This file contains only the entry chunk.
-// The chunk loading function for additional chunks
-__webpack_require__.e = (chunkId) => {
-	return Promise.all(
-		Object.keys(__webpack_require__.f).reduce((promises, key) => {
-			__webpack_require__.f[key](chunkId, promises);
-			return promises;
-		}, [])
-	);
-};
-})();
-// webpack/runtime/get javascript chunk filename
-(() => {
-// This function allow to reference chunks
-__webpack_require__.u = (chunkId) => {
-  // return url for filenames not based on template
-  
-  // return url for filenames based on template
-  return "" + chunkId + ".js"
-}
-})();
 // webpack/runtime/has_own_property
 (() => {
 __webpack_require__.o = (obj, prop) => (Object.prototype.hasOwnProperty.call(obj, prop))
-})();
-// webpack/runtime/public_path
-(() => {
-__webpack_require__.p = "";
-})();
-// webpack/runtime/module_chunk_loading
-(() => {
-// no BaseURI
-      // object to store loaded and loading chunks
-      // undefined = chunk not loaded, null = chunk preloaded/prefetched
-      // [resolve, Promise] = chunk loading, 0 = chunk loaded
-      var installedChunks = {"410": 0,};
-      var installChunk = (data) => {
-    var __rspack_esm_ids = data.__rspack_esm_ids;
-    var __webpack_modules__ = data.__webpack_modules__;
-    var __rspack_esm_runtime = data.__rspack_esm_runtime;
-    // add "modules" to the modules object,
-    // then flag all "ids" as loaded and fire callback
-    var moduleId, chunkId, i = 0;
-    for (moduleId in __webpack_modules__) {
-        if (__webpack_require__.o(__webpack_modules__, moduleId)) {
-            __webpack_require__.m[moduleId] = __webpack_modules__[moduleId];
-        }
-    }
-    if (__rspack_esm_runtime) __rspack_esm_runtime(__webpack_require__);
-    for (; i < __rspack_esm_ids.length; i++) {
-        chunkId = __rspack_esm_ids[i];
-        if (__webpack_require__.o(installedChunks, chunkId) && installedChunks[chunkId]) {
-            installedChunks[chunkId][0]();
-        }
-        installedChunks[__rspack_esm_ids[i]] = 0;
-    }
-    
-};
-        __webpack_require__.f.j = function (chunkId, promises) {
-          // import() chunk loading for javascript
-var installedChunkData = __webpack_require__.o(installedChunks, chunkId) ? installedChunks[chunkId] : undefined;
-if (installedChunkData !== 0) { // 0 means "already installed".'
-    // a Promise means "currently loading".
-    if (installedChunkData) {
-        promises.push(installedChunkData[1]);
-    } else {
-        if (true) {
-            // setup Promise in chunk cache
-            var promise = import("./" + __webpack_require__.u(chunkId)).then(installChunk, (e) => {
-                if (installedChunks[chunkId] !== 0) installedChunks[chunkId] = undefined;
-                throw e;
-            });
-            var promise = Promise.race([promise, new Promise((resolve) => {
-                installedChunkData = installedChunks[chunkId] = [resolve];
-            })]);
-            promises.push(installedChunkData[1] = promise);
-        }
-        
-    }
-}
-        }
-        // no external install chunk
-// no on chunks loaded
-// no HMR
-// no HMR manifest
-
 })();
 var __webpack_exports__ = {};
 
@@ -262,14 +152,14 @@ const CODE_BLOCK_TYPES = [
         const fileStatus = STATUS_ALIAS[file.status?.toLowerCase() ?? ""] ?? "modified";
         if (!filename) return false;
         // 最终排除：命中排除模式的文件直接过滤掉
-        if (negativeGlobs.length > 0 && micromatch_0.isMatch(filename, negativeGlobs, {
+        if (negativeGlobs.length > 0 && micromatch.isMatch(filename, negativeGlobs, {
             matchBase: true
         })) {
             console.log(`[filterFilesByIncludes] ${filename} excluded by negativeGlobs`);
             return false;
         }
         // 正向匹配：无前缀 glob
-        if (plainGlobs.length > 0 && micromatch_0.isMatch(filename, plainGlobs, {
+        if (plainGlobs.length > 0 && micromatch.isMatch(filename, plainGlobs, {
             matchBase: true
         })) {
             console.log(`[filterFilesByIncludes] ${filename} matched plainGlobs`);
@@ -285,10 +175,10 @@ const CODE_BLOCK_TYPES = [
                 const positiveGlobs = matchingStatusGlobs.filter((g)=>!g.startsWith("!"));
                 const negativeStatusGlobs = matchingStatusGlobs.filter((g)=>g.startsWith("!")).map((g)=>g.slice(1));
                 if (positiveGlobs.length > 0) {
-                    const matchesPositive = micromatch_0.isMatch(filename, positiveGlobs, {
+                    const matchesPositive = micromatch.isMatch(filename, positiveGlobs, {
                         matchBase: true
                     });
-                    const matchesNegative = negativeStatusGlobs.length > 0 && micromatch_0.isMatch(filename, negativeStatusGlobs, {
+                    const matchesNegative = negativeStatusGlobs.length > 0 && micromatch.isMatch(filename, negativeStatusGlobs, {
                         matchBase: true
                     });
                     if (matchesPositive && !matchesNegative) {
@@ -308,6 +198,73 @@ const CODE_BLOCK_TYPES = [
  */ function extractGlobsFromIncludes(includes) {
     return includes.map((p)=>parseIncludePattern(p).glob).filter((g)=>g.length > 0);
 }
+/**
+ * 检查单个文件是否匹配 includes 模式列表，支持 `status|glob` 前缀语法。
+ *
+ * - 当 `fileStatus` 未提供时，status 前缀的 includes 降级为纯 glob 匹配（向后兼容）
+ * - 当 `fileStatus` 提供时，完整支持 `added|`/`modified|`/`deleted|` 前缀语义
+ *
+ * 算法与 `filterFilesByIncludes` 一致，但针对单文件场景优化：
+ * 1. 排除模式(`!`) 优先过滤
+ * 2. 无前缀正向 glob 匹配
+ * 3. 有 status 前缀的 glob 按文件实际 status 过滤
+ *
+ * @param includes    include 模式列表
+ * @param filename    待匹配的文件名
+ * @param fileStatus  文件变更状态（如 "added"/"modified"/"removed"），不提供时降级为纯 glob
+ * @returns           是否匹配
+ */ function matchIncludes(includes, filename, fileStatus) {
+    if (!includes || includes.length === 0) return true;
+    if (!filename) return false;
+    const parsed = includes.map(parseIncludePattern);
+    // 无 status 信息时降级为纯 glob 匹配（向后兼容）
+    if (!fileStatus) {
+        const globs = extractGlobsFromIncludes(includes);
+        if (globs.length === 0) return true;
+        return micromatch.isMatch(filename, globs, {
+            matchBase: true
+        });
+    }
+    const normalizedStatus = STATUS_ALIAS[fileStatus.toLowerCase()] ?? "modified";
+    // 排除模式（以 ! 开头），用于最终全局过滤
+    const negativeGlobs = parsed.filter((p)=>p.status === undefined && p.glob.startsWith("!")).map((p)=>p.glob.slice(1));
+    // 无前缀的正向 globs
+    const plainGlobs = parsed.filter((p)=>p.status === undefined && !p.glob.startsWith("!")).map((p)=>p.glob);
+    // 有 status 前缀的 patterns
+    const statusPatterns = parsed.filter((p)=>p.status !== undefined);
+    // 最终排除：命中排除模式的文件直接过滤掉
+    if (negativeGlobs.length > 0 && micromatch.isMatch(filename, negativeGlobs, {
+        matchBase: true
+    })) {
+        return false;
+    }
+    // 正向匹配：无前缀 glob
+    if (plainGlobs.length > 0 && micromatch.isMatch(filename, plainGlobs, {
+        matchBase: true
+    })) {
+        return true;
+    }
+    // 正向匹配：有 status 前缀的 glob，按文件实际 status 过滤
+    if (statusPatterns.length > 0) {
+        const matchingStatusGlobs = statusPatterns.filter(({ status })=>status === normalizedStatus).map(({ glob })=>glob);
+        if (matchingStatusGlobs.length > 0) {
+            const positiveGlobs = matchingStatusGlobs.filter((g)=>!g.startsWith("!"));
+            const negativeStatusGlobs = matchingStatusGlobs.filter((g)=>g.startsWith("!")).map((g)=>g.slice(1));
+            if (positiveGlobs.length > 0) {
+                const matchesPositive = micromatch.isMatch(filename, positiveGlobs, {
+                    matchBase: true
+                });
+                const matchesNegative = negativeStatusGlobs.length > 0 && micromatch.isMatch(filename, negativeStatusGlobs, {
+                    matchBase: true
+                });
+                if (matchesPositive && !matchesNegative) {
+                    return true;
+                }
+            }
+        }
+    }
+    return false;
+}
 /**
  * 从 whenModifiedCode 配置中解析代码结构过滤类型。
  * 只接受简单的类型名称，如 "function"、"class"、"interface"、"type"、"method"
@@ -324,6 +281,44 @@ const CODE_BLOCK_TYPES = [
     ];
 }
 
+;// CONCATENATED MODULE: ./src/prompt/specs-section.ts
+/**
+ * 构建 specs 的 prompt 部分
+ */ function buildSpecsSection(specs) {
+    return specs.map((spec)=>{
+        const firstRule = spec.rules[0];
+        const rulesText = spec.rules.slice(1).map((rule)=>{
+            let text = `#### [${rule.id}] ${rule.title}\n`;
+            if (rule.description) {
+                text += `${rule.description}\n`;
+            }
+            if (rule.examples.length > 0) {
+                for (const example of rule.examples){
+                    text += formatExample(example);
+                }
+            }
+            return text;
+        }).join("\n");
+        return `### ${firstRule.title}\n- 规范文件: ${spec.filename}\n- 适用扩展名: ${spec.extensions.join(", ")}\n\n${rulesText}`;
+    }).join("\n\n-------------------\n\n");
+}
+function formatExample(example) {
+    let text = "";
+    if (example.title) {
+        text += `##### ${example.title}\n`;
+    }
+    if (example.description) {
+        text += `${example.description}\n`;
+    }
+    for (const item of example.content){
+        text += formatContent(item);
+    }
+    return text;
+}
+function formatContent(item) {
+    return `###### ${item.type}${item.title ? `: ${item.title}` : ""}\n${item.description}\n`;
+}
+
 ;// CONCATENATED MODULE: ./src/review-spec/review-spec.service.ts
 
 
@@ -838,7 +833,7 @@ class ReviewSpecService {
             const overrides = this.extractOverrides(ruleContent);
             // 提取描述：在第一个例子之前的文本
             let description = ruleContent;
-            const firstExampleIndex = ruleContent.search(/(?:^|\n)###\s+(?:good|bad)/i);
+            const firstExampleIndex = ruleContent.search(/(?:^|\n)(?:####\s+(?:good|bad)|###\s+Example:)/i);
             if (firstExampleIndex !== -1) {
                 description = ruleContent.slice(0, firstExampleIndex).trim();
             } else {
@@ -903,26 +898,53 @@ class ReviewSpecService {
     }
     extractExamples(content) {
         const examples = [];
-        const sections = content.split(/(?:^|\n)###\s+/);
-        for (const section of sections){
-            const trimmedSection = section.trim();
-            if (!trimmedSection) continue;
-            let type = null;
-            if (/^good\b/i.test(trimmedSection)) {
-                type = "good";
-            } else if (/^bad\b/i.test(trimmedSection)) {
-                type = "bad";
-            }
-            if (!type) continue;
-            const codeBlockRegex = /```(\w*)\n([\s\S]*?)```/g;
-            let codeMatch;
-            while((codeMatch = codeBlockRegex.exec(trimmedSection)) !== null){
-                const lang = codeMatch[1] || "text";
-                const code = codeMatch[2].trim();
+        // 按 ### Example: 分组
+        const groupSections = content.split(/(?:^|\n)(?=###\s+Example:)/);
+        for (const groupSection of groupSections){
+            const trimmedGroup = groupSection.trim();
+            if (!trimmedGroup) continue;
+            // 提取分组描述，如 "### Example: 命名规则说明"
+            let exampleTitle = "";
+            let exampleDescription = "";
+            const groupMatch = trimmedGroup.match(/^###\s+Example\s*[:：]\s*(.+)/i);
+            if (groupMatch) {
+                exampleTitle = "Example";
+                exampleDescription = groupMatch[1].trim();
+            }
+            // 在分组内按 #### 提取 Good/Bad
+            const ruleContents = [];
+            const sections = trimmedGroup.split(/(?:^|\n)####\s+/);
+            for (const section of sections){
+                const trimmedSection = section.trim();
+                if (!trimmedSection) continue;
+                let type = null;
+                let contentTitle = "";
+                if (/^good:/i.test(trimmedSection)) {
+                    type = "good";
+                    contentTitle = trimmedSection.match(/^good:\s*(.+)/i)?.[1]?.trim() ?? "";
+                } else if (/^bad:/i.test(trimmedSection)) {
+                    type = "bad";
+                    contentTitle = trimmedSection.match(/^bad:\s*(.+)/i)?.[1]?.trim() ?? "";
+                }
+                if (!type) continue;
+                // 提取代码块作为 description
+                const codeBlockRegex = /```(\w*)\n([\s\S]*?)```/g;
+                let codeMatch;
+                const codeParts = [];
+                while((codeMatch = codeBlockRegex.exec(trimmedSection)) !== null){
+                    codeParts.push(codeMatch[2].trim());
+                }
+                ruleContents.push({
+                    title: contentTitle,
+                    type,
+                    description: codeParts.join("\n\n")
+                });
+            }
+            if (ruleContents.length > 0) {
                 examples.push({
-                    lang,
-                    code,
-                    type
+                    title: exampleTitle,
+                    description: exampleDescription,
+                    content: ruleContents
                 });
             }
         }
@@ -959,7 +981,8 @@ class ReviewSpecService {
    * 根据 spec 的 includes 配置过滤 issues
    * 只保留文件名匹配对应 spec includes 模式的 issues
    * 如果 spec 没有 includes 配置，则保留该 spec 的所有 issues
-   */ filterIssuesByIncludes(issues, specs) {
+   * 支持 `added|`/`modified|`/`deleted|` 前缀语法
+   */ filterIssuesByIncludes(issues, specs, changedFiles) {
         // 构建 spec filename -> includes 的映射
         const specIncludesMap = new Map();
         for (const spec of specs){
@@ -975,16 +998,9 @@ class ReviewSpecService {
             if (includes.length === 0) {
                 return true;
             }
-            // 检查文件是否匹配 includes 模式（转换为纯 glob，避免 status| 前缀和 code-* 空串传入 micromatch）
-            const globs = extractGlobsFromIncludes(includes);
-            if (globs.length === 0) return true;
-            const matches = micromatch_0.isMatch(issue.file, globs, {
-                matchBase: true
-            });
-            if (!matches) {
-            // console.log(`   Issue [${issue.ruleId}] 在文件 ${issue.file} 不匹配 includes 模式，跳过`);
-            }
-            return matches;
+            // 使用 matchIncludes 检查文件是否匹配 includes 模式（支持 status|glob 前缀）
+            const fileStatus = changedFiles?.getStatus(issue.file);
+            return matchIncludes(includes, issue.file, fileStatus);
         });
     }
     /**
@@ -1017,7 +1033,7 @@ class ReviewSpecService {
    * @param specs - 已加载的 ReviewSpec 列表
    * @param verbose - 日志详细级别：1=基础统计，3=详细收集过程
    * @returns 过滤后的 issues 列表（排除了被 override 的规则产生的 issues）
-   */ filterIssuesByOverrides(issues, specs, verbose) {
+   */ filterIssuesByOverrides(issues, specs, changedFiles, verbose) {
         // ========== 阶段1: 收集 spec -> overrides 的映射（保留作用域信息） ==========
         // 每个 override 需要记录其来源 spec 的 includes，用于作用域判断
         const scopedOverrides = [];
@@ -1073,12 +1089,9 @@ class ReviewSpecService {
                 if (scoped.includes.length === 0) {
                     return true;
                 }
-                // 使用 micromatch 检查文件是否匹配 includes 模式（转换为纯 glob）
-                const globs = extractGlobsFromIncludes(scoped.includes);
-                if (globs.length === 0) return true;
-                return issueFile && micromatch_0.isMatch(issueFile, globs, {
-                    matchBase: true
-                });
+                // 使用 matchIncludes 检查文件是否匹配 includes 模式（支持 status|glob 前缀）
+                const fileStatus = changedFiles?.getStatus(issueFile);
+                return matchIncludes(scoped.includes, issueFile, fileStatus);
             });
             if (matched) {
                 skipped.push({
@@ -1177,23 +1190,7 @@ class ReviewSpecService {
     /**
    * 构建 specs 的 prompt 部分
    */ buildSpecsSection(specs) {
-        return specs.map((spec)=>{
-            const firstRule = spec.rules[0];
-            const rulesText = spec.rules.slice(1).map((rule)=>{
-                let text = `#### [${rule.id}] ${rule.title}\n`;
-                if (rule.description) {
-                    text += `${rule.description}\n`;
-                }
-                if (rule.examples.length > 0) {
-                    for (const example of rule.examples){
-                        text += `##### ${example.type === "good" ? "推荐做法 (Good)" : "不推荐做法 (Bad)"}\n`;
-                        text += `\`\`\`${example.lang}\n${example.code}\n\`\`\`\n`;
-                    }
-                }
-                return text;
-            }).join("\n");
-            return `### ${firstRule.title}\n- 规范文件: ${spec.filename}\n- 适用扩展名: ${spec.extensions.join(", ")}\n\n${rulesText}`;
-        }).join("\n\n-------------------\n\n");
+        return buildSpecsSection(specs);
     }
     /**
    * 根据 ruleId 查找规则定义
@@ -3263,6 +3260,15 @@ function generateIssueKey(issue) {
     map(fn) {
         return this._files.map(fn);
     }
+    /**
+   * 获取指定文件的变更状态
+   */ getStatus(filename) {
+        if (!filename) return undefined;
+        for (const f of this._files){
+            if (f.filename === filename) return f.status;
+        }
+        return undefined;
+    }
     countByStatus() {
         let added = 0, modified = 0, deleted = 0;
         for (const f of this._files){
@@ -4753,7 +4759,6 @@ function checkMaxLinesPerFile(changedFiles, fileContents, rule, round, verbose)
 
 
 
-
 class ReviewLlmProcessor {
     llmProxyService;
     reviewSpecService;
@@ -4786,7 +4791,8 @@ class ReviewLlmProcessor {
    * 根据文件过滤 specs，只返回与该文件匹配的规则
    * - 如果 spec 有 includes 配置，只有当文件名匹配 includes 模式时才包含该 spec
    * - 如果 spec 没有 includes 配置，则按扩展名匹配
-   */ filterSpecsForFile(specs, filename) {
+   * - 支持 `added|`/`modified|`/`deleted|` 前缀语法，需传入 fileStatus
+   */ filterSpecsForFile(specs, filename, fileStatus) {
         const ext = extname(filename).slice(1).toLowerCase();
         if (!ext) return [];
         return specs.filter((spec)=>{
@@ -4795,13 +4801,9 @@ class ReviewLlmProcessor {
                 return false;
             }
             // 如果有 includes 配置，检查文件名是否匹配 includes 模式
-            // 需先提取纯 glob（去掉 added|/modified| 前缀，过滤 code-* 空串），避免 micromatch 报错
+            // 使用 matchIncludes 支持 status|glob 前缀语法
             if (spec.includes.length > 0) {
-                const globs = extractGlobsFromIncludes(spec.includes);
-                if (globs.length === 0) return true;
-                return micromatch_0.isMatch(filename, globs, {
-                    matchBase: true
-                });
+                return matchIncludes(spec.includes, filename, fileStatus);
             }
             // 没有 includes 配置，扩展名匹配即可
             return true;
@@ -4833,7 +4835,7 @@ class ReviewLlmProcessor {
         const filePrompts = await Promise.all(fileDataList.filter((item)=>item !== null).map(async ({ filename, file, contentLines, commitsSection })=>{
             const fileDirectoryInfo = await this.getFileDirectoryInfo(filename);
             // 根据文件过滤 specs，只注入与当前文件匹配的规则
-            const fileSpecs = this.filterSpecsForFile(specs, filename);
+            const fileSpecs = this.filterSpecsForFile(specs, filename, file.status);
             // 从全局 whenModifiedCode 配置中解析代码结构过滤类型
             const codeBlockTypes = whenModifiedCode ? extractCodeBlockTypes(whenModifiedCode) : [];
             // 构建带行号的内容：有 code-* 过滤时只输出匹配的代码块范围
@@ -5293,7 +5295,7 @@ class ReviewLlmProcessor {
         ({ commits, changedFiles } = await this.applyPreFilters(context, commits, changedFiles, isDirectFileMode));
         const headSha = prModel ? await prModel.getHeadSha() : context.headRef || "HEAD";
         const collectedFiles = ChangedFileCollection.from(changedFiles);
-        const fileContents = await this.getFileContents(context.owner, context.repo, collectedFiles.toArray(), commits, headSha, context.prNumber, isLocalMode, context.verbose);
+        const fileContents = await this.getFileContents(context.owner, context.repo, collectedFiles.toArray(), commits, headSha, context.prNumber, isLocalMode, context.showAll, context.verbose);
         return {
             prModel,
             commits,
@@ -5435,18 +5437,20 @@ class ReviewLlmProcessor {
    *   2. --commits — 仅保留用户指定的 commit 及其涉及的文件
    *   3. --includes — glob 模式过滤文件和 commits（支持 status| 前缀语法）
    */ async applyPreFilters(context, commits, rawChangedFiles, isDirectFileMode) {
-        const { owner, repo, prNumber, verbose, includes, files, commits: filterCommits } = context;
+        const { owner, repo, prNumber, verbose, includes, files, commits: filterCommits, showAll } = context;
         let changedFiles = ChangedFileCollection.from(rawChangedFiles);
-        // 0. 过滤掉 merge commit
-        {
+        // 0. 过滤掉 merge commit（showAll=false 时启用）
+        if (!showAll) {
             const before = commits.length;
             commits = commits.filter((c)=>{
                 const message = c.commit?.message || "";
-                return !message.startsWith("Merge ");
+                return !/^merge\b/i.test(message);
             });
             if (before !== commits.length && shouldLog(verbose, 1)) {
                 console.log(`   跳过 Merge Commits: ${before} -> ${commits.length} 个`);
             }
+        } else if (shouldLog(verbose, 2)) {
+            console.log(`   showAll=true，跳过 Merge Commit 过滤`);
         }
         // 1. 按指定的 files 过滤
         if (files && files.length > 0) {
@@ -5502,7 +5506,7 @@ class ReviewLlmProcessor {
             for (const commit of commits){
                 if (!commit.sha) continue;
                 const commitFiles = await this.issueFilter.getFilesForCommit(owner, repo, commit.sha, prNumber);
-                if (micromatch_0.some(commitFiles, globs)) {
+                if (micromatch.some(commitFiles, globs)) {
                     filteredCommits.push(commit);
                 }
             }
@@ -5520,9 +5524,11 @@ class ReviewLlmProcessor {
     /**
    * 获取文件内容并构建行号到 commit hash 的映射
    * 返回 Map<filename, Array<[commitHash, lineCode]>>
-   */ async getFileContents(owner, repo, changedFiles, commits, ref, prNumber, isLocalMode, verbose) {
+   */ async getFileContents(owner, repo, changedFiles, commits, ref, prNumber, isLocalMode, showAll, verbose) {
         const contents = new Map();
         const latestCommitHash = commits[commits.length - 1]?.sha?.slice(0, 7) || "+local+";
+        const validCommitHashes = new Set(commits.map((c)=>c.sha?.slice(0, 7)).filter(Boolean));
+        const shouldMaskUnknownChangedLines = !showAll && validCommitHashes.size > 0;
         if (shouldLog(verbose, 1)) {
             console.log(`📊 正在构建行号到变更的映射...`);
         }
@@ -5577,6 +5583,12 @@ class ReviewLlmProcessor {
                             ];
                         }
                         const hash = blameMap?.get(lineNum) ?? latestCommitHash;
+                        if (shouldMaskUnknownChangedLines && !validCommitHashes.has(hash)) {
+                            return [
+                                "-------",
+                                line
+                            ];
+                        }
                         return [
                             hash,
                             line
@@ -5868,7 +5880,7 @@ class ReviewService {
    */ filterNewIssues(issues, specs, opts) {
         const { commits, fileContents, changedFiles, isDirectFileMode, context } = opts;
         const { verbose } = context;
-        let filtered = this.reviewSpecService.filterIssuesByIncludes(issues, specs);
+        let filtered = this.reviewSpecService.filterIssuesByIncludes(issues, specs, changedFiles);
         if (shouldLog(verbose, 1)) {
             console.log(`   应用 includes 过滤后: ${filtered.length} 个问题`);
         }
@@ -5876,7 +5888,7 @@ class ReviewService {
         if (shouldLog(verbose, 1)) {
             console.log(`   应用规则存在性过滤后: ${filtered.length} 个问题`);
         }
-        filtered = this.reviewSpecService.filterIssuesByOverrides(filtered, specs, verbose);
+        filtered = this.reviewSpecService.filterIssuesByOverrides(filtered, specs, changedFiles, verbose);
         // 变更行过滤
         if (shouldLog(verbose, 3)) {
             console.log(`   🔍 变更行过滤条件检查:`);
@@ -6014,7 +6026,11 @@ class ReviewService {
             console.log(`📋 找到 ${resultModel.issues.length} 个历史问题`);
         }
         // 2. 获取 commits 并填充 author 信息
-        const commits = await prModel.getCommits();
+        const allCommits = await prModel.getCommits();
+        const commits = context.showAll ? allCommits : allCommits.filter((c)=>!/^merge\b/i.test(c.commit?.message || ""));
+        if (allCommits.length !== commits.length && shouldLog(verbose, 1)) {
+            console.log(`   跳过 Merge Commits: ${allCommits.length} -> ${commits.length} 个`);
+        }
         resultModel.issues = await this.contextBuilder.fillIssueAuthors(resultModel.issues, commits, owner, repo, verbose);
         // 3. 同步已解决的评论状态
         await resultModel.syncResolved();
@@ -6026,7 +6042,7 @@ class ReviewService {
                 const changedFiles = await prModel.getFiles();
                 const headSha = await prModel.getHeadSha();
                 const verifySpecs = await this.issueFilter.loadSpecs(context.specSources, verbose);
-                const verifyFileContents = await this.sourceResolver.getFileContents(owner, repo, changedFiles, commits, headSha, prNumber, false, verbose);
+                const verifyFileContents = await this.sourceResolver.getFileContents(owner, repo, changedFiles, commits, headSha, prNumber, false, context.showAll, verbose);
                 resultModel.issues = await this.issueFilter.verifyAndUpdateIssues(context, resultModel.issues, commits, {
                     specs: verifySpecs,
                     fileContents: verifyFileContents
@@ -6464,7 +6480,7 @@ class DeletionImpactService {
             const beforeCount = deletedBlocks.length;
             const globs = extractGlobsFromIncludes(context.includes);
             const filenames = deletedBlocks.map((b)=>b.file);
-            const matchedFilenames = micromatch_0(filenames, globs);
+            const matchedFilenames = micromatch(filenames, globs);
             deletedBlocks = deletedBlocks.filter((b)=>matchedFilenames.includes(b.file));
             if (shouldLog(verbose, 1)) {
                 console.log(`   🔍 Includes 过滤: ${beforeCount} -> ${deletedBlocks.length} 个删除块`);
@@ -7153,16 +7169,9 @@ const tools = [
                     filename: filePath
                 }
             ]));
-            const micromatchModule = await __webpack_require__.e(/* import() */ "551").then(__webpack_require__.bind(__webpack_require__, 946));
-            const micromatch = micromatchModule.default || micromatchModule;
             const rules = applicableSpecs.flatMap((spec)=>spec.rules.filter((rule)=>{
                     const includes = rule.includes || spec.includes;
-                    if (includes.length === 0) return true;
-                    const globs = extractGlobsFromIncludes(includes);
-                    if (globs.length === 0) return true;
-                    return micromatch.isMatch(filePath, globs, {
-                        matchBase: true
-                    });
+                    return matchIncludes(includes, filePath);
                 }).map((rule)=>({
                         id: rule.id,
                         title: rule.title,
@@ -7171,9 +7180,13 @@ const tools = [
                         specFile: spec.filename,
                         ...includeExamples && rule.examples.length > 0 ? {
                             examples: rule.examples.map((ex)=>({
-                                    type: ex.type,
-                                    lang: ex.lang,
-                                    code: ex.code
+                                    title: ex.title,
+                                    description: ex.description,
+                                    content: ex.content.map((c)=>({
+                                            title: c.title,
+                                            type: c.type,
+                                            description: c.description
+                                        }))
                                 }))
                         } : {}
                     })));
@@ -7212,9 +7225,13 @@ const tools = [
                 includes: spec.includes,
                 overrides: rule.overrides,
                 examples: rule.examples.map((ex)=>({
-                        type: ex.type,
-                        lang: ex.lang,
-                        code: ex.code
+                        title: ex.title,
+                        description: ex.description,
+                        content: ex.content.map((c)=>({
+                                title: c.title,
+                                type: c.type,
+                                description: c.description
+                            }))
                     }))
             };
         }
@@ -7246,9 +7263,13 @@ const tools = [
                         includes: spec.includes,
                         ...includeExamples && rule.examples.length > 0 ? {
                             examples: rule.examples.map((ex)=>({
-                                    type: ex.type,
-                                    lang: ex.lang,
-                                    code: ex.code
+                                    title: ex.title,
+                                    description: ex.description,
+                                    content: ex.content.map((c)=>({
+                                            title: c.title,
+                                            type: c.type,
+                                            description: c.description
+                                        }))
                                 }))
                         } : {
                             hasExamples: rule.examples.length > 0