@hupan56/wlkj 2.7.11 → 3.0.0

package/templates/qoder/scripts/{init_doctor.py → setup/init_doctor.py}

@@ -1,5 +1,11 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
+# v3.0 路径自举: 引导到 common/bootstrap, 统一 sys.path 逻辑
+import os as _o, sys as _s
+_cp = _o.path.join(_o.path.dirname(_o.path.dirname(_o.path.abspath(__file__))), 'common')
+if _cp not in _s.path: _s.path.insert(0, _cp)
+from bootstrap import setup; setup()
+
 """
 QODER Init Doctor - 幂等的一站式环境体检 + 按需修复
 
@@ -44,7 +50,7 @@ except (AttributeError, TypeError, OSError, IOError):
     except Exception:
         pass
 
-SCRIPTS_DIR = os.path.dirname(os.path.abspath(__file__))
+SCRIPTS_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))  # 子包→scripts根
 sys.path.insert(0, SCRIPTS_DIR)
 
 from common.paths import get_repo_root, get_developer, get_developer_info
@@ -76,22 +82,37 @@ def problem(msg, hint=None):
 
 
 def run_script(script, *args, timeout=1800):
-    """跑同目录下的另一个脚本, 实时透传输出"""
-    cmd = [sys.executable, os.path.join(SCRIPTS_DIR, script)] + list(args)
+    """跑另一个脚本, 实时透传输出。
+    v3.0: 支持子目录化 — 先在 scripts/根找, 找不到扫各子包。"""
+    # 先试 scripts/根
+    cand = os.path.join(SCRIPTS_DIR, script)
+    if not os.path.isfile(cand):
+        # 扫各子包
+        for sub in ('io', 'setup', 'kg', 'build', 'test'):
+            c2 = os.path.join(SCRIPTS_DIR, sub, script)
+            if os.path.isfile(c2):
+                cand = c2
+                break
+    cmd = [sys.executable, cand] + list(args)
     r = subprocess.run(cmd, cwd=BASE, timeout=timeout)
     return r.returncode == 0
 
 
 def load_config():
-    cfg = os.path.join(BASE, '.qoder', 'config.yaml')
-    if not os.path.isfile(cfg):
-        return {}
+    """v3.0: 转发到 Config 单例 (带 mtime 缓存)。"""
     try:
-        import yaml
-        with open(cfg, encoding='utf-8') as f:
-            return yaml.safe_load(f) or {}
+        from common.config import Config
+        return Config.load().raw
     except Exception:
-        return {}
+        cfg = os.path.join(BASE, '.qoder', 'config.yaml')
+        if not os.path.isfile(cfg):
+            return {}
+        try:
+            import yaml
+            with open(cfg, encoding='utf-8') as f:
+                return yaml.safe_load(f) or {}
+        except Exception:
+            return {}
 
 
 # ============================================================
@@ -100,7 +121,18 @@ def load_config():
 
 def check_basics():
     print('\n--- 1. 基础环境 ---')
-    say(OK, 'Python {}.{} ({})'.format(sys.version_info[0], sys.version_info[1], sys.platform))
+    # Python 版本下限检查 (v3.0+ 新增, 治"3.7 用户装 duckdb 难定位"隐患)
+    # duckdb>=1.1.0 / playwright>=1.40 / tree-sitter>=0.21 都要求 Python >=3.8
+    py_major, py_minor = sys.version_info[0], sys.version_info[1]
+    say(OK, 'Python {}.{} ({})'.format(py_major, py_minor, sys.platform))
+    if (py_major, py_minor) < (3, 8):
+        problem(
+            'Python {}.{} 低于最低要求 3.8 (duckdb/playwright/tree-sitter 需要)'.format(py_major, py_minor),
+            hint='升级 Python: 装 3.10+ (Windows python.org / Mac brew install python@3.10)'
+        )
+    elif (py_major, py_minor) < (3, 9):
+        say(WARN, 'Python {}.{} 可用但建议升级到 3.10+ (部分依赖未来可能提高要求)'.format(py_major, py_minor))
+
     # git 可选 (无 git 时核心功能仍可用, 仅团队同步禁用)
     try:
         r = subprocess.run(['git', '--version'], capture_output=True, text=True,
@@ -225,9 +257,9 @@ def check_developer(fix, name=None, role=None):
     if current:
         info = get_developer_info() or {}
         say(OK, '开发者: {} ({})'.format(current, info.get('role', '?')))
-        # 个人空间目录
+        # 个人空间目录 (v3.0 M3: drafts/outputs/journal/.private, 不再有inbox)
         member = os.path.join(BASE, 'workspace', 'members', current)
-        missing = [s for s in ('drafts', 'inbox', 'journal')
+        missing = [s for s in ('drafts', 'outputs', 'journal')
                    if not os.path.isdir(os.path.join(member, s))]
         if missing:
             if fix:
@@ -377,17 +409,6 @@ def index_age_days():
         return None
     import time as _time
     return int((_time.time() - os.path.getmtime(kg_path)) / 86400)
-    if os.path.isfile(meta_path):
-        try:
-            import json
-            with open(meta_path, encoding='utf-8') as f:
-                meta = json.load(f)
-            ts = datetime.strptime(meta.get('last_sync', ''), '%Y-%m-%d %H:%M')
-        except Exception:
-            ts = None
-    if ts is None:
-        ts = datetime.fromtimestamp(os.path.getmtime(ki_path))
-    return (datetime.now() - ts).total_seconds() / 86400
 
 
 def _has_source_code():
@@ -544,11 +565,12 @@ def check_prd_templates():
             problem('PRD 模板缺失: ' + md, '需要 AI 从团队章程 docx 重新蒸馏')
 
     # Qoder 全系列载体: rules 在 IDE/Quest 生效, AGENTS.md 在 CLI 生效
+    # (Trellis 化: rules 是引擎的一部分, 由 wlkj init/update 生成, 不在团队 git 里)
     rules_file = os.path.join(BASE, '.qoder', 'rules', 'wl-pipeline.md')
     if os.path.isfile(rules_file):
-        say(OK, '.qoder/rules/wl-pipeline.md (Qoder IDE/Quest 规则载体)')
+        say(OK, '.qoder/rules/wl-pipeline.md (Qoder IDE/Quest 规则载体, wlkj 生成)')
     else:
-        problem('.qoder/rules/wl-pipeline.md 缺失', 'Quest 模式将不知道工作流规则, 从 git 同步取回')
+        problem('.qoder/rules/wl-pipeline.md 缺失', 'Quest 模式将不知道工作流规则, 跑 npx @hupan56/wlkj update 重新生成')
     if os.path.isfile(os.path.join(BASE, 'AGENTS.md')):
         say(OK, 'AGENTS.md (Qoder CLI / 其他 Agent 工具载体)')
     else:
@@ -590,6 +612,21 @@ def check_weekly(fix):
 def check_qoderwork():
     """检查 QoderWork 桌面端是否已安装本项目的技能（junction 到 ~/.qoderwork/skills/）。"""
     print('\n--- 9. QoderWork 桌面端技能 (可选) ---')
+
+    # ★ v3.0 新增: launcher 文件就位检查 (全局, 缺失则所有 stdio MCP 黄灯)
+    # 场景: 换机器后没跑 install_qoderwork, mcp.json 引用的 launcher 不存在
+    home = os.environ.get('USERPROFILE') or os.environ.get('HOME') or os.path.expanduser('~')
+    launcher = os.path.join(home, '.qoderwork', 'mcp_launcher.py')
+    mcp_json = os.path.join(home, '.qoderwork', 'mcp.json')
+    if os.path.isfile(mcp_json):
+        # 装了 QoderWork 才检查 launcher (没装 mcp.json 的不算缺失)
+        if not os.path.isfile(launcher):
+            say(BAD, 'mcp_launcher.py 缺失: {} (所有 STDIO MCP 会黄灯)'.format(launcher))
+            print('       -> 跑: python .qoder/scripts/install_qoderwork.py')
+            issues.append('mcp_launcher.py 缺失')
+        else:
+            say(OK, 'mcp_launcher.py 就位 (STDIO MCP 启动器)')
+
     src_skills = os.path.join(BASE, '.qoder', 'skills')
     if not os.path.isdir(src_skills):
         say(WARN, '.qoder/skills/ 不存在, 跳过 QoderWork 检查')

package/templates/qoder/scripts/{install_qoderwork.py → setup/install_qoderwork.py}

@@ -1,4 +1,10 @@
 # -*- coding: utf-8 -*-
+# v3.0 路径自举: 引导到 common/bootstrap, 统一 sys.path 逻辑
+import os as _o, sys as _s
+_cp = _o.path.join(_o.path.dirname(_o.path.dirname(_o.path.abspath(__file__))), 'common')
+if _cp not in _s.path: _s.path.insert(0, _cp)
+from bootstrap import setup; setup()
+
 """
 install_qoderwork.py - 把 .qoder/skills/ 安装到 QoderWork 桌面端可识别的位置
 
