@hupan56/wlkj 2.5.0 → 2.7.0

package/templates/qoder/scripts/status.py

@@ -28,7 +28,7 @@ except (AttributeError, TypeError, OSError):
 
 THIS_DIR = os.path.dirname(os.path.abspath(__file__))
 sys.path.insert(0, THIS_DIR)
-from common.paths import get_repo_root, get_developer, get_tasks_dir
+from common.paths import get_repo_root, get_developer, get_tasks_dir, MEMBERS_DIR
 from common.task_utils import load_task_json
 from common.atomicio import safe_read_json
 
@@ -198,6 +198,32 @@ def compute_blocked_graph(tasks):
     }
 
 
+# ============================================================
+# 学习数据采集 (扫全部 dev 的 journal, 修旧版路径 bug)
+# ============================================================
+
+def _count_all_feedback():
+    """统计全团队 feedback 事件总数 (扫 workspace/members/*/journal/feedback.jsonl)。
+
+    旧版读 .qoder/learning/feedback.jsonl (已废弃路径, 文件不存在) → 恒 0 → 学习度恒 2.0。
+    learn.py 早已迁移到 workspace/members/{dev}/journal/, 这里跟上。
+    """
+    if not MEMBERS_DIR.is_dir():
+        return 0
+    total = 0
+    for dev_dir in MEMBERS_DIR.iterdir():
+        if not dev_dir.is_dir():
+            continue
+        fb = dev_dir / 'journal' / 'feedback.jsonl'
+        if fb.is_file():
+            try:
+                with open(fb, encoding='utf-8') as f:
+                    total += sum(1 for line in f if line.strip())
+            except Exception:
+                continue
+    return total
+
+
 # ============================================================
 # 健康分 (综合)
 # ============================================================
@@ -270,16 +296,11 @@ def compute_health(tasks):
         scores['pipeline'] = 2.0
 
     # 6. 学习 (10%)
-    feedback_path = BASE / '.qoder' / 'learning' / 'feedback.jsonl'
-    if feedback_path.is_file():
-        try:
-            with open(feedback_path, encoding='utf-8') as f:
-                fb_count = sum(1 for _ in f)
-            scores['learning'] = min(5.0, 2.0 + fb_count * 0.1)
-        except Exception:
-            scores['learning'] = 2.0
-    else:
-        scores['learning'] = 2.0
+    # 修 bug: 旧代码读 .qoder/learning/feedback.jsonl (旧路径, 已废弃),
+    # 但 learn.py 实际写 workspace/members/{dev}/journal/feedback.jsonl。
+    # 迁移了写路径没迁移读路径 → 学习度恒为 2.0。改为扫全部 dev 的 journal。
+    fb_count = _count_all_feedback()
+    scores['learning'] = min(5.0, 2.0 + fb_count * 0.1) if fb_count else 2.0
 
     # 加权
     weights = {
@@ -295,6 +316,191 @@ def compute_health(tasks):
     }
 
 
