@hupan56/wlkj 2.7.10 → 2.7.12

package/bin/cli.js

@@ -563,10 +563,41 @@ function doUpdate() {
 
   // === 2.5. git pull 拉最新团队数据 (kg.duckdb/kg_db.duckdb/PRD等在git里) ===
   // git pull 失败会导致 kg.duckdb 拿不到 → kg MCP 无数据(但仍能连)。
-  // 失败原因常见: 未配 git 身份 / 远程仓库需要认证 / 网络问题。
+  // 失败原因常见: 未配 git 身份 / 远程仓库需要认证 / 网络问题 / 分支没tracking。
   // 这里给出清晰诊断, 不让"git pull 失败"变成无声的静默跳过。
+  // 前置: 自愈分支 tracking (老版 init 配了 remote 但没 set-upstream, pull 会报
+  //       "no tracking information"。这里检测到就补上, 老用户 update 也能自动修)
   try {
     const { execSync: _es } = require("child_process");
+    // 先看当前分支有没有 upstream
+    let _trackOk = false;
+    try {
+      _es("git rev-parse --abbrev-ref --symbolic-full-name @{u}", { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" });
+      _trackOk = true;  // 有 upstream, 正常
+    } catch {
+      // 没 tracking — 尝试补设 (有 origin remote 的前提下)
+      try {
+        const _remote = _es("git remote", { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" }).trim();
+        if (_remote.split(/\s+/).includes("origin")) {
+          _es("git fetch origin", { cwd, encoding: "utf-8", timeout: 30000, stdio: "pipe" });
+          // 确定本地分支名
+          const _branch = _es("git rev-parse --abbrev-ref HEAD", { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" }).trim();
+          // 远程用 master 还是 main
+          let _remoteBranch = null;
+          for (const _c of ["master", "main"]) {
+            try {
+              _es(`git rev-parse --verify remotes/origin/${_c}`, { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" });
+              _remoteBranch = _c; break;
+            } catch { /* 该分支不存在, 试下一个 */ }
+          }
+          if (_remoteBranch) {
+            _es(`git branch --set-upstream-to=origin/${_remoteBranch} ${_branch}`, { cwd, encoding: "utf-8", timeout: 5000, stdio: "pipe" });
+            console.log(`  git: 已自动设置上游 tracking (origin/${_remoteBranch})`);
+            _trackOk = true;
+          }
+        }
+      } catch { /* 补 tracking 失败, 走下面的 pull 诊断 */ }
+    }
     const pullR = _es("git pull --no-rebase 2>&1", { cwd, encoding: "utf-8", timeout: 30000 });
     if (pullR.includes("Already up to date") || pullR.includes("已经是最新")) {
       console.log(`  git: 已是最新`);
@@ -576,20 +607,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 能连但搜索无结果)`);
     }
   }

package/package.json

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

package/templates/qoder/scripts/setup.py

@@ -420,6 +420,37 @@ def _write_team_remote_to_config(url):
         pass
 
 
+def _setup_tracking(base):
+    """git remote add 之后调: fetch 远程 + 设置当前分支的上游 tracking。
+    没这步, git pull 会报 "no tracking information for the current branch"。
+    fetch 可能因网络/认证失败 — 失败只警告, 不阻塞 (remote 至少配上了)。
+    """
+    # fetch 远程分支
+    r = run(['git', 'fetch', 'origin'], cwd=str(base))
+    if r.returncode != 0:
+        err = (r.stderr or '').strip()
+        # 常见的非阻塞情况: 远程是空仓库(还没 push 过)、网络问题
+        if 'empty' in err.lower() or 'warning' in err.lower():
+            pass  # 空仓库正常, 之后 push 了就有
+        else:
+            warn('git fetch 失败 (不阻塞, 之后 /wl-init 时重试): ' + err[:80])
+        return
+    # 确定本地当前分支名
+    br_r = run(['git', 'rev-parse', '--abbrev-ref', 'HEAD'], cwd=str(base))
+    local_branch = br_r.stdout.strip() if br_r.returncode == 0 else 'master'
+    # 远程有 master 还是 main? 优先 master (团队约定), fallback main
+    remote_branch = None
+    for cand in ('master', 'main'):
+        check = run(['git', 'rev-parse', '--verify', f'remotes/origin/{cand}'], cwd=str(base))
+        if check.returncode == 0:
+            remote_branch = cand
+            break
+    if not remote_branch:
+        return  # 远程没分支(空仓库), 没法设 tracking, 等 push 后再说
+    # 设置上游 tracking
+    run(['git', 'branch', f'--set-upstream-to=origin/{remote_branch}', local_branch], cwd=str(base))
+
+
 def configure_team_remote():
     """配置团队协作仓库的 git remote (workspace/ 产出往这里 push)。
 
@@ -439,6 +470,11 @@ def configure_team_remote():
         url_r = run(['git', 'remote', 'get-url', 'origin'], cwd=str(BASE))
         url = url_r.stdout.strip() if url_r.returncode == 0 else '?'
         ok(f'团队仓库已配置: origin -> {url}')
+        # 即使 origin 已配, 也要检查 tracking 是否设好 (修复历史 init 的遗漏)
+        track_r = run(['git', 'rev-parse', '--abbrev-ref', '--symbolic-full-name', '@{u}'], cwd=str(BASE))
+        if track_r.returncode != 0:
+            print('  (当前分支未设上游, 补设 tracking...)')
+            _setup_tracking(BASE)
         return
 
     # 3. 没有 origin — 从 config.yaml 读 team_remote (如果有)
@@ -448,6 +484,7 @@ def configure_team_remote():
             r = run(['git', 'remote', 'add', 'origin', team_url], cwd=str(BASE))
             if r.returncode == 0:
                 ok(f'团队仓库已配置: origin -> {team_url}')
+                _setup_tracking(BASE)  # fetch + 设上游, 让 git pull 能用
             else:
                 warn('remote add 失败: ' + (r.stderr or '').strip()[:100])
             return
@@ -468,6 +505,7 @@ def configure_team_remote():
     r = run(['git', 'remote', 'add', 'origin', url], cwd=str(BASE))
     if r.returncode == 0:
         ok(f'团队仓库已配置: origin -> {url}')
+        _setup_tracking(BASE)  # fetch + 设上游, 让 git pull 能用
         _write_team_remote_to_config(url)  # 顺手写 config 供团队复用
     else:
         warn('remote add 失败: ' + (r.stderr or '').strip()[:100])