@hupan56/wlkj 2.7.12 → 3.1.2

package/templates/qoder/scripts/domain/requirement/req.py

@@ -0,0 +1,228 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""req.py - 需求生命周期管理 (/wl-req 命令)
+
+M3 workspace 重构的核心。解决"找不到产出"痛点:
+一个需求的所有产出(PRD/原型/任务/规格)聚合在 REQ-ID 容器,
+/wl-req 一条命令看到全貌, 不用跨目录翻。
+
+设计 (PM 只需记 2 个姿势):
+    /wl-req                    列出所有需求 (默认=list, 不用记)
+    /wl-req REQ-2026-001       显示该需求全部产出 (show)
+    /wl-req REQ-2026-001 发布  promote+publish一步到位 (草稿→产出→禅道)
+
+promote 不单独暴露(合并进"发布"), list 不用记(无参数即是)。
+
+用法:
+    python req.py                           # 列需求
+    python req.py REQ-2026-001              # 看某需求全貌
+    python req.py REQ-2026-001 发布         # 发布(promote+publish)
+    python req.py REQ-2026-001 promote      # 仅草稿→产出(内部用)
+"""
+# v3.0 路径自举
+import os as _o, sys as _s
+_f = _o.path.abspath(__file__)
+for _ in range(10):
+    _f = _o.path.dirname(_f)
+    _cp = _o.path.join(_f, 'foundation')
+    if _o.path.isfile(_o.path.join(_cp, 'bootstrap.py')):
+        break
+if _cp not in _s.path: _s.path.insert(0, _cp)
+from bootstrap import setup; setup()
+from foundation.core.paths import get_repo_root
+
+import os
+import sys
+from pathlib import Path
+from foundation.core.paths import (
+    get_repo_root, get_developer, MEMBERS_DIR,
+    get_time_bucket, get_time_bucket_path, get_req_dir,
+    get_outputs_dir, find_req_dirs,
+)
+
+BASE = get_repo_root()
+
+
+def _list_all_reqs(dev=None):
+    """列出某开发者的所有需求 (跨 drafts/outputs/所有时间桶)。
+
+    Returns:
+        [{req_id, area, bucket, path, files: [文件名]}, ...]
+    """
+    dev = dev or get_developer(BASE) or "unknown"
+    dev_dir = MEMBERS_DIR / dev
+    if not dev_dir.is_dir():
+        return []
+    seen = {}  # req_id → entry (去重, drafts优先)
+    for area in ("drafts", "outputs"):
+        area_root = dev_dir / area
+        if not area_root.is_dir():
+            continue
+        # 扫所有 REQ-* 目录 (跨时间桶)
+        for found in area_root.rglob("REQ-*"):
+            if not found.is_dir():
+                continue
+            req_id = found.name
+            # 清理标题后缀只取 REQ-YYYY-NNN (但保留完整名做显示)
+            import re
+            m = re.match(r"(REQ-\d{4}-\d{3,})", req_id)
+            clean_id = m.group(1) if m else req_id
+            if clean_id in seen:
+                # 已有, 但如果当前是outputs且已有的是drafts, 补充信息
+                continue
+            files = sorted(f.name for f in found.iterdir() if f.is_file())
+            subdirs = sorted(d.name for d in found.iterdir() if d.is_dir())
+            rel_bucket = str(found.parent.relative_to(area_root))
+            seen[clean_id] = {
+                "req_id": req_id,
+                "clean_id": clean_id,
+                "area": area,
+                "bucket": rel_bucket,
+                "path": found,
+                "files": files,
+                "subdirs": subdirs,
+            }
+    return list(seen.values())
+
+
+def cmd_list(dev=None):
+    """列出所有需求。"""
+    reqs = _list_all_reqs(dev)
+    if not reqs:
+        dev_name = dev or get_developer(BASE) or "unknown"
+        print("暂无需求。写 PRD 时会自动创建 REQ-ID 容器。")
+        print("  开发者: %s" % dev_name)
+        return 0
+    print("=" * 56)
+    print("需求列表 (%d 个)" % len(reqs))
+    print("=" * 56)
+    for r in sorted(reqs, key=lambda x: x["clean_id"]):
+        area_tag = "草稿" if r["area"] == "drafts" else "产出"
+        n_files = len(r["files"]) + len(r["subdirs"])
+        print("  %s  [%s] %s  (%d 项)" % (r["clean_id"], area_tag, r["bucket"], n_files))
+    print()
+    print("看详情: /wl-req <REQ-ID>")
+    return 0
+
+
+def cmd_show(req_id, dev=None):
+    """显示某需求的全部产出 (跨 drafts/outputs/历史桶)。"""
+    found = find_req_dirs(req_id, dev, BASE)
+    if not found:
+        print("未找到需求: %s" % req_id)
+        print("  用 /wl-req 看所有需求列表")
+        return 1
+    print("=" * 56)
+    print("需求: %s" % req_id)
+    print("=" * 56)
+    for entry in found:
+        area_cn = "草稿" if entry["area"] == "drafts" else "产出"
+        p = entry["path"]
+        print()
+        print("【%s · %s】" % (area_cn, entry["bucket"]))
+        print("  路径: %s" % p)
+        # 列文件
+        files = sorted(f.name for f in p.iterdir() if f.is_file())
+        subdirs = sorted(d.name for d in p.iterdir() if d.is_dir())
+        if files:
+            print("  文件:")
+            for f in files:
+                print("    - %s" % f)
+        if subdirs:
+            print("  子目录:")
+            for d in subdirs:
+                # 列子目录里的文件数
+                sub_path = p / d
+                n = sum(1 for _ in sub_path.rglob("*") if _.is_file())
+                print("    - %s/ (%d 个文件)" % (d, n))
+    return 0
+
+
+def cmd_promote(req_id, dev=None):
+    """草稿 → 产出 (drafts/桶/REQ → outputs/同桶/REQ)。"""
+    dev = dev or get_developer(BASE) or "unknown"
+    # 找 drafts 里的
+    draft_found = [e for e in find_req_dirs(req_id, dev, BASE) if e["area"] == "drafts"]
+    if not draft_found:
+        print("草稿区未找到: %s (可能已在产出区, 或不存在)" % req_id)
+        return 1
+    src = draft_found[0]["path"]
+    bucket = draft_found[0]["bucket"]
+    # 目标: outputs/同桶/REQ
+    dev_dir = MEMBERS_DIR / dev
+    dst = dev_dir / "outputs" / bucket / src.name
+    if dst.exists():
+        print("产出区已存在: %s" % dst)
+        print("  如要覆盖, 先手动删除产出区的旧版本")
+        return 1
+    import shutil
+    dst.parent.mkdir(parents=True, exist_ok=True)
+    shutil.move(str(src), str(dst))
+    print("✓ 已提升到产出区:")
+    print("  %s" % dst)
+    print("  (产出进 team_sync, 团队可见)")
+    return 0
+
+
+def cmd_publish(req_id, dev=None):
+    """发布 = promote + 发禅道。PM 只用这个。"""
+    dev = dev or get_developer(BASE) or "unknown"
+    # 先确保在 outputs (不在则 promote)
+    out_found = [e for e in find_req_dirs(req_id, dev, BASE) if e["area"] == "outputs"]
+    if not out_found:
+        print("草稿 → 产出...")
+        rc = cmd_promote(req_id, dev)
+        if rc != 0:
+            return rc
+        out_found = [e for e in find_req_dirs(req_id, dev, BASE) if e["area"] == "outputs"]
+    if not out_found:
+        print("✗ 发布失败: 产出区找不到 %s" % req_id)
+        return 1
+    out_path = out_found[0]["path"]
+    print()
+    print("发禅道 (从产出区: %s)" % out_path)
+    print("-" * 40)
+    # 找禅道 MCP 创建需求
+    try:
+        sys.path.insert(0, str(BASE / ".qoder" / "scripts" / "mcp"))
+        # 禅道发布: 读 PRD, 调 zentao MCP 建 story
+        prd_file = None
+        for f in out_path.iterdir():
+            if f.is_file() and (f.name.endswith(".md") and "prd" in f.name.lower()):
+                prd_file = f
+                break
+            if f.is_file() and f.suffix == ".md" and not f.name.startswith("_"):
+                prd_file = f  # 第一个 md 当 PRD
+        if prd_file:
+            print("  PRD: %s" % prd_file.name)
+        print()
+        print("⚠️ 禅道发布需要 QoderWork 的禅道 MCP (mcp__qoder-zentao__create_story)。")
+        print("   AI 会读产出的 PRD, 调禅道建需求。")
+        print("   如果你在 QoderWork 里说'%s 发布', AI 会自动完成这步。" % req_id)
+        return 0
+    except Exception as e:
+        print("✗ 发布出错: %s" % e)
+        return 1
+
+
+def main():
+    args = sys.argv[1:]
+    if not args:
+        return cmd_list()
+    req_id = args[0]
+    action = args[1] if len(args) > 1 else "show"
+    if action == "show":
+        return cmd_show(req_id)
+    elif action in ("发布", "publish", "fabu"):
+        return cmd_publish(req_id)
+    elif action == "promote":
+        return cmd_promote(req_id)
+    elif action == "list":
+        return cmd_list()
+    else:
+        # 默认当 show
+        return cmd_show(req_id)
+
+
+if __name__ == "__main__":
+    sys.exit(main())

package/templates/qoder/scripts/domain/task/__init__.py

@@ -0,0 +1,11 @@
+# 子包初始化: 注入 scripts/根 + 所有子包到 sys.path
+# 让跨包 import (旧式不带前缀) 仍可用, 兼容现有代码
+import os as _os, sys as _sys
+_root = _os.path.dirname(_os.path.dirname(_os.path.abspath(__file__)))
+if _root not in _sys.path:
+    _sys.path.insert(0, _root)
+# 注入所有子包目录 (兼容旧式 import xxx)
+for _sub in ('kg', 'build', 'test', 'setup', 'io'):
+    _subdir = _os.path.join(_root, _sub)
+    if _os.path.isdir(_subdir) and _subdir not in _sys.path:
+        _sys.path.insert(0, _subdir)

package/templates/qoder/scripts/{git_sync.py → domain/task/git_sync.py}

@@ -1,14 +1,26 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+# v3.0 路径自举: 引导到 common/bootstrap, 统一 sys.path 逻辑
+import os as _o, sys as _s
+_f = _o.path.abspath(__file__)
+for _ in range(10):
+    _f = _o.path.dirname(_f)
+    _cp = _o.path.join(_f, 'foundation')
+    if _o.path.isfile(_o.path.join(_cp, 'bootstrap.py')):
+        break
+if _cp not in _s.path: _s.path.insert(0, _cp)
+from bootstrap import setup; setup()
+from foundation.core.paths import get_repo_root
+
 """
 Weekly Knowledge Graph Update
 
 Usage:
-  python git_sync.py              # Full update: git + PRD + index
-  python git_sync.py --sync-only  # Git pull only
-  python git_sync.py --index-only # Re-index only (no git pull)
-  python git_sync.py --prd-only   # Collect + parse PRDs only
-  python git_sync.py --project fywl-ics  # Sync single project
+  python .qoder/scripts/domain/task/git_sync.py              # Full update: git + PRD + index
+  python .qoder/scripts/domain/task/git_sync.py --sync-only  # Git pull only
+  python .qoder/scripts/domain/task/git_sync.py --index-only # Re-index only (no git pull)
+  python .qoder/scripts/domain/task/git_sync.py --prd-only   # Collect + parse PRDs only
+  python .qoder/scripts/domain/task/git_sync.py --project fywl-ics  # Sync single project
 
 What it does (Friday Update):
   1. Git pull latest code for each project
@@ -21,7 +33,7 @@ Config: .qoder/config.yaml -> git_sync section
 """
 
 import os
-from common.paths import BUILD_CACHE_DIR
+from foundation.core.paths import BUILD_CACHE_DIR
 import sys
 import json
 import subprocess
@@ -32,7 +44,7 @@ from datetime import datetime
 if sys.platform == 'win32':
     sys.stdout.reconfigure(encoding='utf-8')
 
-BASE = os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+BASE = get_repo_root()
 DATA_DIR = os.path.join(BASE, 'data')
 CODE_DIR = os.path.join(DATA_DIR, 'code')
 INDEX_DIR = os.path.join(DATA_DIR, 'index')
@@ -50,7 +62,7 @@ def load_json(path, default=None):
         try:
             with open(path, 'r', encoding='utf-8') as f:
                 return json.load(f)
-        except:
+        except Exception:
             pass
     return default or {}
 
@@ -63,15 +75,43 @@ def save_json(path, data):
 
 
 def load_config():
-    """Load config from config.yaml"""
-    if not os.path.exists(CONFIG_PATH):
-        return {}
+    """Load config from config.yaml (v3.0: 转发到 Config 单例, 带缓存)。"""
     try:
-        import yaml
-        with open(CONFIG_PATH, 'r', encoding='utf-8') as f:
-            return yaml.safe_load(f) or {}
-    except:
-        return {}
+        from foundation.core.config import Config
+        return Config.load().raw
+    except Exception:
+        # 回退: 直接读 (sys.path 未就绪时)
+        if not os.path.exists(CONFIG_PATH):
+            return {}
+        try:
+            import yaml
+            with open(CONFIG_PATH, 'r', encoding='utf-8') as f:
+                return yaml.safe_load(f) or {}
+        except Exception:
+            return {}
+
+
+def _git(*args, cwd=None, timeout=None):
+    """git 命令包装(复刻 team_sync.git 风格)。
+
+    网络/远程操作 (fetch/pull/push/clone) 必须传 timeout —— 50 人团队周五 cron
+    跑时, 远程要认证但凭证没缓存 / 弱网 / 仓库不存在, 会让裸 subprocess.run 永久
+    阻塞, 整个周五同步挂死。本地操作 (rev-parse/diff/log) 可不传。
+
+    timeout 到期返回 rc=124 (与 timeout 命令一致), 不让 cron 无限阻塞。
+    git 未安装返回 rc=127, 不崩溃。
+    """
+    try:
+        kw = dict(cwd=cwd, capture_output=True, text=True, encoding='utf-8', errors='replace')
+        if timeout:
+            kw['timeout'] = timeout
+        return subprocess.run(['git'] + list(args), **kw)
+    except FileNotFoundError:
+        import types
+        return types.SimpleNamespace(returncode=127, stdout='', stderr='git not installed')
+    except subprocess.TimeoutExpired:
+        import types
+        return types.SimpleNamespace(returncode=124, stdout='', stderr='git {} timed out after {}s'.format(' '.join(args[:3]), timeout))
 
 
 # ============================================================
@@ -86,32 +126,22 @@ def git_pull_project(project_name):
         return []
 
     # Get current commit before pull
-    result = subprocess.run(
-        ['git', 'rev-parse', 'HEAD'],
-        cwd=project_dir, capture_output=True, text=True, encoding='utf-8'
-    )
+    result = _git('rev-parse', 'HEAD', cwd=project_dir)
     old_commit = result.stdout.strip()[:8] if result.returncode == 0 else ''
 
-    # Fetch + pull
+    # Fetch + pull (网络操作必须带 timeout, 防弱网/认证弹窗挂死周五 cron)
     print(f'  {project_name}: Fetching...')
-    subprocess.run(['git', 'fetch', 'origin'],
-                   cwd=project_dir, capture_output=True)
+    _git('fetch', 'origin', cwd=project_dir, timeout=120)
 
     print(f'  {project_name}: Pulling...')
-    result = subprocess.run(
-        ['git', 'pull', 'origin'],
-        cwd=project_dir, capture_output=True, text=True, encoding='utf-8'
-    )
+    result = _git('pull', 'origin', cwd=project_dir, timeout=180)
 
     if result.returncode != 0:
-        print(f'  {project_name}: Pull failed - {result.stderr[:100]}')
+        print(f'  {project_name}: Pull failed - {(result.stderr or "")[:100]}')
         return []
 
     # Get new commit
-    result = subprocess.run(
-        ['git', 'rev-parse', 'HEAD'],
-        cwd=project_dir, capture_output=True, text=True, encoding='utf-8'
-    )
+    result = _git('rev-parse', 'HEAD', cwd=project_dir)
     new_commit = result.stdout.strip()[:8] if result.returncode == 0 else ''
 
     if old_commit == new_commit:
@@ -119,10 +149,7 @@ def git_pull_project(project_name):
         return []
 
     # Get changed files
-    result = subprocess.run(
-        ['git', 'diff', '--name-only', old_commit, new_commit],
-        cwd=project_dir, capture_output=True, text=True, encoding='utf-8'
-    )
+    result = _git('diff', '--name-only', old_commit, new_commit, cwd=project_dir)
     changed = [f.strip() for f in result.stdout.strip().split('\n') if f.strip()]
     print(f'  {project_name}: {old_commit} -> {new_commit}, {len(changed)} files changed')
     return changed
@@ -182,18 +209,31 @@ def collect_prds():
         if not os.path.isdir(user_dir):
             continue
 
-        drafts_dir = os.path.join(user_dir, 'drafts')
-        if not os.path.isdir(drafts_dir):
-            continue
-
-        user_prds = []
-        for f in os.listdir(drafts_dir):
-            if (f.startswith('REQ-') or f.startswith('PRD-') or f.startswith('prd-')) and f.endswith('.md'):
-                filepath = os.path.join(drafts_dir, f)
-                mtime = os.path.getmtime(filepath)
-                user_prds.append({'file': f, 'path': filepath, 'user': user_name, 'mtime': mtime})
-
-        for prd in user_prds:
+        # 递归扫 drafts + outputs 两个区 (PRD 可能落在时间桶
+        # drafts/{YYYY}/{MM}/{Ww}/{REQ-ID}/REQ-*.md, 也可能已 publish 到 outputs/)。
+        # outputs 是发布版, 同名优先 outputs; 同区递归找 (os.walk) 兼容旧扁平结构。
+        user_prds = {}
+        for area in ('drafts', 'outputs'):
+            area_dir = os.path.join(user_dir, area)
+            if not os.path.isdir(area_dir):
+                continue
+            for root, dirs, files in os.walk(area_dir):
+                # 跳过隐藏目录 / node_modules (保险)
+                dirs[:] = [d for d in dirs if not d.startswith('.') and d != 'node_modules']
+                for f in files:
+                    if (f.startswith('REQ-') or f.startswith('PRD-') or f.startswith('prd-')) and f.endswith('.md'):
+                        filepath = os.path.join(root, f)
+                        try:
+                            mtime = os.path.getmtime(filepath)
+                        except OSError:
+                            continue
+                        entry = {'file': f, 'path': filepath, 'user': user_name, 'mtime': mtime, 'area': area}
+                        existing = user_prds.get(f)
+                        # outputs 优先; 否则取较新的 mtime
+                        if existing is None or area == 'outputs' or mtime > existing['mtime']:
+                            user_prds[f] = entry
+
+        for prd in user_prds.values():
             key = prd['file']
             is_new = key not in collected
             is_updated = not is_new and collected[key].get('mtime', 0) < prd['mtime']
@@ -383,7 +423,7 @@ def parse_java_file(filepath):
             'keywords': re.findall('[A-Z]?[a-z]+', class_name or '') if class_name else []
         }
         entities.append(entity)
-    except:
+    except Exception:
         pass
     return entities
 
@@ -411,7 +451,7 @@ def parse_frontend_file(filepath):
             'type': 'vue' if filepath.endswith('.vue') else 'js/ts'
         }
         entities.append(entity)
-    except:
+    except Exception:
         pass
     return entities
 

package/templates/qoder/scripts/{syncgate.py → domain/task/syncgate.py}

@@ -1,4 +1,15 @@
 # -*- coding: utf-8 -*-
+# v3.0 路径自举: 引导到 common/bootstrap, 统一 sys.path 逻辑
+import os as _o, sys as _s
+_f = _o.path.abspath(__file__)
+for _ in range(10):
+    _f = _o.path.dirname(_f)
+    _cp = _o.path.join(_f, 'foundation')
+    if _o.path.isfile(_o.path.join(_cp, 'bootstrap.py')):
+        break
+if _cp not in _s.path: _s.path.insert(0, _cp)
+from bootstrap import setup; setup()
+
 """
 syncgate.py - team_sync 推送前的零信任门禁
 
@@ -22,11 +33,11 @@ from typing import List, Tuple, Optional
 _THIS_DIR = os.path.dirname(os.path.abspath(__file__))
 if _THIS_DIR not in sys.path:
     sys.path.insert(0, _THIS_DIR)
-_COMMON = os.path.join(_THIS_DIR, "common")
+_COMMON = os.path.join(_THIS_DIR, "foundation")
 if _COMMON not in sys.path:
     sys.path.insert(0, _COMMON)
 
-from common.identity import (
+from foundation.identity.identity import (
     get_member, verify_member, EXIT_AUTHZ, IdentityError,
 )
 
@@ -223,7 +234,7 @@ _PLATFORM_KEYWORDS = [
 def check_platform_gate(prd_paths: List[str], repo_root: str) -> None:
     """检查 PRD 文件是否标注了目标平台。未标注抛 GateFailure。
 
-    这是 /wl-prd-full "先问平台" 的程序级兜底:
+    这是 /wl-prd "先问平台" 的程序级兜底:
     如果 AI 没问平台就生成了 PRD, push 时这里会拦住。
     """
     missing = []
@@ -242,7 +253,7 @@ def check_platform_gate(prd_paths: List[str], repo_root: str) -> None:
 
     if missing:
         raise GateFailure(
-            "[gate] 拒绝: %d 个 PRD 未标注目标平台 (违反 /wl-prd-full 先问平台规则):\n"
+            "[gate] 拒绝: %d 个 PRD 未标注目标平台 (违反 /wl-prd 先问平台规则):\n"
             "  %s\n"
             "修复: 在 PRD 头部加一行:\n"
             "  - **平台**: Web管理端 (fywl-ui)   # 或 APP移动端 / 两端 / 后端" % (
@@ -268,7 +279,7 @@ def check_eval_gate(
     if skip_eval or not prd_paths:
         return
     # 硬 import: eval_api 是必需模块,缺失说明引擎损坏,应报错而非静默跳过
-    from common.eval_api import evaluate
+    from foundation.utils.eval_api import evaluate
 
     failures = []
     for prd in prd_paths:
@@ -313,7 +324,7 @@ def check_eval_gate(
         lines.append("修复 PRD 后重试, 或 admin 用 --skip-eval 跳过 (会记录审计)")
         # D2: 飞书通知 EVA 拒绝 (best-effort, 失败不阻塞门禁)
         try:
-            from common.feishu import notify_eval_rejected
+            from foundation.integrations.feishu import notify_eval_rejected
             notify_eval_rejected(
                 req_id=",".join(os.path.basename(p) for p, _ in failures[:3]),
                 title="批量 EVA 拒绝",
@@ -356,7 +367,7 @@ def run_gates(
         ]
         if prd_files:
             # 硬 import: reqid 是必需模块,缺失说明引擎损坏
-            from common.reqid import validate_req_ids, migrate_from_existing, ReqIdError
+            from foundation.io.reqid import validate_req_ids, migrate_from_existing, ReqIdError
             # 计数器缺失则先迁移 (幂等)
             try:
                 validate_req_ids(prd_files, repo_root)