@@ -38,9 +44,9 @@ if sys.platform == "win32":
     except (AttributeError, IOError):
         pass
 
-# 路径自检：项目根 = 本文件上三级（scripts/ -> .qoder/ -> repo）
+# 路径自检：项目根 = 本文件上四级 (v3.0: setup/ -> scripts/ -> .qoder/ -> repo)
 SCRIPT_DIR = Path(__file__).resolve().parent
-PROJECT_ROOT = SCRIPT_DIR.parent.parent
+PROJECT_ROOT = SCRIPT_DIR.parent.parent.parent  # v3.0: setup子包多一层
 SOURCE_SKILLS_DIR = PROJECT_ROOT / ".qoder" / "skills"
 SOURCE_COMMANDS_DIR = PROJECT_ROOT / ".qoder" / "commands"
 
@@ -405,13 +411,14 @@ def rewrite_mcp_json_for_launcher():
         return
 
     # 选 Python 写进 mcp.json:
-    # 优先级 1: 找一个已经装了核心依赖(duckdb/pymysql/yaml/requests)的 Python
-    #   → 这样 launcher 启动后秒命中, MCP 秒绿
-    # 优先级 2: 任意可用 python 命令名 (launcher 内部会再找)
-    py_with_deps = find_python_with_core_deps()
-    if py_with_deps:
-        py_cmd = py_with_deps  # 完整路径, 最可靠
-    else:
+    # v3.0 修复: 用装了核心依赖的 Python 绝对路径 (不用命令名)!
+    # 原因: QoderWork 桌面应用不继承 shell PATH, 命令名(python/py -3)找不到 → 黄灯。
+    # 绝对路径每次 install 时探测, 换机器重跑 update 自动刷新。
+    # 依赖查找: 先找装了 duckdb 的 python (find_python_with_core_deps),
+    # 找不到回退 detect_python_command。
+    try:
+        py_cmd = find_python_with_core_deps()
+    except Exception:
         py_cmd = detect_python_command() or "python"
     launcher = str(_HOME / ".qoderwork" / "mcp_launcher.py")
     # MCP 名 → launcher 子命令
