@hupan56/wlkj 3.1.28 → 3.1.30

package/bin/cli.js

@@ -306,12 +306,20 @@ async function doInit(name, roleArg) {
   // 源: templates/qoder/*  目标: .qoder/*
   // init 复用 update 的三路快照保护: 新装时目标不存在, 保护不触发;
   // 重跑 init 时用户改过的引擎文件 (如自定义 skill) 不会被覆盖。
+  // ⚠ 但如果快照缺失/损坏(如 git checkout 后), 三路保护会误保护所有文件
+  // → 修复: 快照缺失时, init 强制全覆盖(重新建立基线), 不保护。
+  const snapshotPath = path.join(cwd, ".qoder", ".engine-snapshot.json");
+  const hasSnapshot = fs.existsSync(snapshotPath);
+  if (hasExisting && !hasSnapshot) {
+    console.log("  [注意] 快照缺失, 引擎文件将强制全量覆盖 (重新建立基线)");
+  }
+  const useMode = (hasExisting && hasSnapshot) ? "update" : "init";
   const qoderSrc = path.join(T, "qoder");
   let copied = 0;
   if (fs.existsSync(qoderSrc)) {
     const snap = readSnapshot(cwd);
     const newSnap = {};
-    const r = copyDirRecursive(qoderSrc, path.join(cwd, ".qoder"), "update", snap, newSnap);
+    const r = copyDirRecursive(qoderSrc, path.join(cwd, ".qoder"), useMode, snap, newSnap);
     copied = r.copied;
     writeSnapshot(cwd, newSnap);
     if (r.protectedN > 0) {

package/package.json

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

package/templates/qoder/commands/wl-task.md

@@ -43,14 +43,21 @@ PY=$(python --version >/dev/null 2>&1 && echo python || echo python3)
 - **建任务**：`create_task` 的 `assignedTo` **默认指派给当前开发者**（从 member.json 的 zentao_account），显式传参才派别人。
 - 隔离红线见 `contracts/isolation.md`「禅道同步」。
 
-### 第 0 步：探测禅道可达性
-调用禅道健康检查（QoderWork: `qw_mcp_call("check_zentao_status", {})` / CLI: `cap.mcp.call("check_zentao_status")`）——内网 + 凭据一道探测：
+### 第 0 步：按操作类型决定要不要探测禅道
+
+禅道工具自带内网/凭据门（不通返回友好提示）。**读类操作直接调，省掉探测往返**：
+
+| 操作类型 | 探测? | 走法 |
+|---------|:----:|------|
+| **读**（看我的活/列任务/看详情/Bug状态） | ❌ 不探测 | 直接 `my_workbench`/`list_my_tasks`/`get_*`，门会兜底 |
+| **写**（create/start/finish/assign/resolve/改/删） | ✅ 探测 | 先 `check_zentao_status`，或写前 `get_*` 确认归属时顺手探，避免写一半断网 |
+| 用户明说"离线/先存本地" | — | 即使可达也走本地模式 |
+
 - **✅ 可达** → 走**禅道模式**（下方各动作的「禅道走法」）
 - **❌ 不可达 / 未配置** → 走**本地模式**（下方各动作的原有 `task.py` 走法，离线兜底，不报错不阻塞）
-- **用户明确说"离线"/"先存本地"** → 即使禅道可达也走本地模式
 
 > 这套判定让禅道有就同步、没内网就静默回退 —— 符合 AGENTS.md「本地数据是唯一事实源、连接器是可选增强、断网不阻塞」原则。
-> 探测本身要 1 次调用。**高频场景（看我的活）可省略探测**：直接 my_workbench，它内部自带内网/凭据门，不通会返回友好提示，不浪费一次往返。
+> ★ 高频的"看我的活"现在是 **1 次调用直达**（旧版 probe + workbench 两次），思考链更短。
 
 ### 列表勾选式交互（禅道模式的统一范式）
 

package/templates/qoder/scripts/capability/smoke_test_report.json

@@ -1,10 +1,10 @@
 {
-  "timestamp": "2026-06-26 21:25:55",
+  "timestamp": "2026-06-29 11:20:28",
   "servers": {
     "qoder-knowledge-graph": {
       "available": true,
       "tools_indexed": 17,
-      "latency_ms": 437.0,
+      "latency_ms": 484.0,
       "sample_tools": [
         "search_code",
         "search_api",
@@ -12,13 +12,13 @@
         "get_impact",
         "context_360"
       ],
-      "spawn_pid": 38616,
+      "spawn_pid": 66880,
       "status": "PASS"
     },
     "qoder-zentao": {
       "available": true,
-      "tools_indexed": 66,
-      "latency_ms": 3657.0,
+      "tools_indexed": 68,
+      "latency_ms": 766.0,
       "sample_tools": [
         "check_zentao_status",
         "get_zentao_url",
@@ -26,13 +26,13 @@
         "get_product",
         "create_product"
       ],
-      "spawn_pid": 11224,
+      "spawn_pid": 48620,
       "status": "PASS"
     },
     "qoder-mysql": {
       "available": true,
       "tools_indexed": 6,
-      "latency_ms": 3484.0,
+      "latency_ms": 609.0,
       "sample_tools": [
         "list_envs",
         "query_schema",
@@ -40,13 +40,13 @@
         "query_distinct",
         "list_databases"
       ],
-      "spawn_pid": 37868,
+      "spawn_pid": 67572,
       "status": "PASS"
     },
     "lanhu": {
       "available": true,
       "tools_indexed": 13,
-      "latency_ms": 3156.0,
+      "latency_ms": 3313.0,
       "sample_tools": [
         "lanhu_resolve_invite_link",
         "lanhu_list_product_documents",
@@ -54,13 +54,13 @@
         "lanhu_get_ai_analyze_page_result",
         "lanhu_get_designs"
       ],
-      "spawn_pid": 36836,
+      "spawn_pid": 32460,
       "status": "PASS"
     }
   },
   "call_tool": {
     "status": "PASS",
-    "latency_ms": 3953.0,
+    "latency_ms": 3547.0,
     "text_preview": "Chinese: 保险 -> English: ins insurance vehlife/insurance\n\n[Carmg-H5] 12 files\n  Carmg-H5/src/.../main/List.vue  ->  data/code/Carmg-H5/src/modules/icsAbnormalCenter/module/main/List.vue\n  Carmg-H5/src/",
     "is_error": false
   },
@@ -89,6 +89,6 @@
     "all_pass": true,
     "active_servers": 4,
     "total_servers": 4,
-    "total_tools": 102
+    "total_tools": 104
   }
 }

package/templates/qoder/scripts/capability/smoke_test_report.json.new

@@ -0,0 +1,94 @@
+{
+  "timestamp": "2026-06-26 21:25:55",
+  "servers": {
+    "qoder-knowledge-graph": {
+      "available": true,
+      "tools_indexed": 17,
+      "latency_ms": 437.0,
+      "sample_tools": [
+        "search_code",
+        "search_api",
+        "search_prd",
+        "get_impact",
+        "context_360"
+      ],
+      "spawn_pid": 38616,
+      "status": "PASS"
+    },
+    "qoder-zentao": {
+      "available": true,
+      "tools_indexed": 66,
+      "latency_ms": 3657.0,
+      "sample_tools": [
+        "check_zentao_status",
+        "get_zentao_url",
+        "list_products",
+        "get_product",
+        "create_product"
+      ],
+      "spawn_pid": 11224,
+      "status": "PASS"
+    },
+    "qoder-mysql": {
+      "available": true,
+      "tools_indexed": 6,
+      "latency_ms": 3484.0,
+      "sample_tools": [
+        "list_envs",
+        "query_schema",
+        "query_data",
+        "query_distinct",
+        "list_databases"
+      ],
+      "spawn_pid": 37868,
+      "status": "PASS"
+    },
+    "lanhu": {
+      "available": true,
+      "tools_indexed": 13,
+      "latency_ms": 3156.0,
+      "sample_tools": [
+        "lanhu_resolve_invite_link",
+        "lanhu_list_product_documents",
+        "lanhu_get_pages",
+        "lanhu_get_ai_analyze_page_result",
+        "lanhu_get_designs"
+      ],
+      "spawn_pid": 36836,
+      "status": "PASS"
+    }
+  },
+  "call_tool": {
+    "status": "PASS",
+    "latency_ms": 3953.0,
+    "text_preview": "Chinese: 保险 -> English: ins insurance vehlife/insurance\n\n[Carmg-H5] 12 files\n  Carmg-H5/src/.../main/List.vue  ->  data/code/Carmg-H5/src/modules/icsAbnormalCenter/module/main/List.vue\n  Carmg-H5/src/",
+    "is_error": false
+  },
+  "memory": {
+    "available": true,
+    "providers": [
+      {
+        "provider": "McpMemoryProvider",
+        "available": true,
+        "hit": true
+      },
+      {
+        "provider": "FileMemoryCap",
+        "available": true,
+        "hit": false
+      },
+      {
+        "provider": "NoOpMemoryCap",
+        "available": false,
+        "hit": false
+      }
+    ],
+    "status": "PASS"
+  },
+  "summary": {
+    "all_pass": true,
+    "active_servers": 4,
+    "total_servers": 4,
+    "total_tools": 102
+  }
+}

package/templates/qoder/scripts/domain/report/report_snapshot.py

@@ -11,6 +11,7 @@ report_snapshot.py — /wl-report 的一次性数据聚合器 (性能优化)
   3. journal/feedback     — 今天的学习/反馈事件
   4. git log --author     — 我的提交 (扫 data/code/ 各项目)
   5. drafts/ + specs/prd  — 我写的 PRD/草稿
+  6. zentao 我的任务      — 禅道真实工时(consumed), 周报"完成任务/工时"用此(可选, 不通降级)
 
 输出: JSON, 缺失的字段标 null 并注明原因。AI 拿到后直接写报告, 不用再探查。
 所有数据严格按 .developer 里的开发者名过滤 (report 的隔离铁律)。
@@ -204,6 +205,83 @@ def _journal_today(repo, author, days):
     return events[:100] if events else []
 
 
+def _f(v):
+    """安全转 float (工时聚合用), 失败返回 0。"""
+    try:
+        return float(v or 0)
+    except (TypeError, ValueError):
+        return 0.0
+
+
+def _zentao_my_tasks(repo, days):
+    """从禅道拉'我的'任务(含真实 consumed 工时), 供周报用。
+
+    周报的"完成任务/工时"应基于禅道真实数据, 而非本地 task.json 缓存
+    (本地缓存常滞后/缺工时)。禅道不通/未配置/未识别身份 → 返回 None,
+    静默降级不阻塞周报 (符合"连接器可选增强、断网不阻塞")。
+    """
+    scripts = os.path.join(repo, ".qoder", "scripts")
+    if scripts not in sys.path:
+        sys.path.insert(0, scripts)
+    try:
+        from foundation.integrations.zentao_client import ZentaoClient
+        from foundation.core.paths import get_developer
+        from foundation.identity.identity import get_member
+    except Exception:
+        return None
+    client = ZentaoClient.from_config()
+    if client is None:
+        return None
+    try:
+        ok, _ = client.check_intranet()
+        if not ok:
+            return None
+        dev = get_developer()
+        my_acc = ""
+        if dev:
+            my_acc = (get_member(dev) or {}).get("zentao_account", "")
+        if not my_acc:
+            return None
+        r = client.api("GET", "/executions", {"limit": 200})
+        if r.status_code not in (200, 201):
+            return None
+        execs = r.json().get("executions") if isinstance(r.json(), dict) else None
+        if not isinstance(execs, list):
+            return None
+        mine = []
+        for e in execs:
+            eid = e.get("id")
+            try:
+                r2 = client.api("GET", "/executions/%s/tasks" % eid, {"limit": 200})
+            except Exception:
+                continue
+            if r2.status_code not in (200, 201):
+                continue
+            tasks = r2.json().get("tasks") if isinstance(r2.json(), dict) else None
+            if not isinstance(tasks, list):
+                continue
+            for t in tasks:
+                if isinstance(t, dict) and ZentaoClient.assignee_account(t) == my_acc:
+                    mine.append({
+                        "id": t.get("id"), "name": str(t.get("name", ""))[:40],
+                        "status": t.get("status"), "consumed": t.get("consumed"),
+                        "estimate": t.get("estimate"), "left": t.get("left"),
+                        "deadline": t.get("deadline"), "execution": e.get("name", ""),
+                    })
+    except Exception:
+        return None
+    done = [x for x in mine if x.get("status") in ("done", "closed")]
+    return {
+        "my_account": my_acc,
+        "total": len(mine),
+        "done_count": len(done),
+        "consumed_hours": round(sum(_f(x.get("consumed")) for x in mine), 1),
+        "estimate_hours": round(sum(_f(x.get("estimate")) for x in mine), 1),
+        "active_items": [x for x in mine if x.get("status") not in ("done", "closed")][:30],
+        "note": "禅道真实工时(非本地缓存); 周报'完成任务/工时'用 consumed_hours",
+    }
+
+
 def snapshot(repo=None, days=None):
     """收集 wl-report 需要的全部数据, 返回 dict。"""
     repo = repo or _repo_root()
@@ -226,12 +304,13 @@ def snapshot(repo=None, days=None):
     # 2-5 四个独立数据源并行采集 (task list 最慢~440ms, 并行后总耗时≈最慢的那个)
     # task list / git log / journal / prds 互不依赖 → 用线程池同时跑, 砍掉串行等待。
     from concurrent.futures import ThreadPoolExecutor
-    with ThreadPoolExecutor(max_workers=4) as pool:
+    with ThreadPoolExecutor(max_workers=5) as pool:
         f_tasks = pool.submit(_run_script, ".qoder/scripts/domain/task/task.py", repo,
                               ["list", "--mine"])
         f_journal = pool.submit(_journal_today, repo, developer, days)
         f_commits = pool.submit(_git_log_for_author, repo, developer, days)
         f_prds = pool.submit(_list_prds_by_author, repo, developer, days)
+        f_zentao = pool.submit(_zentao_my_tasks, repo, days)
 
     task_out, task_ok = f_tasks.result()
     data["my_tasks"] = task_out if task_ok else None
@@ -239,6 +318,7 @@ def snapshot(repo=None, days=None):
     data["journal"] = f_journal.result()
     data["commits"] = f_commits.result()
     data["my_prds"] = f_prds.result()
+    data["zentao_tasks"] = f_zentao.result()  # 禅道真实工时(周报用); None=未连通/未配置
 
     # 6. 报告日期范围 (供 AI 套模板)
     today = datetime.now().strftime("%Y-%m-%d")
@@ -249,11 +329,12 @@ def snapshot(repo=None, days=None):
 
 
 def main():
-    repo = None
-    args = [a for a in sys.argv[1:] if not a.startswith("--")]
-    if args:
-        repo = args[0]
-    data = snapshot(repo)
+    import argparse
+    p = argparse.ArgumentParser(description='wl-report 数据快照 (一次性聚合全部数据源)')
+    p.add_argument('repo', nargs='?', help='仓库根路径 (默认从当前目录向上找 .qoder)')
+    p.add_argument('--days', type=int, default=1, help='回看天数 (默认1=今天/日报; 7=周报)')
+    a = p.parse_args()
+    data = snapshot(a.repo, a.days)
     print(json.dumps(data, ensure_ascii=False, indent=2, default=str))
 
 

package/templates/qoder/scripts/domain/task/team_sync.py

@@ -267,13 +267,45 @@ def _do_pull_locked(quiet, branch):
     """锁内的实际 pull 逻辑。"""
     r = git('pull', '--rebase', '--autostash', 'origin', branch, timeout=90)
     if r.returncode != 0:
+        err = (r.stderr or '') + (r.stdout or '')
         if r.returncode == 124:
             print('Pull 超时 (网络/认证问题): ' + (r.stderr or '').strip()[:150])
             print('检查 git 凭证或团队仓库连通性。继续离线工作, 下次同步自动补推。')
             return 1
-        if 'CONFLICT' in (r.stdout + r.stderr) or rebase_in_progress():
+        if 'CONFLICT' in err or rebase_in_progress():
             return report_conflict(r.stderr or r.stdout)
-        print('Pull failed (network/remote?): ' + (r.stderr or r.stdout).strip()[:200])
+        # ⚠ 常见问题: untracked working tree files would be overwritten
+        # 那台机器上有 init 生成的未跟踪文件 (.gitignore, .qoder/.engine-*),
+        # git pull --rebase 拒绝覆盖。解决: git checkout 先强制覆盖未跟踪文件。
+        if 'untracked working tree files would be overwritten' in err:
+            print('检测到未跟踪文件冲突, 尝试强制覆盖...')
+            # 提取冲突文件名
+            conflict_files = []
+            for line in err.splitlines():
+                line = line.strip()
+                if line and not line.startswith('error:') and not line.startswith('Please'):
+                    conflict_files.append(line)
+            # git checkout -- <files> 强制覆盖
+            if conflict_files:
+                git('checkout', '--', *conflict_files[:50], timeout=30)
+                # 重试 pull
+                r2 = git('pull', '--rebase', '--autostash', 'origin', branch, timeout=90)
+                if r2.returncode == 0:
+                    _auto_resolve_kg_conflict()
+                    touch_pull_marker()
+                    if not quiet:
+                        print('Pulled latest from team (强制覆盖未跟踪文件后成功)。')
+                    return 0
+                print('强制覆盖后仍失败: ' + (r2.stderr or '').strip()[:200])
+            else:
+                # 直接 git checkout -f 强制
+                git('checkout', '-f', 'origin/' + branch, timeout=60)
+                r2 = git('reset', '--hard', 'origin/' + branch, timeout=60)
+                if r2.returncode == 0:
+                    if not quiet:
+                        print('Pulled latest from team (强制重置后成功)。')
+                    return 0
+        print('Pull failed (network/remote?): ' + err.strip()[:200])
         print('继续离线工作, 产出不会丢失, 下次同步会自动补推。')
         return 1