@hupan56/wlkj 3.1.30 → 3.1.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hupan56/wlkj",
-  "version": "3.1.30",
+  "version": "3.1.32",
   "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
@@ -664,6 +664,73 @@ def offer_cron(skip=False):
             print('       跳过。以后可手动跑: bash .qoder/scripts/setup_weekly_cron.sh')
 
 
+# ============================================================
+# Step 3.6: 禅道凭据配置 (每个开发者配自己的禅道账号)
+# ============================================================
+
+def offer_zentao(name):
+    """引导禅道凭据配置。
+
+    禅道 URL 团队共享(配在 config.yaml), 但用户名/密码是个人凭据,
+    存 workspace/members/{dev}/.private/secrets/zentao.env (gitignored)。
+    不配也能用 (kg/search/PRD 不依赖禅道), 但 /wl-task 禅道同步和
+    /wl-report 禅道查询需要。
+    """
+    print('\n--- 禅道凭据 (可选, 不配也能用核心功能) ---')
+
+    # 检查 config.yaml 有没有禅道 URL
+    zentao_url = ''
+    try:
+        from foundation.core.config import load_config_section, SECTIONS
+        cfg = load_config_section(SECTIONS.ZENTAO)
+        zentao_url = (cfg.get('url') or '').strip()
+    except Exception:
+        pass
+
+    if not zentao_url:
+        print('  团队未配置禅道 URL (config.yaml 无 zentao.url)。')
+        print('  管理员配: 在 config.yaml 加 zentao.url: http://你的禅道地址')
+        print('  跳过禅道配置。配好 URL 后重跑 init 即可。')
+        return
+
+    print(f'  禅道地址: {zentao_url}')
+
+    # 检查是否已配
+    try:
+        from foundation.core.paths import get_secrets_dir
+        secrets_dir = get_secrets_dir(name)
+        env_file = os.path.join(secrets_dir, 'zentao.env')
+        if os.path.isfile(env_file):
+            ok('禅道凭据已配置 (zentao.env 存在)')
+            return
+    except Exception:
+        pass
+
+    if not ask('配置禅道账号? (用于同步任务/需求/Bug)', 'n'):
+        print('  跳过。以后需要: npx @hupan56/wlkj init <名字> <角色>')
+        return
+
+    # 交互式收集禅道凭据
+    try:
+        zentao_user = input('  禅道用户名: ').strip()
+        zentao_pwd = input('  禅道密码: ').strip()
+        if not zentao_user or not zentao_pwd:
+            warn('用户名/密码为空, 跳过')
+            return
+
+        # 写入 zentao.env
+        secrets_dir = os.path.join(os.getcwd(), 'workspace', 'members', name, '.private', 'secrets')
+        os.makedirs(secrets_dir, exist_ok=True)
+        env_file = os.path.join(secrets_dir, 'zentao.env')
+        with open(env_file, 'w', encoding='utf-8') as f:
+            f.write(f'ZENTAO_USER={zentao_user}\n')
+            f.write(f'ZENTAO_PASSWORD={zentao_pwd}\n')
+        ok(f'禅道凭据已保存: {env_file}')
+        print('  (个人凭据, 已 gitignored, 不会 push 给团队)')
+    except (EOFError, KeyboardInterrupt):
+        print('  跳过')
+
+
 # ============================================================
 # Step 4.5: 蓝湖 MCP (设计师直读蓝湖设计稿)
 # ============================================================
@@ -873,6 +940,9 @@ def main():
     # Step 3.5: 团队协作仓库 remote (workspace/ 产出 push 到这里)
     configure_team_remote()
 
+    # Step 3.6: 禅道凭据配置 (每个开发者都要配自己的禅道账号)
+    offer_zentao(name)
+
     # Step 4
     offer_cron(skip=args.skip_cron)
 

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

@@ -300,6 +300,106 @@ def fetch_workbench(include_closed=False, kind=None):
     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 输出 (面板默认用这个)')
@@ -307,21 +407,41 @@ def main():
     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()
 
-    result, code = fetch_workbench(include_closed=args.include_closed, kind=args.kind)
+    # 写操作分支
+    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():
-        # 面板/管道场景: 一律 JSON (成功/失败统一结构, 扩展端好解析)
         indent = 2 if args.pretty else None
         print(json.dumps(result, ensure_ascii=False, default=str, indent=indent))
     else:
-        # 人类可读 (终端直接跑时, 兜底; 正常都用 --json)
         if result.get('ok'):
-            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']))
+            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)