@@ -426,7 +433,7 @@ def rewrite_mcp_json_for_launcher():
         entry = servers.get(srv)
         # 全新机器: kg/mysql/lanhu 条目可能不存在 → 创建它 (launcher 模式)
         if not entry:
-            servers[srv] = {"command": py_cmd, "args": [launcher, sub]}
+            servers[srv] = {"command": py_cmd, "args": [launcher, sub], "enabled": True}
             changed = True
             continue
         # 已是 launcher 模式? 检查 command 是否需要更新 (Python 路径可能变了)
@@ -435,7 +442,11 @@ def rewrite_mcp_json_for_launcher():
             # launcher 模式, 但 command 可能指向旧的/错的 Python → 更新
             old_cmd = entry.get("command", "") if isinstance(entry, dict) else ""
             if old_cmd != py_cmd:
-                servers[srv] = {"command": py_cmd, "args": [launcher, sub]}
+                servers[srv] = {"command": py_cmd, "args": [launcher, sub], "enabled": True}
+                changed = True
+            # 补 enabled (旧版可能没写, 导致黄灯)
+            if isinstance(entry, dict) and not entry.get("enabled"):
+                entry["enabled"] = True
                 changed = True
             continue
         # mysql env 抽离到独立文件
@@ -447,7 +458,7 @@ def rewrite_mcp_json_for_launcher():
             except OSError:
                 pass
         # 改成 launcher 模式
-        servers[srv] = {"command": py_cmd, "args": [launcher, sub]}
+        servers[srv] = {"command": py_cmd, "args": [launcher, sub], "enabled": True}
         changed = True
 
     if changed:
@@ -456,12 +467,9 @@ def rewrite_mcp_json_for_launcher():
             QODERWORK_MCP_FILE.write_text(
                 json.dumps(cfg, indent=2, ensure_ascii=False) + "\n", encoding="utf-8")
             print(f"\n--- mcp.json 重写为 launcher 模式 ---")