+# ============================================================
+# 流水线自检 (测工具本身, 不测产出) —— 可观测性闭环
+# ============================================================
+
+def _scan_skill_instrumentation():
+    """扫 .qoder/skills/*/SKILL.md, 统计有多少 skill 调了 learn.py record (已埋点)。
+    返回 (已埋点skill列表, 全部skill列表)。
+    """
+    skills_dir = BASE / '.qoder' / 'skills'
+    if not skills_dir.is_dir():
+        return [], []
+    all_skills = []
+    instrumented = []
+    for d in sorted(skills_dir.iterdir()):
+        if not d.is_dir():
+            continue
+        skill_md = d / 'SKILL.md'
+        if not skill_md.is_file():
+            continue
+        all_skills.append(d.name)
+        try:
+            text = skill_md.read_text(encoding='utf-8', errors='ignore')
+        except Exception:
+            continue
+        if 'learn.py' in text and 'record' in text:
+            instrumented.append(d.name)
+    return instrumented, all_skills
+
+
+def _analyze_eva_rounds():
+    """从 eval-history.jsonl 分析 EVA 修正轮数。
+    返回 {samples, rework_count, avg_rounds}。
+    rework = 连续 passed=false 后出现 passed=true 的序列。
+    """
+    eval_path = BASE / '.qoder' / 'learning' / 'eval-history.jsonl'
+    if not eval_path.is_file():
+        return {'samples': 0, 'rework_count': 0, 'avg_rounds': 0}
+    records = []
+    try:
+        with open(eval_path, encoding='utf-8') as f:
+            for line in f:
+                line = line.strip()
+                if line:
+                    try:
+                        records.append(json.loads(line))
+                    except Exception:
+                        continue
+    except Exception:
+        return {'samples': 0, 'rework_count': 0, 'avg_rounds': 0}
+
+    recent = records[-20:]
+    rework = 0
+    total_fail_before_pass = 0
+    fails_in_run = 0
+    for r in recent:
+        if r.get('passed'):
+            if fails_in_run > 0:
+                rework += 1
+                total_fail_before_pass += fails_in_run
+            fails_in_run = 0
+        else:
+            fails_in_run += 1
+    avg_rounds = (total_fail_before_pass / rework + 1) if rework else 0
+    return {
+        'samples': len(recent),
+        'rework_count': rework,
+        'avg_rounds': round(avg_rounds, 1),
+    }
+
+
+def _count_rule_violations():
+    """统计规则违规事件 (没问平台就调脚本)。
+    扫全部 dev 的 journal 里 event=rule_violation 的条数。
+    """
+    if not MEMBERS_DIR.is_dir():
+        return 0
+    count = 0
+    for dev_dir in MEMBERS_DIR.iterdir():
+        if not dev_dir.is_dir():
+            continue
+        fb = dev_dir / 'journal' / 'feedback.jsonl'
+        if not fb.is_file():
+            continue
+        try:
+            with open(fb, encoding='utf-8') as f:
+                for line in f:
+                    line = line.strip()
+                    if not line:
+                        continue
+                    try:
+                        if json.loads(line).get('event') == 'rule_violation':
+                            count += 1
+                    except Exception:
+                        continue
+        except Exception:
+            continue
+    return count
+
+
+def compute_pipeline_self():
+    """流水线自检 —— 4 个指标全从已有数据派生, 不增加 PM 操作。
+
+    返回:
+      instrumentation: {done, total, missing}   埋点覆盖率
+      eva: {samples, rework_count, avg_rounds}  EVA 修正轮数
+      violations: int                            规则违规次数
+      verdict: str                               一句话结论
+    """
+    done, total = _scan_skill_instrumentation()
+    missing = [s for s in total if s not in done]
+    eva = _analyze_eva_rounds()
+    violations = _count_rule_violations()
+
+    parts = []
+    cov_pct = (len(done) / len(total) * 100) if total else 0
+    if cov_pct < 50:
+        parts.append('埋点覆盖偏低')
+    if eva['rework_count'] > 0 and eva['avg_rounds'] > 2:
+        parts.append('EVA 修正轮数偏高')
+    if violations > 0:
+        parts.append('存在规则违规')
+    verdict = '；'.join(parts) if parts else '正常'
+
+    return {
+        'instrumentation': {'done': len(done), 'total': len(total),
+                            'missing': missing, 'pct': round(cov_pct)},
+        'eva': eva,
+        'violations': violations,
+        'verdict': verdict,
+    }
+
+
+# ============================================================
+# 角色引导 (该角色该用哪些命令 —— 软引导, 帮新人快速上手)
+# ============================================================
+
+def compute_role_guide():
+    """读当前角色 + config.yaml 的 commands 映射, 返回该角色的建议命令。
+    软引导: 不拦截任何命令, 只是把"你该用什么"摆出来。
+    """
+    # 当前角色 (role.py 的 get_role 逻辑)
+    role = None
+    try:
+        sys.path.insert(0, str(BASE / '.qoder' / 'scripts'))
+        from role import get_role
+        role = get_role()
+    except Exception:
+        pass
+    if not role:
+        role = 'pm'  # 默认
+
+    # 读 config.yaml 的 commands 映射
+    commands = []
+    role_name = role
+    try:
+        import yaml
+        cfg_path = BASE / '.qoder' / 'config.yaml'
+        if cfg_path.is_file():
+            with open(cfg_path, encoding='utf-8') as f:
+                cfg = yaml.safe_load(f) or {}
+            roles = cfg.get('roles', {})
+            rinfo = roles.get(role, {})
+            commands = rinfo.get('commands', [])
+            role_name = rinfo.get('name', role)
+    except Exception:
+        pass
+
+    # 校验建议命令是否真实存在 (command 文件在不在)
+    available = []
+    missing = []
+    cmds_dir = BASE / '.qoder' / 'commands'
+    for cmd in commands:
+        exists = (cmds_dir / (cmd + '.md')).is_file() or \
+                 (cmds_dir / 'optional' / (cmd + '.md')).is_file()
+        (available if exists else missing).append(cmd)
+
+    return {
+        'role': role,
+        'role_name': role_name,
+        'suggested': commands,
+        'available': available,
+        'missing': missing,
+    }
+
+
 # ============================================================
 # 渲染
 # ============================================================
