@hupan56/wlkj 2.7.8 → 2.7.10

package/bin/cli.js

@@ -59,7 +59,9 @@ function runScript(scriptName, args = [], timeoutMs = 600000) {
   const pyCmd = detectPyCmd();
   if (!pyCmd) { console.log("Python 未安装。跑: npx @hupan56/wlkj install-env"); process.exit(1); }
   const { spawnSync } = require("child_process");
-  const r = spawnSync(pyCmd, [p, ...args], { cwd: process.cwd(), stdio: "inherit", timeout: timeoutMs, encoding: "utf-8" });
+  // 强制 UTF-8 环境 (Windows cmd 默认 GBK, 会导致中文输出乱码)
+  const env = { ...process.env, PYTHONIOENCODING: "utf-8", PYTHONUTF8: "1" };
+  const r = spawnSync(pyCmd, [p, ...args], { cwd: process.cwd(), stdio: "inherit", timeout: timeoutMs, encoding: "utf-8", env });
   process.exit(r.status || 0);
 }
 
@@ -304,7 +306,9 @@ async function doInit(name, roleArg) {
     try {
       const cmd = `python "${setupPath}" ${setupArgs.map(a => `"${a}"`).join(" ")}`;
       console.log(`  运行: setup.py ${setupArgs.join(" ")}`);
-      execSync(cmd, { cwd, stdio: "inherit", timeout: 300000 });
+      // 强制 UTF-8 环境 (Windows cmd 默认 GBK, 会导致中文输出乱码)
+      const env = { ...process.env, PYTHONIOENCODING: "utf-8", PYTHONUTF8: "1" };
+      execSync(cmd, { cwd, stdio: "inherit", timeout: 300000, env });
     } catch (e) {
       console.log(`  setup 部分失败 (不阻塞): ${(e.message || "").slice(0, 100)}`);
       console.log(`  可重新运行: npx @hupan56/wlkj init ${name || "<你的名字>"}`);
@@ -345,7 +349,8 @@ async function doInit(name, roleArg) {
       const instScript = path.join(cwd, ".qoder", "scripts", "install_qoderwork.py");
       if (fs.existsSync(instScript)) {
         try {
-          execSync(`${pyCmd} "${instScript}" --mcp-only`, { stdio: "inherit", timeout: 20000 });
+          const env = { ...process.env, PYTHONIOENCODING: "utf-8", PYTHONUTF8: "1" };
+          execSync(`${pyCmd} "${instScript}" --mcp-only`, { stdio: "inherit", timeout: 20000, env });
           console.log(`  [OK] mcp.json 已生成 (选装了依赖的Python, MCP 不会黄)`);
         } catch (e) {
           console.log(`  [WARN] MCP 配置未完全成功 (不阻塞): ${(e.message || "").slice(0, 80)}`);
@@ -557,6 +562,9 @@ function doUpdate() {
   console.log(`  根文档 + requirements.txt: 已更新`);
 
   // === 2.5. git pull 拉最新团队数据 (kg.duckdb/kg_db.duckdb/PRD等在git里) ===
+  // git pull 失败会导致 kg.duckdb 拿不到 → kg MCP 无数据(但仍能连)。
+  // 失败原因常见: 未配 git 身份 / 远程仓库需要认证 / 网络问题。
+  // 这里给出清晰诊断, 不让"git pull 失败"变成无声的静默跳过。
   try {
     const { execSync: _es } = require("child_process");
     const pullR = _es("git pull --no-rebase 2>&1", { cwd, encoding: "utf-8", timeout: 30000 });
@@ -568,7 +576,22 @@ function doUpdate() {
       console.log(`  git: 已拉取最新`);
     }
   } catch (e) {
-    console.log(`  git: 跳过(${(e.message || "").slice(0, 50)})`);
+    // git pull 失败诊断: 区分"没配git身份"/"远程要认证"/"网络问题"
+    const errMsg = String(e.message || "");
+    const stdout = String(e.stdout || "");
+    const combined = errMsg + " " + stdout;
+    if (combined.includes("Authentication failed") || combined.includes("Permission denied") ||
+        combined.includes("could not read Username") || combined.includes("不支持密码")) {
+      console.log(`  git: ⚠️ 认证失败 — kg.duckdb 等团队数据拉不到`);
+      console.log(`       原因: git 身份/凭证未配。MCP 能连但无数据。`);
+      console.log(`       修复: npx @hupan56/wlkj init <你的名字> (交互式配 git 账号)`);
+    } else if (combined.includes("not a git repository") || combined.includes("not a git dir")) {
+      console.log(`  git: 非git仓库 — 用 team_sync 拉团队数据`);
+      console.log(`       修复: npx @hupan56/wlkj init <你的名字>`);
+    } else {
+      console.log(`  git: 跳过 — ${(errMsg).slice(0, 60)}`);
+      console.log(`       (kg.duckdb 拉不到, MCP 能连但搜索无结果)`);
+    }
   }
 
   // === 3. 补装 pip 依赖 (必须在刷 mcp.json 之前!)
@@ -718,6 +741,20 @@ function doUpdate() {
     }
   } catch (e) { /* 刷新失败不阻塞升级 */ }
 
+  // === 6.5. MCP 启动实测 (发 initialize 看哪个起不来) ===
+  // 这是"根治黄色"的关键一步: 配完 mcp.json 后立即模拟 QoderWork 发 initialize,
+  // 看每个 MCP 是 OK / DISABLED(绿) / CRASHED(黄)。有问题当场报, 不让用户重启后才发现。
+  console.log(`\n--- MCP 启动实测 (模拟 QoderWork 连接) ---`);
+  const diagScript = path.join(cwd, ".qoder", "scripts", "check_mcp_launch.py");
+  if (pyCmd && fs.existsSync(diagScript)) {
+    try {
+      const env = { ...process.env, PYTHONIOENCODING: "utf-8", PYTHONUTF8: "1" };
+      execSync(`${pyCmd} "${diagScript}"`, { cwd, stdio: "inherit", timeout: 60000, env });
+    } catch (e) {
+      console.log(`  [WARN] MCP 实测脚本异常 (不阻塞): ${(e.message || "").slice(0, 80)}`);
+    }
+  }
+
   // === 7. 自检: 关键文件到底齐不齐 ===
   console.log(`\n--- 自检 (关键文件验证) ---`);
   const checks = [

package/package.json

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

package/templates/qoder/scripts/check_mcp_launch.py

@@ -0,0 +1,183 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+check_mcp_launch.py - 诊断 MCP 为什么黄色
+
+逐个模拟 mcp_launcher.py 启动每个 MCP, 发送 initialize 请求,
+看哪个 MCP 启动失败/崩溃/不响应。输出明确的诊断结论。
+
+用法: python .qoder/scripts/check_mcp_launch.py
+"""
+import json
+import os
+import subprocess
+import sys
+from pathlib import Path
+
+SCRIPTS_DIR = Path(__file__).resolve().parent
+BASE = SCRIPTS_DIR.parent.parent  # repo root
+
+MCP_NAMES = ['kg', 'mysql', 'zentao', 'lanhu']
+
+
+def find_python_with(mod):
+    """找一个能 import mod 的 python."""
+    for py in [sys.executable, 'python', 'python3']:
+        try:
+            r = subprocess.run([py, '-c', f'import {mod}'],
+                               capture_output=True, timeout=8)
+            if r.returncode == 0:
+                return py
+        except Exception:
+            continue
+    return None
+
+
+def test_mcp(name):
+    """测试一个 MCP 能否正常响应 initialize."""
+    launcher = SCRIPTS_DIR / 'mcp_launcher.py'
+    if not launcher.is_file():
+        return {'name': name, 'status': 'ERROR',
+                'detail': f'launcher 不存在: {launcher}'}
+
+    init_req = json.dumps({
+        'jsonrpc': '2.0', 'id': 1, 'method': 'initialize',
+        'params': {'capabilities': {}, 'protocolVersion': '2024-11-05',
+                   'clientInfo': {'name': 'diag', 'version': '1.0'}}
+    }) + '\n'
+
+    try:
+        r = subprocess.run(
+            [sys.executable, str(launcher), name],
+            input=init_req,
+            capture_output=True, text=True, timeout=10,
+            cwd=str(BASE), encoding='utf-8', errors='replace'
+        )
+    except subprocess.TimeoutExpired:
+        return {'name': name, 'status': 'TIMEOUT',
+                'detail': '启动后 10s 无响应 (可能卡在等 stdin)'}
+    except Exception as e:
+        return {'name': name, 'status': 'ERROR',
+                'detail': f'启动异常: {e}'}
+
+    stdout = r.stdout or ''
+    stderr = r.stderr or ''
+
+    # 解析 stdout 找 initialize 响应
+    init_ok = False
+    disabled = False
+    reason = ''
+    for line in stdout.split('\n'):
+        line = line.strip()
+        if not line:
+            continue
+        try:
+            resp = json.loads(line)
+            if resp.get('id') == 1 and 'result' in resp:
+                init_ok = True
+                si = resp['result'].get('serverInfo', {})
+                ver = si.get('version', '')
+                if 'disabled' in ver:
+                    disabled = True
+                    reason = si.get('reason', '')
+                break
+        except json.JSONDecodeError:
+            continue
+
+    if init_ok and not disabled:
+        return {'name': name, 'status': 'OK',
+                'detail': '正常启动, 工具可用'}
+    elif init_ok and disabled:
+        return {'name': name, 'status': 'DISABLED',
+                'detail': f'以"未启用"模式启动 (绿但0工具): {reason}'}
+    elif r.returncode != 0:
+        # 进程崩溃了
+        return {'name': name, 'status': 'CRASHED',
+                'detail': f'进程退出(rc={r.returncode})。stderr:\n{stderr[-500:]}'}
+    else:
+        return {'name': name, 'status': 'NO_RESPONSE',
+                'detail': f'没崩溃但没响应 initialize。stdout:\n{stdout[-300:]}\nstderr:\n{stderr[-300:]}'}
+
+
+def main():
+    print('=' * 56)
+    print('MCP 启动诊断')
+    print(f'仓库: {BASE}')
+    print(f'Python: {sys.executable} ({sys.version.split()[0]})')
+    print('=' * 56)
+
+    # 基础检查
+    print('\n--- 环境检查 ---')
+    for mod, label in [('duckdb', 'kg 依赖'), ('pymysql', 'mysql 依赖'),
+                       ('requests', 'zentao 依赖'), ('yaml', '配置解析')]:
+        try:
+            __import__(mod)
+            print(f'  [OK]   {mod} ({label})')
+        except ImportError:
+            py = find_python_with(mod)
+            if py:
+                print(f'  [WARN] {mod} 在当前Python没有, 但 {py} 有')
+            else:
+                print(f'  [MISS] {mod} ({label}) — pip install {mod}')
+
+    kg_path = BASE / 'data' / 'index' / 'kg.duckdb'
+    print(f'\n  kg.duckdb: {"存在" if kg_path.is_file() else "缺失 (git pull 失败? 非管理员跑 team_sync pull)"}')
+
+    # mcp.json 检查
+    home = Path(os.environ.get('USERPROFILE') or os.path.expanduser('~'))
+    mcp_file = home / '.qoderwork' / 'mcp.json'
+    print(f'\n  mcp.json: {mcp_file}')
+    if mcp_file.is_file():
+        try:
+            cfg = json.loads(mcp_file.read_text(encoding='utf-8'))
+            servers = cfg.get('mcpServers', {})
+            for srv in ['qoder-knowledge-graph', 'qoder-mysql', 'qoder-zentao', 'lanhu']:
+                entry = servers.get(srv)
+                if entry:
+                    cmd = entry.get('command', '?')
+                    args = entry.get('args', [])
+                    has_launcher = any('mcp_launcher.py' in str(a) for a in args)
+                    print(f'    {srv}: command={cmd!r} launcher={"是" if has_launcher else "否(旧模式)"}')
+                else:
+                    print(f'    {srv}: 未注册')
+        except Exception as e:
+            print(f'  [ERR] mcp.json 解析失败: {e}')
+    else:
+        print(f'  [MISS] mcp.json 不存在 (跑 npx @hupan56/wlkj update)')
+
+    # 逐个测试 MCP
+    print('\n--- MCP 启动测试 (模拟 QoderWork 发 initialize) ---')
+    results = []
+    for name in MCP_NAMES:
+        print(f'\n  测试 {name}...')
+        r = test_mcp(name)
+        results.append(r)
+        icon = {'OK': '🟢', 'DISABLED': '🟢(无工具)', 'CRASHED': '🔴',
+                'TIMEOUT': '🟡', 'NO_RESPONSE': '🟡', 'ERROR': '🔴'}
+        print(f'    {icon.get(r["status"], "?")} {r["status"]}: {r["name"]}')
+        if r['status'] not in ('OK', 'DISABLED'):
+            print(f'    详情: {r["detail"]}')
+
+    # 总结
+    print('\n' + '=' * 56)
+    print('诊断结论:')
+    ok = sum(1 for r in results if r['status'] in ('OK', 'DISABLED'))
+    bad = sum(1 for r in results if r['status'] not in ('OK', 'DISABLED'))
+    if bad == 0:
+        print(f'  全部 MCP 启动正常 ({ok}/{len(results)})。')
+        print('  如果 QoderWork 仍显示黄色: 重启 QoderWork 或新建对话。')
+        print('  (mcp.json 改动需要重启才生效)')
+    else:
+        print(f'  {bad} 个 MCP 启动有问题:')
+        for r in results:
+            if r['status'] not in ('OK', 'DISABLED'):
+                print(f'    - {r["name"]}: {r["status"]}')
+        print('\n  常见原因:')
+        print('    CRASHED: Python 版本不兼容(如3.14) 或 脚本语法错误 → 看详情里的 stderr')
+        print('    TIMEOUT: 脚本卡住了 → 查 DuckDB 文件锁 或 网络等待')
+        print('    NO_RESPONSE: stdout 被 print 污染 → 看 stdout 里的非 JSON 内容')
+    print('=' * 56)
+
+
+if __name__ == '__main__':
+    main()

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

@@ -24,11 +24,14 @@ MIRRORS = [
     ('腾讯', 'https://mirrors.cloud.tencent.com/pypi/simple'),
 ]
 
-# 单次安装超时 (秒), 避免卡死
-INSTALL_TIMEOUT = 300
+# 超时策略 (秒):
+#   默认源(PyPI): 国内常被拦/超慢, 给短超时 45s, 够判定"通不通", 不让用户干等。
+#   国内镜像: 给足 300s, 真正下载大包(tree-sitter/playwright wheels)需要时间。
+DEFAULT_TIMEOUT = 45
+MIRROR_TIMEOUT = 300
 
 
-def _run_pip(args, index_url=None, timeout=INSTALL_TIMEOUT):
+def _run_pip(args, index_url=None, timeout=MIRROR_TIMEOUT):
     """跑一次 pip, 返回 (returncode, stdout, stderr)。
     index_url 非 None 时加 -i 指定镜像源。
     用 trusted-host 避免某些镜像的 SSL 证书警告阻断。
@@ -63,26 +66,43 @@ def install_with_fallback(args):
       missing: 仍缺失的包 (ok=True 时为空)
       tried: 尝试过的源列表 [(name, success)]
       hint: 失败时的手动命令
+
+    判断成功以 _verify_packages(import 验证)为准, 不只看 returncode:
+      理由: 某些间接依赖(如 greenlet 在无编译器的环境)编译失败会让
+      pip 返回 rc=1, 但核心包其实都已装好(already satisfied)。
+      只信 rc=1 会误判失败 → 浪费时间去试镜像 → 仍"失败"吓到用户。
+      用 import 验证核心包才是真相。
     """
     tried = []
 
-    # 1. 默认源
-    rc, out, err = _run_pip(args)
+    # 1. 默认源 (短超时: 国内常被拦, 不让用户干等 5 分钟)
+    rc, out, err = _run_pip(args, timeout=DEFAULT_TIMEOUT)
     tried.append(('默认源(PyPI)', rc == 0))
     if rc == 0:
         return {'ok': True, 'source': 'default', 'missing': [], 'tried': tried,
                 'hint': None}
 
-    # 2. 逐个国内镜像重试
+    # 1.5 默认源 rc≠0 —— 先 import 验证, 核心包都在就算成功 (跳过无谓的镜像重试)
+    # 典型场景: greenlet 编译失败 → rc=1, 但 duckdb/pymysql/PyYAML 都 already satisfied
+    missing = _verify_packages(args)
+    if not missing:
+        return {'ok': True, 'source': 'default', 'missing': [], 'tried': tried,
+                'hint': None}
+
+    # 2. 核心包真有缺失 —— 才逐个试国内镜像
     for name, url in MIRRORS:
         rc, out, err = _run_pip(args, index_url=url)
         tried.append((name, rc == 0))
         if rc == 0:
             return {'ok': True, 'source': name, 'missing': [], 'tried': tried,
                     'hint': None}
+        # 每个镜像失败后也 import 验证一下 (镜像可能装上了核心包, 只是间接依赖仍编译失败)
+        missing = _verify_packages(args)
+        if not missing:
+            return {'ok': True, 'source': name, 'missing': [], 'tried': tried,
+                    'hint': None}
 
-    # 3. 全失败 —— 解析出哪些包没装上 (用 import 验证, 比 parse pip 输出可靠)
-    missing = _verify_packages(args)
+    # 3. 全失败 —— 返回缺失清单 + 手动命令
     hint = _build_manual_hint(missing, tried)
     return {'ok': False, 'source': None, 'missing': missing,
             'tried': tried, 'hint': hint}
@@ -93,8 +113,21 @@ def _verify_packages(args):
     只处理 -r requirements.txt 和直接包名两种情况。
     返回仍 import 失败的 pip 包名列表。
     """
-    # 直接包名: args 里不带 - 开头的项
-    pkg_names = [a for a in args if not a.startswith('-')]
+    # 直接包名: args 里不带 - 开头的项, 但要排除 -r 后面跟的文件路径
+    # (否则 "requirements.txt" 会被误当成包名去 import)
+    skip_next = False
+    pkg_names = []
+    for a in args:
+        if skip_next:
+            skip_next = False
+            continue
+        if a in ('-r', '--requirement', '-c', '--constraint', '-e', '--editable'):
+            skip_next = True  # 下一个参数是文件路径, 不是包名
+            continue
+        if a.startswith('-r') and len(a) > 2:  # -rFILE 紧凑写法
+            continue
+        if not a.startswith('-'):
+            pkg_names.append(a)
     if '-r' in args:
         # 从 requirements.txt 读包名 (取每行第一个 token, 去 >= 等版本约束)
         try:

package/templates/qoder/scripts/setup.py

@@ -65,11 +65,20 @@ def ask(prompt, default='y'):
 
 
 def run(cmd, **kwargs):
-    """跑子进程, 返回 CompletedProcess。encoding 容错。"""
+    """跑子进程, 返回 CompletedProcess。encoding 容错。
+    强制 UTF-8 环境 (Windows cmd 默认 GBK, 不设会导致中文乱码):
+      - encoding='utf-8': 父进程解码子进程 stdout 的方式
+      - env PYTHONIOENCODING=utf-8: 让子进程 Python 自己也用 UTF-8 输出
+      - env PYTHONUTF8=1: Python 3.7+ UTF-8 mode, 彻底解决
+    """
     kwargs.setdefault('capture_output', True)
     kwargs.setdefault('text', True)
     kwargs.setdefault('encoding', 'utf-8')
     kwargs.setdefault('errors', 'replace')
+    env = dict(kwargs.pop('env', None) or os.environ)
+    env.setdefault('PYTHONIOENCODING', 'utf-8')
+    env.setdefault('PYTHONUTF8', '1')
+    kwargs['env'] = env
     return subprocess.run(cmd, **kwargs)
 
 
@@ -223,7 +232,11 @@ def detect_name(explicit=None):
 def run_doctor(name, role):
     print('\n--- 初始化 (init_doctor) ---')
     cmd = [sys.executable, str(THIS_DIR / 'init_doctor.py'), '--fix', name, role]
-    r = subprocess.run(cmd, cwd=str(BASE))
+    # 透传 stdio (用户能看到实时输出) + 强制 UTF-8 环境 (解决 cmd GBK 乱码)
+    env = dict(os.environ)
+    env['PYTHONIOENCODING'] = 'utf-8'
+    env['PYTHONUTF8'] = '1'
+    r = subprocess.run(cmd, cwd=str(BASE), env=env)
     # init_doctor 返回 0=健康, 1=有未解决问题
     if r.returncode == 0:
         ok('init_doctor 完成, 环境健康')
@@ -565,7 +578,10 @@ def offer_qoderwork(skip=False):
         return
 
     if ask('检测到 QoderWork, 安装技能 (软链到 ~/.qoderwork/skills/)?', 'y'):
-        r = subprocess.run([sys.executable, str(THIS_DIR / 'install_qoderwork.py')], cwd=str(BASE))
+        env = dict(os.environ)
+        env['PYTHONIOENCODING'] = 'utf-8'
+        env['PYTHONUTF8'] = '1'
+        r = subprocess.run([sys.executable, str(THIS_DIR / 'install_qoderwork.py')], cwd=str(BASE), env=env)
         if r.returncode == 0:
             ok('QoderWork 技能已安装')
         else: