@hupan56/wlkj 3.3.4 → 3.3.6

package/package.json

@@ -1,29 +1,29 @@
-{
-  "name": "@hupan56/wlkj",
-  "version": "3.3.4",
-  "description": "AI Product R&D Workflow - PRD/Prototype/Search/Task/Report",
-  "bin": {
-    "wlkj": "bin/cli.js"
-  },
-  "files": [
-    "bin/",
-    "templates/",
-    "MAC-VERIFY.md"
-  ],
-  "keywords": [
-    "workflow",
-    "ai",
-    "prd",
-    "pipeline",
-    "qoder",
-    "product",
-    "team"
-  ],
-  "license": "MIT",
-  "publishConfig": {
-    "access": "public"
-  },
-  "engines": {
-    "node": ">=16"
-  }
-}
+{
+  "name": "@hupan56/wlkj",
+  "version": "3.3.6",
+  "description": "AI Product R&D Workflow - PRD/Prototype/Search/Task/Report",
+  "bin": {
+    "wlkj": "bin/cli.js"
+  },
+  "files": [
+    "bin/",
+    "templates/",
+    "MAC-VERIFY.md"
+  ],
+  "keywords": [
+    "workflow",
+    "ai",
+    "prd",
+    "pipeline",
+    "qoder",
+    "product",
+    "team"
+  ],
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "engines": {
+    "node": ">=16"
+  }
+}

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

@@ -51,9 +51,118 @@ from foundation.integrations.zentao_client import ZentaoClient
 # ============================================================
 
 def _zentao_creds():
-    """构建禅道客户端。凭据不全返回 None。
-    url 来自 .qoder/config.yaml (团队共享); user/password 来自 secrets/zentao.env (个人)。"""
-    return ZentaoClient.from_config()
+    """构建禅道客户端。返回 (client, preset_account)。
+
+    凭据源优先级：
+      ① 云平台 per-user 凭据（Option A：get_zentao_creds）—— account 已知（preset）
+      ② 本地 .qoder/config.yaml + secrets/zentao.env —— account 走 member.json
+    云凭据优先：demo 机器在内网可达禅道，平台凭据比本地文件更可能是最新配的。
+    凭据全无 → (None, '')。
+    """
+    c = _cloud_zentao_creds()
+    if c and c.get('ok') and c.get('url') and c.get('account') and c.get('password'):
+        try:
+            return ZentaoClient(c['url'], c['account'], c['password']), c['account']
+        except Exception:
+            pass
+    return ZentaoClient.from_config(), ''
+
+
+def _cloud_my_panel():
+    """云优先：调平台 get_my_zentao_panel（凭据走平台 per-user 配置，不出平台）。
+
+    直连云 /mcp JSON-RPC（读 .qoder/mcp_config.json 的 token+url）。
+    Returns: {ok:True, tasks, bugs, stories, account} 或 None（云不可达/工具失败）。
+    云返 {ok:False,error}（未配置/登录失败）→ 返该 dict（调用方据此提示+回退本地）。
+    """
+    import json as _json
+    import urllib.request as _u
+    import urllib.error as _ue
+    # 定位 mcp_config.json（switch_project 写在 .qoder/）
+    cfg_candidates = []
+    try:
+        from foundation.core.paths import get_repo_root
+        cfg_candidates.append(os.path.join(str(get_repo_root()), '.qoder', 'mcp_config.json'))
+    except Exception:
+        pass
+    cfg_candidates.append(os.path.join(_SCRIPTS, '..', 'mcp_config.json'))
+    token, url = '', ''
+    for cp in cfg_candidates:
+        try:
+            with open(cp, encoding='utf-8') as f:
+                cfg = _json.load(f)
+            srv = (cfg.get('mcpServers') or {}).get('wlinkj-knowledge') or {}
+            token = srv.get('token', '')
+            url = (srv.get('url') or '').rstrip('/')
+            if token and url:
+                break
+        except Exception:
+            continue
+    if not token or not url:
+        return None  # 云未绑定（switch_project 没跑）→ 回退本地
+    endpoint = url if url.endswith('/mcp') else url + '/mcp'
+    body = _json.dumps({"jsonrpc": "2.0", "id": 1, "method": "tools/call",
+                        "params": {"name": "get_my_zentao_panel", "arguments": {}}}).encode('utf-8')
+    req = _u.Request(endpoint, data=body, method='POST')
+    req.add_header('Content-Type', 'application/json')
+    req.add_header('X-MCP-Token', token)
+    try:
+        with _u.urlopen(req, timeout=30) as resp:
+            r = _json.loads(resp.read().decode('utf-8', errors='replace'))
+    except Exception:
+        return None  # 网络不通 → 回退本地
+    try:
+        text = r.get('result', {}).get('content', [{}])[0].get('text', '')
+        data = _json.loads(text) if text else {}
+    except Exception:
+        return None
+    return data  # {ok:True/False, ...}
+
+
+def _cloud_zentao_creds():
+    """Option A：从平台取禅道凭据（url/account/password 解密）。
+
+    用途：云到禅道被防火墙挡（my-panel 登录失败）时，本机（demo 机器，内网可达）
+    用平台凭据直连禅道拉真实数据。凭据随绑定 token 取本人配置（同信任级）。
+    Returns: {ok:True, url, account, password} 或 None（云不可达/未配置）。
+    """
+    import json as _json
+    import urllib.request as _u
+    cfg_candidates = []
+    try:
+        from foundation.core.paths import get_repo_root
+        cfg_candidates.append(os.path.join(str(get_repo_root()), '.qoder', 'mcp_config.json'))
+    except Exception:
+        pass
+    cfg_candidates.append(os.path.join(_SCRIPTS, '..', 'mcp_config.json'))
+    token, url = '', ''
+    for cp in cfg_candidates:
+        try:
+            with open(cp, encoding='utf-8') as f:
+                cfg = _json.load(f)
+            srv = (cfg.get('mcpServers') or {}).get('wlinkj-knowledge') or {}
+            token = srv.get('token', '')
+            url = (srv.get('url') or '').rstrip('/')
+            if token and url:
+                break
+        except Exception:
+            continue
+    if not token or not url:
+        return None
+    endpoint = url if url.endswith('/mcp') else url + '/mcp'
+    body = _json.dumps({"jsonrpc": "2.0", "id": 1, "method": "tools/call",
+                        "params": {"name": "get_zentao_creds", "arguments": {}}}).encode('utf-8')
+    req = _u.Request(endpoint, data=body, method='POST')
+    req.add_header('Content-Type', 'application/json')
+    req.add_header('X-MCP-Token', token)
+    try:
+        with _u.urlopen(req, timeout=15) as resp:
+            r = _json.loads(resp.read().decode('utf-8', errors='replace'))
+        text = r.get('result', {}).get('content', [{}])[0].get('text', '')
+        data = _json.loads(text) if text else {}
+        return data if data.get('ok') else None
+    except Exception:
+        return None
 
 
 def _resolve_my_account(developer):
@@ -359,26 +468,72 @@ def fetch_workbench(include_closed=False, kind=None):
     """
     developer = get_developer()
 
-    # ① 凭据
-    client = _zentao_creds()
+    # ⓪ 云优先：调平台 get_my_zentao_panel（凭据走平台 per-user，不出平台）。
+    # 成功 → 直接用云数据，跳过本地凭据/连通/归属/收集（① ~ ④）。
+    # 未配置/登录失败 → 返回 {ok:False} 提示用户去平台配置，并回退本地（本地配了仍可用）。
+    # 云不可达(返回 None) → 静默回退本地全流程。
+    cloud = _cloud_my_panel()
+    if isinstance(cloud, dict):
+        # 云可达 → 云的判断权威（平台是凭据源）。
+        if cloud.get('ok'):
+            tasks = cloud.get('tasks') or []
+            bugs = cloud.get('bugs') or []
+            stories = cloud.get('stories') or []
+            # 按 kind 裁剪（与本地一致）
+            if kind == 'tasks':
+                bugs, stories = [], []
+            elif kind == 'bugs':
+                tasks, stories = [], []
+            elif kind == 'stories':
+                tasks, bugs = [], []
+            tasks, bugs, stories = _filter_live(tasks, bugs, stories, include_closed)
+            # 云路径：数据已平台聚合，归一化即可（进度检测需本地 client，云模式跳过给默认值）
+            norm_tasks = [_norm_task(t) for t in tasks]
+            norm_bugs = [_norm_bug(b) for b in bugs]
+            norm_stories = [_norm_story(s) for s in stories]
+            for it in norm_tasks + norm_bugs + norm_stories:
+                it['progress'] = {'prd': False, 'spec': 'none', 'code': False}
+            data = {'account': cloud.get('account', ''), 'developer': developer,
+                    'current_task': None, 'tasks': norm_tasks,
+                    'bugs': norm_bugs, 'stories': norm_stories}
+            meta = {'fetched_at': datetime.now().isoformat(timespec='seconds'),
+                    'source': 'cloud',
+                    'counts': {'tasks': len(norm_tasks), 'bugs': len(norm_bugs),
+                               'stories': len(norm_stories)},
+                    'include_closed': include_closed}
+            return {'ok': True, 'data': data, 'meta': meta}, 0
+        # 云可达但失败（未配置/登录失败/防火墙）→ 记下云诊断，回退本地。
+        # 回退价值：云到禅道常被防火墙挡，但本机（demo 机器，内网）可能直连可达。
+        # 本地也失败时，把云诊断一起带出（平台有凭据但云连不上 + 本地无凭据）。
+        cloud_error = cloud.get('error', '禅道不可用')
+    else:
+        cloud_error = None  # 云不可达（switch_project 没跑/平台宕机）→ 静默回退本地
+
+    # ① 凭据（云平台优先 Option A，回退本地文件）
+    client, preset_account = _zentao_creds()
     if client is None:
-        return {'ok': False,
-                'error': '禅道凭据未配置。请检查 .qoder/config.yaml 的 zentao.url, '
-                         '及 workspace/members/<我>/.private/secrets/zentao.env 的账号密码。'}, 3
+        base_msg = ('禅道凭据未配置。推荐在【平台设置 → 禅道】配置（panel 自动走云取凭据）；'
+                    '或本地 .qoder/config.yaml 的 zentao.url + secrets/zentao.env 账号密码。')
+        if cloud_error:
+            base_msg += '（云 my-panel 失败：%s）' % cloud_error
+        return {'ok': False, 'error': base_msg}, 3
 
     ok, msg = client.credentials_ok()
     if not ok:
         return {'ok': False, 'error': '禅道凭据不完整: %s' % msg}, 3
 
-    # ② 内网连通
+    # ② 内网连通（本机能否直连禅道——demo 机器在内网可达）
     ok, msg = client.check_intranet()
     if not ok:
-        return {'ok': False, 'error': '连不上禅道内网: %s' % msg}, 5
+        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
+    # ③ 归属（云凭据带的 account 优先；否则走 member.json）
+    if preset_account:
+        my_account = preset_account
+    else:
+        my_account, err = _resolve_my_account(developer) if developer else (None, '未识别当前开发者身份。')
+        if not my_account:
+            return {'ok': False, 'error': err}, 3
 
     # ④ 收集 (三域并行, 按 kind 决定取哪几域)
     from concurrent.futures import ThreadPoolExecutor