@@ -310,6 +516,17 @@ def render_full():
         my_tasks = [n for n, d in tasks.items() if dev in (d.get('assignee'), d.get('creator'))]
         print(f'我的任务: {len(my_tasks)} 个 (开发者: {dev})')
 
+    # 角色引导 (该角色该用哪些命令)
+    rg = compute_role_guide()
+    print(f'当前角色: {rg["role_name"]} ({rg["role"]})')
+    if rg['suggested']:
+        # 标注哪些命令当前可用
+        avail = rg['available']
+        print(f'  建议命令 ({len(avail)}/{len(rg["suggested"])} 可用): '
+              + ' '.join('/' + c for c in avail))
+        if rg['missing']:
+            print(f'  ⚠ 建议但未安装: {", ".join(rg["missing"])}')
+
     # 健康分
     print('\n--- 健康度 ---')
     health = compute_health(tasks)
@@ -359,6 +576,28 @@ def render_full():
     else:
         print('暂无已完成任务的时间戳数据 (stage_ts 在 B3 后才有)')
 
+    # 流水线自检 (测工具本身)
+    print('\n--- 流水线自检 (测工具本身) ---')
+    ps = compute_pipeline_self()
+    inst = ps['instrumentation']
+    cov_mark = '✓' if inst['pct'] >= 50 else '⚠'
+    print(f"  埋点覆盖: {inst['done']}/{inst['total']} skill ({inst['pct']}%) {cov_mark}")
+    if inst['missing']:
+        # 只列前 5 个, 避免刷屏
+        shown = inst['missing'][:5]
+        more = '' if len(inst['missing']) <= 5 else f" 等{len(inst['missing'])}个"
+        print(f"    缺埋点: {', '.join(shown)}{more}")
+    eva = ps['eva']
+    if eva['samples'] > 0:
+        eva_mark = '✓' if eva['avg_rounds'] <= 2 else '⚠'
+        print(f"  EVA 修正: 近{eva['samples']}次 {eva['rework_count']}次打回, "
+              f"平均{eva['avg_rounds']}轮过 {eva_mark}")
+    else:
+        print('  EVA 修正: 暂无评估历史')
+    v_mark = '✓' if ps['violations'] == 0 else '⚠'
+    print(f"  规则违规: {ps['violations']} 次 {v_mark}")
+    print(f"  自检结论: {ps['verdict']}")
+
 
 def main():
     parser = argparse.ArgumentParser(description='项目状态计算')

package/templates/qoder/scripts/sync_carriers.py

