@aipper/aiws-spec 0.0.24 → 0.0.25

package/templates/workspace/tools/ws_change_check.py

@@ -204,6 +204,7 @@ def find_markdown_section(text: str, aliases: List[str]) -> str:
         return ""
 
     start = -1
+    start_level = 0
     for i, line in enumerate(lines):
         m = re.match(r"^\s{0,3}(#{2,6})\s+(.+?)\s*$", line)
         if not m:
@@ -211,6 +212,7 @@ def find_markdown_section(text: str, aliases: List[str]) -> str:
         heading_norm = normalize_heading_token(m.group(2))
         if any(alias in heading_norm for alias in alias_tokens):
             start = i + 1
+            start_level = len(m.group(1))
             break
 
     if start < 0:
@@ -218,7 +220,8 @@ def find_markdown_section(text: str, aliases: List[str]) -> str:
 
     end = len(lines)
     for j in range(start, len(lines)):
-        if re.match(r"^\s{0,3}#{1,6}\s+.+$", lines[j]):
+        m = re.match(r"^\s{0,3}(#{1,6})\s+.+$", lines[j])
+        if m and len(m.group(1)) <= start_level:
             end = j
             break
 
@@ -495,23 +498,42 @@ def validate_change(
         return p2.startswith(f"changes/{change_id}/evidence/") or p2.startswith(f"changes/{change_id}/review/")
 
     def parse_scope_patterns_from_plan(plan_text: str) -> List[str]:
-        # Extract bullet list items under "## Scope" (until next heading).
+        # Extract allow-list bullet items from a plan's scope section.
+        # Supports either:
+        # - direct bullets under "## Scope"
+        # - nested "### In Scope" / "### Out of Scope" sections
         lines = (plan_text or "").splitlines()
         patterns: List[str] = []
         in_scope = False
+        has_scope_subsections = False
+        scope_subsection = ""
         for raw in lines:
             line = raw.rstrip("\n")
             if line.startswith("## "):
                 in_scope = line.strip() in ("## Scope", "## 影响范围（Scope）", "## 影响范围 (Scope)")
+                has_scope_subsections = False
+                scope_subsection = ""
                 continue
             if not in_scope:
                 continue
             if line.startswith("## "):
                 break
+            if line.startswith("### "):
+                has_scope_subsections = True
+                heading = line.strip().lower()
+                if "in scope" in heading or "本次改动范围" in line:
+                    scope_subsection = "in"
+                elif "out of scope" in heading or "明确不改动" in line:
+                    scope_subsection = "out"
+                else:
+                    scope_subsection = "other"
+                continue
             s = line.strip()
             if not s:
                 continue
             if s.startswith("- "):
+                if has_scope_subsections and scope_subsection != "in":
+                    continue
                 v = s[2:].strip()
                 if v.startswith("`") and v.endswith("`") and len(v) >= 2:
                     v = v[1:-1].strip()
@@ -583,7 +605,7 @@ def validate_change(
         patterns = [normalize_scope_pattern(p) for p in parse_scope_patterns_from_plan(plan_text)]
         patterns = [p for p in patterns if p]
         if not patterns:
-            (errors if strict else warnings).append(f"{plan_rel} scope check enabled but no patterns found under '## Scope'")
+            (errors if strict else warnings).append(f"{plan_rel} scope check enabled but no patterns found under '## Scope' / '### In Scope'")
             return
 
         meta_path = change_dir / ".ws-change.json"
@@ -895,7 +917,7 @@ def main(argv: Optional[List[str]] = None) -> int:
     parser.add_argument(
         "--check-scope",
         action="store_true",
-        help="Scope gate: compare git diff vs base_branch with plan '## Scope' patterns and warn/error on out-of-scope files.",
+        help="Scope gate: compare git diff vs base_branch with plan '## Scope' / '### In Scope' patterns and warn/error on out-of-scope files.",
     )
     parser.add_argument(
         "--allow-branches",