@hupan56/wlkj 3.1.29 → 3.1.31

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.29",
+  "version": "3.1.31",
   "description": "AI Product R&D Workflow - PRD/Prototype/Search/Task/Report",
   "bin": {
     "wlkj": "bin/cli.js"

package/templates/qoder/scripts/deployment/setup/setup.py

@@ -352,11 +352,11 @@ def configure_git_identity(name):
         return False
 
     # 5. 交互式收集 git 账号
-    print('\n  配置你的团队 git 账号 (用于提交代码和团队协作):')
+    print('\n  配置 git 账号 (仅用于标识谁提交了代码, 不需要注册/登录):')
     while True:
         try:
             git_name = input(f'  git 用户名 [{existing_name or name}]: ').strip() or existing_name or name
-            git_email = input('  git 邮箱 (团队邮箱): ').strip()
+            git_email = input(f'  git 邮箱 (填你的邮箱即可, 不需要注册): ').strip()
             if not git_email or '@' not in git_email:
                 print('  邮箱格式不对 (需含 @), 重试。')
                 continue

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

@@ -0,0 +1,451 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+"""
+zentao_panel.py - 禅道任务面板数据接口 (供 VS Code 扩展 zentao-panel 调用)
+
+目的: 给侧边栏面板一个稳定的 JSON 数据源, 一次返回"指派给我的【任务+需求+Bug】",
+      跨所有执行/产品全量聚合。逻辑与 my_workbench 工具一致 (只读), 但输出 JSON 而非文本。
+
+为什么不直接调 MCP server:
+  MCP server 的数据收集依赖 import-time 全局变量 (CLIENT / MY_ACCOUNT), 由 mcp_launcher
+  注入环境变量才生效。本脚本走独立进程 (child_process.spawn 启动), 没有 launcher 注入,
+  所以照搬 zentao_sync.py 的稳健模式: 自己 ZentaoClient.from_config() + 自己解析归属。
+  收集循环则与 zentao_mcp_server.py:_collect_my_* 逐字一致 (DRY 同款), 保证数据口径统一。
+
+用法:
+  python .qoder/scripts/domain/task/zentao_panel.py --json              # 三域活动项 JSON
+  python .qoder/scripts/domain/task/zentao_panel.py --json --include-closed  # 含已关闭历史项
+  python .qoder/scripts/domain/task/zentao_panel.py --json --kind tasks   # 只看任务
+
+退出码 (对齐项目规范):
+  0 成功 (含空结果); 3 配置/归属错误; 5 网络不通。
+  --json 模式下错误也输出 JSON ({"ok": false, "error": "..."}), 扩展端统一解析。
+"""
+import os
+import sys
+
+# ── 路径自举 (复用 bootstrap 模式, 与 zentao_sync.py 完全一致) ──
+# 本脚本在 scripts/domain/task/ 下 (scripts 下 2 级), dirname 两次才到 scripts/。
+_HERE = os.path.dirname(os.path.abspath(__file__))
+_SCRIPTS = os.path.dirname(os.path.dirname(_HERE))   # .qoder/scripts (上两级)
+_COMMON = os.path.join(_SCRIPTS, 'foundation')
+for _p in (_SCRIPTS, _COMMON):
+    if _p not in sys.path:
+        sys.path.insert(0, _p)
+try:
+    from bootstrap import setup; setup()
+except Exception:
+    pass
+
+import json
+import argparse
+from datetime import datetime
+
+from foundation.core.paths import get_developer
+from foundation.identity.identity import get_member
+from foundation.integrations.zentao_client import ZentaoClient
+
+
+# ============================================================
+# 配置与归属解析 (照搬 zentao_sync.py, 唯一真相源)
+# ============================================================
+
+def _zentao_creds():
+    """构建禅道客户端。凭据不全返回 None。
+    url 来自 .qoder/config.yaml (团队共享); user/password 来自 secrets/zentao.env (个人)。"""
+    return ZentaoClient.from_config()
+
+
+def _resolve_my_account(developer):
+    """解析当前 developer → 禅道 account。返回 (account, 错误原因)。"""
+    mem = get_member(developer)
+    if not mem:
+        return None, '当前开发者 %s 未注册 (无 member.json)。请先跑 /wl-init。' % developer
+    acc = (mem.get('zentao_account') or '').strip()
+    if not acc:
+        return None, ('%s 的 member.json 未配 zentao_account。\n'
+                      '  编辑 workspace/members/%s/member.json 加 "zentao_account": "你的禅道账号"。'
+                      % (developer, developer))
+    return acc, None
+
+
+# ============================================================
+# 收集循环 (与 zentao_mcp_server.py:_collect_my_* 逐字一致)
+# 单独写成函数, 不依赖 self / 全局 CLIENT, 接收 client 做参数 → 可独立调用。
+# ============================================================
+
+def _paged_list(client, path, params, list_key, page_size=100, max_pages=20):
+    """分页拉全量 (循环 page+limit, 按 id 去重)。照搬 mcp server 同名方法。
+
+    Returns: (合并去重列表, 是否截断[读满 max_pages 仍未到尾])。
+    """
+    seen, all_items = set(), []
+    truncated = False
+    for _page in range(1, max_pages + 1):
+        p = dict(params or {})
+        p.update({'limit': page_size, 'page': _page})
+        r = client.api('GET', path, p)
+        if r.status_code not in (200, 201):
+            break
+        data = r.json()
+        items = data.get(list_key) if isinstance(data, dict) else None
+        if not isinstance(items, list) or not items:
+            break
+        new = 0
+        for it in items:
+            if not isinstance(it, dict):
+                continue
+            key = it.get('id', id(it))
+            if key in seen:
+                continue
+            seen.add(key)
+            all_items.append(it)
+            new += 1
+        if new == 0:
+            break
+    return all_items, truncated
+
+
+def _collect_my_tasks(client, my_account, status_filter=None):
+    """扫所有执行, 收集指派给我的任务。返回 (任务列表, None) 或 (None, 错误)。"""
+    execs, _ = _paged_list(client, '/executions', None, 'executions')
+    if execs is None:
+        return None, '查询执行列表失败, 稍后重试。'
+    all_t = []
+    for e in execs:
+        eid = e.get('id')
+        if eid is None:
+            continue
+        ename = str(e.get('name', ''))[:20]
+        tasks, _ = _paged_list(client, '/executions/%s/tasks' % eid, None, 'tasks')
+        for t in tasks:
+            if not isinstance(t, dict):
+                continue
+            if ZentaoClient.assignee_account(t) != my_account:
+                continue
+            if status_filter and t.get('status') != status_filter:
+                continue
+            t2 = dict(t)
+            t2['execution'] = eid
+            t2['execution_name'] = ename
+            all_t.append(t2)
+    return all_t, None
+
+
+def _collect_my_bugs(client, my_account):
+    """扫活跃产品, 收集我的 Bug (指派给我 OR 我提的)。"""
+    prods, _ = _paged_list(client, '/products', None, 'products')
+    mine = []
+    for p in prods:
+        pid = p.get('id')
+        bugs, _ = _paged_list(client, '/products/%s/bugs' % pid, None, 'bugs')
+        for b in bugs:
+            if not isinstance(b, dict):
+                continue
+            asg = ZentaoClient.assignee_account(b)
+            opn = ZentaoClient.openedby_account(b)
+            why = '指派给我' if asg == my_account else ('我提的' if opn == my_account else None)
+            if why:
+                b2 = dict(b)
+                b2['product_id'] = pid
+                b2['_why'] = why
+                mine.append(b2)
+    return mine, None
+
+
+def _collect_my_stories(client, my_account):
+    """扫活跃产品, 收集我的需求 (指派给我 OR 我提的)。"""
+    prods, _ = _paged_list(client, '/products', None, 'products')
+    mine = []
+    for p in prods:
+        pid = p.get('id')
+        sts, _ = _paged_list(client, '/products/%s/stories' % pid, None, 'stories')
+        for s in sts:
+            if not isinstance(s, dict):
+                continue
+            asg = ZentaoClient.assignee_account(s)
+            opn = ZentaoClient.openedby_account(s)
+            why = '指派给我' if asg == my_account else ('我提的' if opn == my_account else None)
+            if why:
+                s2 = dict(s)
+                s2['product_id'] = pid
+                s2['_why'] = why
+                mine.append(s2)
+    return mine, None
+
+
+# ============================================================
+# 归一化: 把禅道原始 dict 裁成面板需要的精简字段 (减体积 + 隐藏内部字段)
+# ============================================================
+
+def _norm_task(t):
+    return {
+        'id': t.get('id'),
+        'name': str(t.get('name', '')),
+        'status': t.get('status', ''),
+        'pri': t.get('pri'),
+        'left': t.get('left'),          # 剩余工时
+        'estimate': t.get('estimate'),
+        'consumed': t.get('consumed'),
+        'deadline': t.get('deadline'),
+        'execution': t.get('execution'),
+        'execution_name': t.get('execution_name', ''),
+    }
+
+
+def _norm_bug(b):
+    return {
+        'id': b.get('id'),
+        'title': str(b.get('title', '')),
+        'status': b.get('status', ''),
+        'severity': b.get('severity'),
+        'pri': b.get('pri'),
+        'why': b.get('_why', ''),       # 指派给我 / 我提的
+    }
+
+
+def _norm_story(s):
+    return {
+        'id': s.get('id'),
+        'title': str(s.get('title', '')),
+        'status': s.get('status', ''),
+        'pri': s.get('pri'),
+        'why': s.get('_why', ''),
+    }
+
+
+# 活动态白名单 (与 my_workbench 一致 + 修正: changed 也是活动态)。
+# 说明: 禅道 task 有 changed 状态 (需求变更/任务被改动), 旧版 LIVE_TASK 漏掉它
+#       → 用户实测"明明有个进行中的任务却看不到"。changed 不是终态, 应算活动项。
+LIVE_TASK = {'wait', 'doing', 'pause', 'changed'}
+LIVE_BUG = {'active'}
+LIVE_STORY = {'active', 'reviewing', 'changing'}
+
+
+def _filter_live(tasks, bugs, stories, include_closed):
+    """过滤终态 (除非 include_closed)。"""
+    if include_closed:
+        return tasks, bugs, stories
+    return ([t for t in tasks if t.get('status') in LIVE_TASK],
+            [b for b in bugs if b.get('status') in LIVE_BUG],
+            [s for s in stories if s.get('status') in LIVE_STORY])
+
+
+# ============================================================
+# 主流程
+# ============================================================
+
+def fetch_workbench(include_closed=False, kind=None):
+    """收集三域并归一化。返回 (result_dict, exit_code)。
+
+    Args:
+        include_closed: True=含已关闭历史项
+        kind: 'tasks'/'bugs'/'stories' 只取一域; None=全取
+    Returns:
+        ({"ok": True, "data": {...}, "meta": {...}}, 0) 或
+        ({"ok": False, "error": "..."}, 3 或 5)
+    """
+    developer = get_developer()
+
+    # ① 凭据
+    client = _zentao_creds()
+    if client is None:
+        return {'ok': False,
+                'error': '禅道凭据未配置。请检查 .qoder/config.yaml 的 zentao.url, '
+                         '及 workspace/members/<我>/.private/secrets/zentao.env 的账号密码。'}, 3
+
+    ok, msg = client.credentials_ok()
+    if not ok:
+        return {'ok': False, 'error': '禅道凭据不完整: %s' % msg}, 3
+
+    # ② 内网连通
+    ok, msg = client.check_intranet()
+    if not ok:
+        return {'ok': False, 'error': '连不上禅道内网: %s' % msg}, 5
+
+    # ③ 归属
+    my_account, err = _resolve_my_account(developer) if developer else (None, '未识别当前开发者身份。')
+    if not my_account:
+        return {'ok': False, 'error': err}, 3
+
+    # ④ 收集 (按 kind 决定取哪几域)
+    tasks, bugs, stories = [], [], []
+    if kind in (None, 'tasks'):
+        tasks, e = _collect_my_tasks(client, my_account)
+        if e:
+            return {'ok': False, 'error': e}, 5
+    if kind in (None, 'bugs'):
+        bugs, _ = _collect_my_bugs(client, my_account)
+    if kind in (None, 'stories'):
+        stories, _ = _collect_my_stories(client, my_account)
+
+    # ⑤ 过滤 + 归一
+    tasks, bugs, stories = _filter_live(tasks, bugs, stories, include_closed)
+    data = {
+        'account': my_account,
+        'developer': developer,
+        'tasks': [_norm_task(t) for t in tasks],
+        'bugs': [_norm_bug(b) for b in bugs],
+        'stories': [_norm_story(s) for s in stories],
+    }
+    meta = {
+        'fetched_at': datetime.now().isoformat(timespec='seconds'),
+        'counts': {
+            'tasks': len(data['tasks']),
+            'bugs': len(data['bugs']),
+            'stories': len(data['stories']),
+        },
+        'include_closed': include_closed,
+    }
+    return {'ok': True, 'data': data, 'meta': meta}, 0
+
+
+# ============================================================
+# 写操作 (v0.3): 面板按钮触发的禅道状态流转
+# 设计对齐 MCP server 的 _assert_owner: 写前校验归属, 防误改队友。
+# 任务: start/pause/finish/log_effort; Bug: confirm/resolve
+# ============================================================
+
+def _check_owner(client, my_account, kind, item_id):
+    """写前归属校验 (对齐 mcp server _assert_owner)。
+    task 只认 assignedTo==我; bug 认 assignedTo==我 OR openedBy==我。
+    返回 None=放行, 字符串=拒绝原因。"""
+    r = client.api('GET', '/%ss/%s' % (kind, item_id))
+    if r.status_code not in (200, 201):
+        return None  # 查询失败不阻塞 (禅道权限兜底)
+    data = r.json()
+    asg = ZentaoClient.assignee_account(data)
+    allow = (asg == my_account)
+    if kind == 'bug' and not allow:
+        allow = (ZentaoClient.openedby_account(data) == my_account)
+    if not allow:
+        return '这条%s指派给 %s, 不是你(%s), 已拒绝改。' % (kind, asg or '空', my_account)
+    return None
+
+
+# 禅道写操作的 HTTP 调度表: action -> (method, path_tpl, payload_builder, ok_msg)
+# payload_builder(args_dict) -> payload_dict
+def _do_action(client, my_account, action, item_id, params):
+    """执行单个写操作。返回 (result_dict, exit_code)。"""
+    developer = get_developer()
+    my_account = my_account or (_resolve_my_account(developer)[0] if developer else None)
+    if not my_account:
+        return {'ok': False, 'error': '未识别禅道身份, 无法校验归属。请配 member.json 的 zentao_account。'}, 3
+
+    # action 分派
+    ACTIONS = {
+        # 任务类 (kind=task)
+        'start_task':      ('task', 'POST', '/tasks/%s/start',  {'left': 'left'}),
+        'pause_task':      ('task', 'POST', '/tasks/%s/pause',  {}),
+        'finish_task':     ('task', 'POST', '/tasks/%s/finish', {'left': 'left', 'consumed': 'consumed'}),
+        'log_effort':      ('task', 'POST', '/tasks/%s/estimate', {'consumed': 'consumed', 'left': 'left'}),
+        # Bug 类 (kind=bug)
+        'confirm_bug':     ('bug',  'POST', '/bugs/%s/confirm', {}),
+        'resolve_bug':     ('bug',  'POST', '/bugs/%s/resolve', {'resolution': 'resolution', 'comment': 'comment'}),
+    }
+    if action not in ACTIONS:
+        return {'ok': False, 'error': '未知操作: %s。支持: %s' % (action, ', '.join(ACTIONS.keys()))}, 3
+
+    kind, method, path_tpl, fields = ACTIONS[action]
+    path = path_tpl % item_id
+
+    # ① 归属校验 (防误改队友)
+    guard = _check_owner(client, my_account, kind, item_id)
+    if guard:
+        return {'ok': False, 'error': guard}, 4
+
+    # ② 拼 payload (只取该操作关心的字段, 缺省给合理默认)
+    payload = {}
+    for pkey, fkey in fields.items():
+        v = params.get(fkey)
+        if v is not None and v != '':
+            try:
+                payload[pkey] = float(v) if fkey in ('left', 'consumed') else v
+            except (ValueError, TypeError):
+                payload[pkey] = v
+    # finish 强制 left=0 (完成=没剩余工时); log_effort 的 consumed 必填兜底
+    if action == 'finish_task' and 'left' not in payload:
+        payload['left'] = 0
+    if action == 'resolve_bug' and 'resolution' not in payload:
+        payload['resolution'] = 'fixed'
+
+    # ③ 调禅道
+    r = client.api(method, path, payload)
+    if r.status_code in (200, 201):
+        label = {
+            'start_task': '已开始', 'pause_task': '已暂停', 'finish_task': '已完成',
+            'log_effort': '已记工时', 'confirm_bug': '已确认', 'resolve_bug': '已解决',
+        }[action]
+        return {'ok': True, 'data': {'action': action, 'id': item_id, 'message': '%s #%s %s' % (kind, item_id, label)}}, 0
+    return {'ok': False, 'error': '操作失败 (HTTP %s): %s。可能权限不足或当前状态不允许。' % (
+        r.status_code, ZentaoClient.err_text(r))}, 5
+
+
+def perform_action(action, item_id, params=None):
+    """写操作入口。返回 (result_dict, exit_code)。"""
+    params = params or {}
+    client = _zentao_creds()
+    if client is None:
+        return {'ok': False, 'error': '禅道凭据未配置。'}, 3
+    ok, msg = client.credentials_ok()
+    if not ok:
+        return {'ok': False, 'error': '禅道凭据不完整: %s' % msg}, 3
+    ok, msg = client.check_intranet()
+    if not ok:
+        return {'ok': False, 'error': '连不上禅道内网: %s' % msg}, 5
+    developer = get_developer()
+    my_account, err = _resolve_my_account(developer) if developer else (None, '未识别开发者身份')
+    if err and not my_account:
+        return {'ok': False, 'error': err}, 3
+    return _do_action(client, my_account, action, item_id, params)
+
+
+def main():
+    parser = argparse.ArgumentParser(description='禅道任务面板数据接口 (输出 JSON 供 VS Code 扩展消费)')
+    parser.add_argument('--json', action='store_true', help='JSON 输出 (面板默认用这个)')
+    parser.add_argument('--include-closed', action='store_true', help='包含已关闭/取消的历史项 (默认只看活动项)')
+    parser.add_argument('--kind', choices=['tasks', 'bugs', 'stories'],
+                        help='只取某一域 (默认三域全取)')
+    parser.add_argument('--pretty', action='store_true', help='JSON 美化缩进 (默认紧凑, 面板解析更快)')
+    # 写操作子命令 (v0.3)
+    parser.add_argument('--action', choices=['start_task', 'pause_task', 'finish_task',
+                        'log_effort', 'confirm_bug', 'resolve_bug'],
+                        help='执行禅道写操作 (面板按钮触发)')
+    parser.add_argument('--id', type=int, help='写操作的目标 task/bug ID')
+    parser.add_argument('--left', help='剩余工时 (start/finish/log_effort)')
+    parser.add_argument('--consumed', help='消耗工时 (finish/log_effort)')
+    parser.add_argument('--resolution', help='Bug 解决方式 (resolve_bug): fixed/bydesign/duplicate/notrepro/postpone')
+    parser.add_argument('--comment', help='Bug 解决备注 (resolve_bug)')
+    args = parser.parse_args()
+
+    # 写操作分支
+    if args.action:
+        if not args.id:
+            result = {'ok': False, 'error': '写操作必须提供 --id'}
+            code = 3
+        else:
+            params = {'left': args.left, 'consumed': args.consumed,
+                      'resolution': args.resolution, 'comment': args.comment}
+            result, code = perform_action(args.action, args.id, params)
+    else:
+        result, code = fetch_workbench(include_closed=args.include_closed, kind=args.kind)
+
+    if args.json or not sys.stdout.isatty():
+        indent = 2 if args.pretty else None
+        print(json.dumps(result, ensure_ascii=False, default=str, indent=indent))
+    else:
+        if result.get('ok'):
+            if args.action:
+                print('✅ %s' % result['data'].get('message', '操作成功'))
+            else:
+                d, m = result['data'], result['meta']
+                print('📋 %s 的禅道工作台 — 任务 %d · 需求 %d · Bug %d (更新于 %s)' % (
+                    d['account'], m['counts']['tasks'], m['counts']['stories'], m['counts']['bugs'],
+                    m['fetched_at']))
+        else:
+            print('❌ %s' % result.get('error', '未知错误'))
+    sys.exit(code)
+
+
+if __name__ == '__main__':
+    main()