@@ -0,0 +1,259 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+sync_carriers.py - 四载体 description 自动同步 (skill -> command)
+
+为什么需要它:
+  check_carriers.py 能发现漂移, 但修复一直靠手工。git status 里
+  sync_templates.py 长期 M 状态就是手工同步的证据。
+  本脚本把权威源 (skill 的 SKILL.md frontmatter) 的 description 自动同步到
+  command 文件, 让"手工对齐"变成"一条命令"。
+
+权威源 = skill (skills/wl-X/SKILL.md):
+  - skill 更新最频繁 (QoderWork 直接读, 迭代快)
+  - skill 的 description 最全 (含中文 + 英文 + 触发词)
+  - command 的 description 往往是旧版/简化版
+
+同步规则:
+  - 只同步 description 字段 (其他字段 name/argument-hint/auto-approve/allowed-tools 保留)
+  - skill description 可能很长 (含触发词), 但 command 的 description 该简洁
+    → 截取到第一个"。用户说"之前的部分 (核心功能描述), 去掉冗长的触发词列举
+  - 幂等: 已一致则跳过
+  - 支持 --dry-run 预览
+
+Usage:
+    python .qoder/scripts/sync_carriers.py             # 同步所有漂移的
+    python .qoder/scripts/sync_carriers.py --dry-run    # 只预览不改
+    python .qoder/scripts/sync_carriers.py wl-search    # 只同步指定命令
+Exit: 0 = 全部同步完成 (或已一致), 1 = 出错
+"""
+import argparse
+import os
+import re
+import sys
+
+if sys.platform == 'win32':
+    try:
+        sys.stdout.reconfigure(encoding='utf-8')
+    except (AttributeError, IOError):
+        pass
+
+sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+from common.paths import get_repo_root
+
+BASE = get_repo_root()
+COMMANDS_DIR = BASE / '.qoder' / 'commands'
+SKILLS_DIR = BASE / '.qoder' / 'skills'
+
+
+def _read_frontmatter(path):
+    """读 .md 的 frontmatter, 返回 (fm_dict, body, raw_fm_text)。
+    raw_fm_text 用于精确替换 (保留原始格式)。
+    """
+    text = path.read_text(encoding='utf-8', errors='ignore')
+    if not text.startswith('---'):
+        return {}, text, ''
+    parts = text.split('---', 2)
+    if len(parts) < 3:
+        return {}, text, ''
+    fm_raw = parts[1]
+    body = parts[2]
+    return _parse_fm(fm_raw), body, fm_raw
+
+
+def _parse_fm(fm_text):
+    """解析 YAML frontmatter (简化版, 不引外部库)。返回 dict。
+    处理带引号的值和裸值。
+    """
+    fm = {}
+    for line in fm_text.splitlines():
+        line = line.rstrip()
+        if not line.strip() or line.strip().startswith('#'):
+            continue
+        if ':' not in line:
+            continue
+        key, _, val = line.partition(':')
+        key = key.strip()
+        val = val.strip()
+        # 去引号
+        if (val.startswith('"') and val.endswith('"')) or \
+           (val.startswith("'") and val.endswith("'")):
+            val = val[1:-1]
+        fm[key] = val
+    return fm
+
+
+def _condense_description(desc):
+    """skill 的 description 往往很长 (含触发词列举), command 的该简洁。
+    截取策略: 保留到"用户说"或"触发"或第一个句号之前的核心描述。
+    保留中英双语部分 (英文描述通常是核心)。
+    """
+    if not desc:
+        return desc
+    # 找截断点: "用户说" / "触发" / "时触发"
+    for marker in ['。用户说', '；用户说', ' 用户说', '。触发:', ' 触发:', '；触发', '。时触发', ' 时触发']:
+        idx = desc.find(marker)
+        if idx > 0:
+            return desc[:idx + 1]  # 含句号
+    # 没找到截断点 → 原样返回 (可能本就简洁)
+    return desc
+
+
+def _find_command_file(name):
+    """在 commands/ 和 commands/optional/ 下找命令文件。返回 Path 或 None。"""
+    for cand in [COMMANDS_DIR / (name + '.md'),
+                 COMMANDS_DIR / 'optional' / (name + '.md')]:
+        if cand.is_file():
+            return cand
+    return None
+
+
+def _find_skill_file(name):
+    """skills/wl-X/SKILL.md。"""
+    p = SKILLS_DIR / name / 'SKILL.md'
+    return p if p.is_file() else None
+
+
+def sync_one(name, dry_run=False):
+    """同步一个命令。返回 ('synced'/'skipped'/'error', 详情)。"""
+    skill_path = _find_skill_file(name)
+    cmd_path = _find_command_file(name)
+    if not skill_path:
+        return 'error', 'skill 不存在: %s' % skill_path
+    if not cmd_path:
+        return 'error', 'command 不存在: %s' % cmd_path
+
+    skill_fm, _, _ = _read_frontmatter(skill_path)
+    skill_desc = skill_fm.get('description', '')
+    if not skill_desc:
+        return 'skipped', 'skill 无 description 字段'
+
+    cmd_fm, cmd_body, cmd_fm_raw = _read_frontmatter(cmd_path)
+    cmd_desc = cmd_fm.get('description', '')
+
+    # 精简 skill desc (command 不该塞一堆触发词)
+    condensed = _condense_description(skill_desc)
+
+    if cmd_desc == condensed:
+        return 'skipped', '已一致'
+
+    # dry-run 只预览
+    if dry_run:
+        return 'would-sync', '  旧: %s\n  新: %s' % (cmd_desc[:70], condensed[:70])
+
+    # 精确替换 frontmatter 里的 description 行
+    new_fm = _replace_desc_in_fm(cmd_fm_raw, condensed)
+    if new_fm is None:
+        return 'error', '无法解析 command frontmatter 的 description 行'
+
+    new_text = '---' + new_fm + '---' + cmd_body
+    cmd_path.write_text(new_text, encoding='utf-8')
+    return 'synced', condensed[:70]
+
+
+def _replace_desc_in_fm(fm_raw, new_desc):
+    """在 frontmatter 原文里替换 description 行。保留其他行原样。
+    返回新的 fm_raw 或 None (无法替换)。
+    """
+    # 匹配 description: 开头的行 (可能带引号)
+    # 用 json.dumps 保证引号转义正确 (description 含特殊字符)
+    escaped = _yaml_escape(new_desc)
+    pat = re.compile(r'^(\s*description:\s*)(.*)$', re.MULTILINE)
+    new_fm, n = pat.subn(lambda m: m.group(1) + escaped, fm_raw, count=1)
+    if n == 0:
+        # 没有 description 行 → 插一行 (在 name: 之后)
+        if re.search(r'^\s*name:', fm_raw, re.MULTILINE):
+            new_fm = re.sub(
+                r'^(\s*name:\s*.*)$',
+                r'\1\ndescription: ' + escaped,
+                fm_raw, count=1, flags=re.MULTILINE)
+        else:
+            return None
+    return new_fm
+
+
+def _yaml_escape(s):
+    """YAML 字符串转义: 含特殊字符(: # 等)用双引号包裹, 内部双引号转义。
+    简化: 一律用双引号 + JSON 转义 (最安全)。
+    """
+    import json
+    return json.dumps(s, ensure_ascii=False)
+
+
+def find_drifted_commands():
+    """找出所有 command↔skill 配对且 description 漂移的命令名。
+    (复用 check_carriers 的相似度判断)
+    """
+    from difflib import SequenceMatcher
+    drifted = []
+    if not SKILLS_DIR.is_dir():
+        return drifted
+    for d in sorted(SKILLS_DIR.iterdir()):
+        if not d.is_dir() or not (d / 'SKILL.md').is_file():
+            continue
+        name = d.name
+        cmd = _find_command_file(name)
+        if not cmd:
+            continue
+        skill_fm, _, _ = _read_frontmatter(d / 'SKILL.md')
+        cmd_fm, _, _ = _read_frontmatter(cmd)
+        sd, cd = skill_fm.get('description', ''), cmd_fm.get('description', '')
+        if not sd or not cd:
+            continue
+        sim = SequenceMatcher(None, sd.lower(), cd.lower()).ratio()
+        if sim < 0.85:
+            drifted.append(name)
+    return drifted
+
+
+def main():
+    ap = argparse.ArgumentParser(description='四载体 description 自动同步 (skill -> command)')
+    ap.add_argument('command', nargs='?', default=None,
+                    help='只同步指定命令 (如 wl-search); 不传则同步所有漂移的')
+    ap.add_argument('--dry-run', action='store_true', help='只预览不写文件')
+    args = ap.parse_args()
+
+    print('=' * 56)
+    print('四载体 description 同步 (skill -> command)')
+    print('=' * 56)
+
+    if args.command:
+        names = [args.command]
+    else:
+        names = find_drifted_commands()
+        if not names:
+            print('✅ 无漂移, 所有 command/skill description 已一致。')
+            return 0
+        print('发现 %d 个漂移命令: %s' % (len(names), ', '.join(names)))
+        print()
+
+    synced, skipped, errors = [], [], []
+    for name in names:
+        status, detail = sync_one(name, dry_run=args.dry_run)
+        if status == 'synced':
+            synced.append(name)
+            print('  [✓] %s' % name)
+            print('      %s' % detail)
+        elif status == 'would-sync':
+            synced.append(name)
+            print('  [~] %s (dry-run)' % name)
+            print('%s' % detail)
+        elif status == 'skipped':
+            skipped.append(name)
+        else:
+            errors.append((name, detail))
+            print('  [✗] %s: %s' % (name, detail))
+
+    print()
+    verb = '将同步' if args.dry_run else '已同步'
+    print('%s: %d 同步 / %d 跳过 / %d 错误'
+          % (verb, len(synced), len(skipped), len(errors)))
+    if not args.dry_run and synced:
+        print('提示: 重跑 check_carriers.py 验证一致性。')
+    if errors:
+        return 1
+    return 0
+
+
+if __name__ == '__main__':
+    sys.exit(main())

package/templates/qoder/scripts/syncgate.py

@@ -223,7 +223,7 @@ _PLATFORM_KEYWORDS = [
 def check_platform_gate(prd_paths: List[str], repo_root: str) -> None:
     """检查 PRD 文件是否标注了目标平台。未标注抛 GateFailure。
 
-    这是 /wl-prd "先问平台" 的程序级兜底:
+    这是 /wl-prd-full "先问平台" 的程序级兜底:
     如果 AI 没问平台就生成了 PRD, push 时这里会拦住。
     """
     missing = []
@@ -242,7 +242,7 @@ def check_platform_gate(prd_paths: List[str], repo_root: str) -> None:
 
     if missing:
         raise GateFailure(
-            "[gate] 拒绝: %d 个 PRD 未标注目标平台 (违反 /wl-prd 先问平台规则):\n"
+            "[gate] 拒绝: %d 个 PRD 未标注目标平台 (违反 /wl-prd-full 先问平台规则):\n"
             "  %s\n"
             "修复: 在 PRD 头部加一行:\n"
             "  - **平台**: Web管理端 (fywl-ui)   # 或 APP移动端 / 两端 / 后端" % (
@@ -280,8 +280,9 @@ def check_eval_gate(
         try:
             with open(full, 'r', encoding='utf-8', errors='replace') as f:
                 head = f.read(2048)
-            if 'mode: quick' in head.lower():
-                continue  # Quick 模式, 跳过 EVA
+            head_lower = head.lower()
+            if 'mode: quick' in head_lower or 'mini-prd' in head_lower or '零星需求' in head:
+                continue  # Quick 模式, 跳过 EVA (mode 标记优先, 兼容旧 Mini-PRD 字样)
         except OSError:
             pass
         # 找同名原型 (可选)