-            if py_with_deps:
-                print(f"  [UPD]  kg/mysql/zentao/lanhu → command={py_cmd} (装了依赖的Python)")
-            else:
-                print(f"  [UPD]  kg/mysql/zentao/lanhu → command={py_cmd}")
+            print(f"  [UPD]  kg/mysql/zentao/lanhu → command={py_cmd} (命令名, 跨机器通用)")
             print(f"         args=[mcp_launcher.py, <名>] (launcher 内部找装依赖的 Python)")
-            print(f"         不再写死仓库路径/venv路径, 跨机器通用")
+            print(f"         不再写死绝对路径, 换机器/重装Python不会失效")
         except OSError as e:
             print(f"  [ERR]  mcp.json 重写失败: {e}")
 
@@ -488,7 +496,7 @@ def main():
         print("MCP 配置刷新 (--mcp-only)")
         print("=" * 56)
         # 1. 复制 launcher
-        launcher_src = SOURCE_COMMANDS_DIR.parent / "scripts" / "mcp_launcher.py"
+        launcher_src = SOURCE_COMMANDS_DIR.parent / "scripts" / "mcp" / "mcp_launcher.py"  # v3.0: mcp子包
         launcher_dst = _HOME / ".qoderwork" / "mcp_launcher.py"
         try:
             launcher_dst.parent.mkdir(parents=True, exist_ok=True)
@@ -508,15 +516,17 @@ def main():
         except Exception:
             pass
         # 4. 写 .repo-root 锚点 (launcher 定位仓库根用)
-        # 用 PROJECT_ROOT (脚本自身定位的仓库根) 而非 cwd —— 修"安装目录不一致"bug:
-        # 用户可能从任意目录跑 install_qoderwork (home/其他项目), cwd ≠ 仓库根,
-        # 写 cwd 会让 .repo-root 指向错误目录 → MCP 全找不到仓库。
-        # PROJECT_ROOT 由本文件位置推出 (scripts/ -> .qoder/ -> repo), 与 cwd 无关。
+        # 防御: 二次验证 PROJECT_ROOT 是"真仓库" (有 workspace/data/.git),
+        #       防止测试在临时目录跑 install 污染全局 .repo-root。
+        is_real_repo = any((PROJECT_ROOT / m).exists() for m in ('workspace', 'data', '.git'))
         anchor = _HOME / ".qoderwork" / ".repo-root"
         try:
             anchor.parent.mkdir(parents=True, exist_ok=True)
-            anchor.write_text(str(PROJECT_ROOT), encoding="utf-8")
-            print(f"  [OK]   .repo-root 锚点: {anchor} -> {PROJECT_ROOT}")
+            if is_real_repo:
+                anchor.write_text(str(PROJECT_ROOT), encoding="utf-8")
+                print(f"  [OK]   .repo-root 锚点: {anchor} -> {PROJECT_ROOT}")
+            else:
+                print(f"  [SKIP] .repo-root 未更新 ({PROJECT_ROOT} 非真仓库, 缺 workspace/data/.git)")
         except OSError:
             pass
         return
@@ -659,7 +669,7 @@ def main():
     # QoderWork 桌面端工作目录是临时会话目录, 不是仓库根, 相对路径失效。
     # repo_root.py 从 mcp.json 反推仓库根, 命令文件靠它定位脚本/模板。
     if action in ("install", "check"):
-        repo_root_src = SOURCE_COMMANDS_DIR.parent / "scripts" / "repo_root.py"
+        repo_root_src = SOURCE_COMMANDS_DIR.parent / "scripts" / "setup" / "repo_root.py"  # v3.0: setup子包
         repo_root_dst = _HOME / ".qoderwork" / "repo_root.py"
         if repo_root_src.is_file():
             if action == "check":
@@ -684,7 +694,7 @@ def main():
     # .repo-root 锚点文件让 launcher 能定位仓库根 (不依赖 mcp.json 里的路径)。
     if action in ("install", "check"):
         print(f"\n--- mcp_launcher.py (统一 MCP 启动器) ---")
-        launcher_src = SOURCE_COMMANDS_DIR.parent / "scripts" / "mcp_launcher.py"
+        launcher_src = SOURCE_COMMANDS_DIR.parent / "scripts" / "mcp" / "mcp_launcher.py"  # v3.0: mcp子包
         launcher_dst = _HOME / ".qoderwork" / "mcp_launcher.py"
         anchor_dst = _HOME / ".qoderwork" / ".repo-root"
         if action == "check":