@hupan56/wlkj 2.3.2 → 2.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hupan56/wlkj",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "AI Product R&D Workflow - PRD/Prototype/Search/Task/Report",
   "bin": {
     "wlkj": "bin/cli.js"

package/templates/qoder/scripts/common/reqid.py

@@ -140,6 +140,7 @@ def validate_req_ids(prd_paths: List[str], repo_root: Union[str, Path]) -> None:
     seen = {}
     errors = []
     # 全库已有 REQ-ID (用于跨人撞号检测)
+    # existing: {(year,n): [filepath, ...]}
     existing = scan_existing_req_ids(repo_root)
 
     for p in prd_paths:
@@ -158,13 +159,17 @@ def validate_req_ids(prd_paths: List[str], repo_root: Union[str, Path]) -> None:
             )
         else:
             seen[key] = p
-        # 跨人/全库撞号检测: 该号已存在于仓库, 且不是同一个文件 (允许修改自己的)
-        if key in existing and os.path.basename(existing[key]) != basename:
-            errors.append(
-                "撞号: %s 与仓库已有的 %s 都是 REQ-%d-%03d "
-                "(两人离线各建了同号 PRD? 请改其中一个的编号)"
-                % (basename, os.path.basename(existing[key]), year, n)
-            )
+        # 跨人/全库撞号检测: 该号已存在于仓库的其他文件
+        # existing[key] 是列表; 只要里面有"文件名跟当前不同的"就算撞号
+        if key in existing:
+            for other_path in existing[key]:
+                if os.path.basename(other_path) != basename:
+                    errors.append(
+                        "撞号: %s 与仓库已有的 %s 都是 REQ-%d-%03d "
+                        "(两人离线各建了同号 PRD? 请改其中一个的编号)"
+                        % (basename, os.path.basename(other_path), year, n)
+                    )
+                    break  # 一个冲突够了
         # 超界检测 (NNN 不能超过计数器, 防止跳号)
         max_n = current_counter(str(year), repo_root)
         if max_n > 0 and n > max_n:
@@ -253,7 +258,7 @@ def scan_existing_req_ids(repo_root: Optional[Union[str, Path]] = None) -> dict:
             if d.is_dir():
                 scan_dirs.append(d)
 
-    existing = {}
+    existing = {}  # (year, n) -> [filepath, ...] (一个号可能被多个文件用)
     for d in scan_dirs:
         if not d.is_dir():
             continue
@@ -263,7 +268,7 @@ def scan_existing_req_ids(repo_root: Optional[Union[str, Path]] = None) -> dict:
                     continue
                 parsed = parse_req_id(f.name)
                 if parsed:
-                    existing[parsed] = str(f)
+                    existing.setdefault(parsed, []).append(str(f))
         except OSError:
             continue
     return existing