@hupan56/wlkj 2.7.9 → 2.7.11

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)}`);
@@ -571,20 +576,32 @@ function doUpdate() {
       console.log(`  git: 已拉取最新`);
     }
   } catch (e) {
-    // git pull 失败诊断: 区分"没配git身份"/"远程要认证"/"网络问题"
+    // git pull 失败诊断: 区分"没配git身份"/"远程要认证"/"网络问题"/"非git仓库"
+    // node execSync 抛异常时, git 的真实报错在 e.stderr/e.stdout, 不能只看 e.message
     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("不支持密码")) {
+    const stdout = String((e.stdout || "") + " " + (e.stderr || ""));
+    const combined = (errMsg + " " + stdout).toLowerCase();
+    if (combined.includes("authentication failed") || combined.includes("permission denied") ||
+        combined.includes("could not read username") || combined.includes("不支持密码") ||
+        combined.includes("credentials") || combined.includes("403") || combined.includes("401")) {
       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 if (combined.includes("not a git repository") || combined.includes("not a git dir") ||
+               combined.includes("unknown revision") || combined.includes("does not have any commits")) {
+      console.log(`  git: ⚠️ 非git仓库或空仓库 — 团队数据拉不到`);
+      console.log(`       原因: 此目录不是 git clone 来的, 或没有 remote。`);
+      console.log(`       修复: npx @hupan56/wlkj init <你的名字> (会配团队远程仓库)`);
+    } else if (combined.includes("timed out") || combined.includes("timeout") ||
+               combined.includes("could not resolve host") || combined.includes("connection refused") ||
+               combined.includes("network is unreachable")) {
+      console.log(`  git: ⚠️ 网络问题 — 连不上远程仓库`);
+      console.log(`       原因: ${stdout.trim().slice(0, 80) || "网络超时/无法解析主机"}`);
+      console.log(`       (kg.duckdb 拉不到, MCP 能连但搜索无结果)`);
     } else {
-      console.log(`  git: 跳过 — ${(errMsg).slice(0, 60)}`);
+      // 兜底: 显示 git 的真实报错, 不再笼统说 "Command failed"
+      const realErr = stdout.trim() || errMsg;
+      console.log(`  git: ⚠️ 拉取失败 — ${realErr.slice(0, 100)}`);
       console.log(`       (kg.duckdb 拉不到, MCP 能连但搜索无结果)`);
     }
   }
@@ -743,7 +760,8 @@ function doUpdate() {
   const diagScript = path.join(cwd, ".qoder", "scripts", "check_mcp_launch.py");
   if (pyCmd && fs.existsSync(diagScript)) {
     try {
-      execSync(`${pyCmd} "${diagScript}"`, { cwd, stdio: "inherit", timeout: 60000 });
+      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)}`);
     }

package/package.json

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

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: