codebee 0.1.15 → 0.1.17

package/app/core/zentao.py

@@ -222,10 +222,13 @@ def load(force=False):
         except Exception:
             data = {}
         cfg = data.get("config") if isinstance(data, dict) else None
+        # 老扁平配置先迁移成产品档案（老键 products/workdir/... 不在新 defaults 里，
+        # 必须在按 _CFG_DEFAULTS 过滤之前完成迁移）
+        if isinstance(cfg, dict) and not cfg.get("product_profiles"):
+            cfg = _migrate_legacy(dict(cfg))
         merged = dict(_CFG_DEFAULTS)
         if isinstance(cfg, dict):
             merged.update({k: v for k, v in cfg.items() if k in _CFG_DEFAULTS})
-        merged = _migrate_legacy(merged)
         claims = data.get("claims") if isinstance(data, dict) else None
         _STATE["config"] = merged
         _STATE["claims"] = {str(k): _normalize_claim(v)
@@ -651,24 +654,21 @@ def _diffstat(workdir, task_id):
 
 def _fix_summary(claim, run, profile, side):
     """我方某一端的修复摘要（转派评论与 resolve 报告共用的事实部分）。"""
-    task = store.get_task((claim.get("tasks") or [{}])[0].get("task_id") if not side
-                          else _task_of(claim, side).get("task_id"))
     lines = []
     git = (run or {}).get("git") or {}
     commit = str(git.get("commit") or "").strip()
     from_branch = str(git.get("from_branch") or "").strip()
-    tid = (_task_of(claim, side).get("task_id") if side else "") or ""
+    tid = _task_of(claim, side).get("task_id") or ""
     if commit:
-        lines.append("%s修复提交 %s%s" % ("【%s】" % SIDE_CN[side] if side else "",
-                                         commit,
-                                         "（已合并回 %s）" % from_branch if from_branch else ""))
-    stat = _diffstat(_repo_of(profile, side).get("workdir") if profile else "", tid)
+        lines.append("【%s】修复提交 %s%s" % (SIDE_CN.get(side, side), commit,
+                     "（已合并回 %s）" % from_branch if from_branch else ""))
+    stat = _diffstat(str(_repo_of(profile, side).get("workdir") or ""), tid)
     if stat:
-        lines.append("改动统计：%s" % stat)
+        lines.append("【%s】改动统计：%s" % (SIDE_CN.get(side, side), stat))
     v = (run or {}).get("verdict") or {}
     if v:
-        lines.append("验证结论：%s" % ("通过（评审达标）" if v.get("pass") or v.get("publishable")
-                                       else "完成"))
+        lines.append("【%s】验证结论：%s" % (SIDE_CN.get(side, side),
+                     "通过（评审达标）" if v.get("pass") or v.get("publishable") else "完成"))
     return lines
 
 
@@ -679,15 +679,16 @@ def _task_of(claim, side):
     return {}
 
 
-def _report_text(claim, run, profile, cfg):
-    """resolve 评论：确定性事实。"""
+def _report_text(claim, runs, profile, cfg):
+    """resolve 评论：确定性事实（逐端汇总）。"""
     tri = claim.get("triage") or {}
     lines = ["【CodeBee 自动修复报告】",
              "Bug：#%s %s" % (claim.get("bug_id"), claim.get("title") or "")]
     if tri.get("side"):
-        lines.append("排查结论：%s问题（%s）" % (SIDE_CN.get(tri["side"], tri["side"]),
+        lines.append("排查结论：%s问题（%s）" % (tri.get("side"),
                                                tri.get("reason") or tri.get("by") or "按规则"))
-    lines.extend(_fix_summary(claim, run, profile, None))
+    for t in claim.get("tasks") or []:
+        lines.extend(_fix_summary(claim, runs.get(t.get("run_id")), profile, t.get("side")))
     lines.append("（本条由 CodeBee 禅道集成自动回写）")
     return "\n".join(lines)
 
@@ -851,7 +852,7 @@ def _finish_ok(claim, cfg):
         _set_claim(bid, state="done_manual",
                    note="修复完成；auto_resolve 已关，请人工确认后到禅道解决 bug")
         return
-    report = _report_text(claim, runs.get(tasks[0].get("run_id")), profile, cfg)
+    report = _report_text(claim, runs, profile, cfg)
     opened = _bug_opened_by(cfg, bid)
     try:
         _ensure_resolved(cfg, bid, report, opened)
@@ -933,8 +934,9 @@ def _sides_to_fix(profile, tri):
     return [s for s in verdict_sides if s in (profile.get("our_sides") or [])]
 
 
-def _route_one(bug, profile, cfg, seen):
-    """认领一个 bug：排查 → 分流（建任务/转派/留人工）。返回动作文案或 None。"""
+def _route_one(bug, profile, cfg, notify=True):
+    """认领一个 bug：排查 → 分流（建任务/转派/留人工）。notify=False 用于
+    need_manual 存量的重排查（仍无解时不重复群通知）。返回动作文案或 None。"""
     bid = str(bug.get("id") or "")
     tri = _triage(bug, profile, cfg)
     base_claim = {
@@ -951,8 +953,9 @@ def _route_one(bug, profile, cfg, seen):
         with _LOCK:
             _STATE["claims"][bid] = base_claim
             _save_locked()
-        _notify("🐛❓ 禅道 Bug #%s 排查不出归属端（%s），留人工\n%s"
-                % (bid, tri.get("reason") or "", bug.get("title") or ""))
+        if notify:
+            _notify("🐛❓ 禅道 Bug #%s 排查不出归属端（%s），留人工\n%s"
+                    % (bid, tri.get("reason") or "", bug.get("title") or ""))
         return "need_manual"
 
     if tri["side"] == "not_ours":
@@ -1070,14 +1073,14 @@ def _scan(cfg):
             bid = str(bug.get("id") or "")
             if not bid or bid in seen or not _claimable(bug, profile):
                 continue
-            _route_one(bug, profile, cfg, seen)
+            _route_one(bug, profile, cfg)
             claimed += 1
         # need_manual 重排查（bug 仍激活才出现在列表里）
         for bid in retry_ids:
             with _LOCK:
                 if _STATE["claims"].get(bid, {}).get("state") != "need_manual":
                     continue
-            _route_one(by_id[bid], profile, cfg, set())
+            _route_one(by_id[bid], profile, cfg, notify=False)
     return claimed
 
 
@@ -1184,10 +1187,7 @@ def _norm_profile(p, idx):
         repos[side] = {"workdir": wd,
                        "git_rev": str(r.get("git_rev") or "").strip(),
                        "verify_command": str(r.get("verify_command") or "").strip()}
-        # 我方端必须配仓库（our_sides 可为空=纯路由；但配了端没配目录到扫描时才暴露，
-        # 这里只拦「配置了 our_sides 却两个仓库目录都没有」的明显失误）
-    if our and not any(repos[s]["workdir"] for s in our):
-        raise ValueError("产品 %d：我方端已勾选但没有配置任何仓库工作目录" % pid)
+    # 工作目录留空合法：扫描时回落「默认保存路径」（_launch_fix 同口径），不在此拦截
     prof["repos"] = repos
     hints = {}
     raw_hints = p.get("repo_hints") if isinstance(p.get("repo_hints"), dict) else {}

package/app/main.py

@@ -304,6 +304,17 @@ class Handler(BaseHTTPRequestHandler):
                     return self._send(200, "（报告尚未生成）", "text/markdown; charset=utf-8")
                 return self._send(200, p.read_text(encoding="utf-8", errors="replace"),
                                   "text/markdown; charset=utf-8")
+            m = re.match(r"^/api/runs/([^/]+)/cover$", path)
+            if m:
+                # 封面图在运行目录而非任务工作目录，「成果」扫描够不着它，
+                # 前端封面卡内嵌缩略图走这条专用通道（文件名固定无穿越面）
+                run = store.get_run(m.group(1))
+                if not run:
+                    return self._json(404, {"error": "not found"})
+                p = paths.RUNS_DIR / m.group(1) / "cover.png"
+                if not p.is_file():
+                    return self._json(404, {"error": "封面尚未生成"})
+                return self._send(200, p.read_bytes(), "image/png")
             m = re.match(r"^/api/runs/([^/]+)/share$", path)
             if m:
                 from core import share_page
@@ -738,6 +749,10 @@ class Handler(BaseHTTPRequestHandler):
         if path == "/api/models/refresh":
             from core import modelhub
             n, err = modelhub.refresh_models(self._body().get("id") or "")
+            if modelhub.is_no_list_note(err):
+                # 网关无 /models 列表接口（zcode-plan 等）：预期情况按成功回报，
+                # 前端给中性提示而非红色「获取失败」
+                return self._json(200, {"ok": True, "count": 0, "note": err})
             return self._json(200, {"ok": bool(n), "count": n, "message": err})
         if path == "/api/models/add":
             # 手工添加模型：厂商列表接口调不通时直接填模型名进列表
@@ -988,6 +1003,11 @@ class Handler(BaseHTTPRequestHandler):
             from core import zentao
             res = zentao.scan_now()      # 网络操作同步做（ThreadingHTTPServer 不堵别的请求）
             return self._json(200, dict(res, ok=bool(res.get("ok"))))
+        if path == "/api/zentao/modules":
+            from core import zentao
+            pid = (self._body() or {}).get("product")
+            res = zentao.fetch_modules(pid)
+            return self._json(200, dict(res, ok=bool(res.get("ok"))))
         # 外部目录路由必须在通配的 market/<id>/(install|remove) 之前——
         # 否则 "remote" 会被当成包名吞掉
         if path == "/api/market/remote/refresh":