codebee 0.1.66 → 0.1.67

package/app/core/volumes.py

@@ -353,3 +353,37 @@ def merge_titles(plan, named):
                 e["arc"] = arc[:400]
         out.append(e)
     return out
+
+
+def norm_volumes(raw, per, start, n, plan=None):
+    """收大纲 JSON 里模型给的卷名/卷弧光，只留本批章号真正覆盖到的卷
+    （模型可能多写、乱写卷号，一律按卷规划表过滤；卷边界不采信模型）。
+
+    raw 形如 {"1": {"title","arc"}} 或 {"1": "卷名"}（键为卷号字符串）。
+    卷边界优先用调用方现成的 plan（显式卷表时与主链推导完全一致），
+    缺省按 per 等长推导。返回 {卷号str: {"title":..., "arc":...}}；
+    raw 不合规或本批卷号一个都没命中返回 None（调用方用既有卷名兜底）。"""
+    if not isinstance(raw, dict):
+        return None
+    s, cnt = _to_int(start), _to_int(n)
+    if s is None or cnt is None or cnt <= 0:
+        return None
+    if plan is None:
+        plan = build_plan(None, per, upto=s + cnt - 1)
+    hits = {e["vol"] for e in plan_volumes(plan, s, cnt)}
+    if not hits:
+        return None
+    out = {}
+    for key, item in raw.items():
+        vol = _to_int(str(key).strip())
+        if vol is None or vol not in hits:
+            continue
+        if isinstance(item, str):
+            item = {"title": item}
+        if not isinstance(item, dict):
+            continue
+        title = str(item.get("title") or "").strip()[:MAX_TITLE]
+        arc = str(item.get("arc") or "").strip()[:400]
+        if title or arc:
+            out[str(vol)] = {"title": title, "arc": arc}
+    return out or None

package/app/core/zentao.py

@@ -67,7 +67,7 @@ import urllib.request
 from datetime import datetime, timedelta
 from pathlib import Path
 
-from . import jobs, paths, settings, store, tlsctx
+from . import jobs, operations, paths, settings, store, tlsctx
 
 log = logging.getLogger(__name__)
 
@@ -1710,7 +1710,16 @@ def _ensure_resolved(cfg, bug_id, comment, assign_to):
     body = {"resolution": "fixed", "resolvedBuild": "trunk", "comment": comment}
     if assign_to:
         body["assignedTo"] = assign_to
-    _call("POST", "/bugs/%s/resolve" % bug_id, cfg=cfg, body=body)
+    operation_id = operations.begin("zentao:bug:%s:resolve" % bug_id, body,
+                                    metadata={"bug_id": bug_id, "action": "resolve"})
+    try:
+        result = _call("POST", "/bugs/%s/resolve" % bug_id, cfg=cfg, body=body)
+        receipt = str((result or {}).get("id") or bug_id)
+        operations.confirm(operation_id, remote_receipt=receipt,
+                           metadata={"bug_id": bug_id, "action": "resolve"})
+    except Exception as exc:
+        operations.finish_exception(operation_id, exc)
+        raise
     return True
 
 
@@ -1727,7 +1736,16 @@ def _transfer(cfg, bug_id, target, comment):
     else:
         cur = _call("GET", "/bugs/%s" % bug_id, cfg=cfg)
         body["assignedTo"] = _acct(cur.get("assignedTo")) or ""
-    _call("PUT", "/bugs/%s" % bug_id, cfg=cfg, body=body)
+    operation_id = operations.begin("zentao:bug:%s:transfer" % bug_id, body,
+                                    metadata={"bug_id": bug_id, "action": "transfer"})
+    try:
+        result = _call("PUT", "/bugs/%s" % bug_id, cfg=cfg, body=body)
+        receipt = str((result or {}).get("id") or bug_id)
+        operations.confirm(operation_id, remote_receipt=receipt,
+                           metadata={"bug_id": bug_id, "action": "transfer"})
+    except Exception as exc:
+        operations.finish_exception(operation_id, exc)
+        raise
 
 
 def _notify(text):

package/app/main.py

@@ -288,6 +288,21 @@ class Handler(BaseHTTPRequestHandler):
                 return self._json(200, {"ok": True, "catalog": manager.catalog_view()})
             if path == "/api/runs":
                 return self._json(200, {"runs": store.list_runs()})
+            if path == "/api/operations":
+                from core import operations
+                q = parse_qs(urlparse(self.path).query)
+                try:
+                    limit = max(1, min(1000, int((q.get("limit") or [100])[0])))
+                except (TypeError, ValueError):
+                    limit = 100
+                return self._json(200, {"operations": operations.recent(
+                    target=(q.get("target") or [""])[0][:160],
+                    status=(q.get("status") or [""])[0][:20], limit=limit)})
+            m = re.match(r"^/api/operations/([^/]+)$", path)
+            if m:
+                from core import operations
+                item = operations.get(m.group(1))
+                return self._json(200, {"operation": item}) if item else self._json(404, {"error": "not found"})
             if path == "/api/pet_state":
                 return self._api_pet_state()
             if path == "/api/usage":
@@ -420,6 +435,11 @@ class Handler(BaseHTTPRequestHandler):
                     files = []
                 return self._json(200, {"workdir": wd, "files": files,
                                         "task_id": run.get("task_id") or ""})
+            m = re.match(r"^/api/runs/([^/]+)/assets$", path)
+            if m:
+                if not store.get_run(m.group(1)):
+                    return self._json(404, {"error": "not found"})
+                return self._json(200, {"assets": store.run_asset_refs(m.group(1))})
             m = re.match(r"^/api/runs/([^/]+)/preview$", path)
             if m:
                 # 网页成品预览：入口 HTML + 同目录代码文件（前端渲染「预览」页签）
@@ -587,7 +607,8 @@ class Handler(BaseHTTPRequestHandler):
                     offset=(q.get("offset") or ["0"])[0],
                     limit=(q.get("limit") or [""])[0],
                     source=(q.get("source") or [""])[0],
-                    q=(q.get("q") or [""])[0]))
+                    q=(q.get("q") or [""])[0],
+                    installed=(q.get("installed") or [""])[0]))
             return self._json(404, {"error": "unknown api"})
         # 静态文件：单文件或 UI 子目录文件（如 icons/icon-192.png）；
         # _static 内的 parents 校验确保解析后仍在 UI_DIR 内，防穿越
@@ -688,6 +709,20 @@ class Handler(BaseHTTPRequestHandler):
             return self._api_dir_save()
         if path == "/api/pick_folder":
             return self._api_pick_folder()
+        m = re.match(r"^/api/operations/([^/]+)/reconcile$", path)
+        if m:
+            from core import operations
+            body = self._body() or {}
+            status = str(body.get("status") or "").strip().lower()
+            if status not in ("confirmed", "failed", "unknown"):
+                return self._json(400, {"error": "status 必须是 confirmed、failed 或 unknown"})
+            ok = operations.reconcile(m.group(1), status,
+                                      remote_receipt=body.get("remote_receipt") or "",
+                                      error=body.get("error") or "",
+                                      metadata=body.get("metadata"))
+            if not ok:
+                return self._json(404, {"error": "操作不存在或状态无效"})
+            return self._json(200, {"ok": True, "operation": operations.get(m.group(1))})
         m = re.match(r"^/api/tasks/([^/]+)/(archive|delete|retry|rename|continue|params)$", path)
         if m:
             if m.group(2) == "archive":
@@ -744,8 +779,13 @@ class Handler(BaseHTTPRequestHandler):
             elif m.group(2) == "rename":
                 ok, err = store.rename_task(m.group(1), self._body().get("title"))
             elif m.group(2) == "params":
-                # 对话条三件套（mode/thinking/direct 模型）随发随改：只许空闲态改
+                # 对话条三件套（mode/thinking/direct 模型）随发随改：只许空闲态改。
+                # 成功回传最新修订号（expected_rev CAS 的续用凭据，前端连推三件
+                # 时靠它避免后两次推成过期写入）
                 ok, err = store.update_task_params(m.group(1), self._body())
+                if ok:
+                    _t = store.get_task(m.group(1)) or {}
+                    return self._json(200, {"ok": True, "rev": _t.get("rev")})
             else:
                 ok, err = store.delete_task(m.group(1))
             return self._json(400, {"error": err}) if not ok else self._json(200, {"ok": True})
@@ -987,6 +1027,15 @@ class Handler(BaseHTTPRequestHandler):
             from core import skills
             n = skills.learn_from_run((self._body().get("run_id") or ""))
             return self._json(200, {"ok": True, "learned": n})
+        if path == "/api/skills/evolve":
+            # 教训晋升草稿（ECC /evolve 借鉴）：高可信教训聚合成用户包草稿，
+            # 默认停用待人工审阅；返回收录概况
+            from core import skills
+            fname, n = skills.evolve_lessons()
+            if not fname:
+                return self._json(200, {"ok": True, "file": None, "count": 0,
+                                        "note": "no eligible lessons"})
+            return self._json(200, {"ok": True, "file": fname, "count": n})
         if path == "/api/knowledge/op":
             from core import knowledge
             body = self._body()
@@ -1279,9 +1328,15 @@ class Handler(BaseHTTPRequestHandler):
         # 否则 "remote" 会被当成包名吞掉
         if path == "/api/market/remote/refresh":
             return self._json(200, market_remote.refresh((self._body() or {}).get("source")))
+        if path == "/api/market/remote/preview":
+            # 安装前预览（先看后装）：下载+剥离检查但不落盘，带 token 两阶段安装
+            res, err = market_remote.preview_remote((self._body() or {}).get("id") or "")
+            return self._json(400, {"error": err}) if err else self._json(200, res)
         m = re.match(r"^/api/market/remote/install$", path)
         if m:
-            res, err = market_remote.install_remote((self._body() or {}).get("id") or "")
+            body = self._body() or {}
+            res, err = market_remote.install_remote(body.get("id") or "",
+                                                     body.get("token") or "")
             return self._json(400, {"error": err}) if err else self._json(200, res)
         m = re.match(r"^/api/market/([^/]+)/(install|remove)$", path)
         if m:
@@ -1333,19 +1388,61 @@ class Handler(BaseHTTPRequestHandler):
         if not task:
             return self._json(404, {"error": "任务不存在"})
         if op == "git-merge":
-            ok, err, info = gitmod.merge_task_branch(task.get("workdir"), task)
-            if not ok:
-                return self._json(400, {"error": err})
-            store.set_task_git_state(task_id, "merged")
-            return self._json(200, {"ok": True, **(info or {})})
+            from core import operations
+            operation_id = operations.begin(
+                "git:%s:merge" % task_id,
+                {"task_id": task_id, "branch": task.get("git_branch") or ""},
+                task_id=task_id, metadata={"action": "merge"})
+            remote_applied = False
+            try:
+                ok, err, info = gitmod.merge_task_branch(task.get("workdir"), task)
+                if not ok:
+                    operations.fail(operation_id, err, metadata={"action": "merge"})
+                    return self._json(400, {"error": err})
+                remote_applied = True
+                store.set_task_git_state(task_id, "merged")
+                operations.confirm(operation_id, remote_receipt=(info or {}).get("commit") or "",
+                                   metadata={"action": "merge"})
+                return self._json(200, {"ok": True, "operation_id": operation_id,
+                                        **(info or {})})
+            except Exception as exc:
+                # The remote merge may have happened before local state
+                # persistence failed; keep the operation auditable and
+                # prevent a blind retry from duplicating the merge.
+                if remote_applied:
+                    operations.mark_unknown(operation_id,
+                                            "Git 合并可能已完成，但本地状态回写失败：%s" % exc,
+                                            metadata={"action": "merge"})
+                else:
+                    operations.finish_exception(operation_id, exc)
+                return self._json(500, {"error": "Git 合并收口失败：%s" % exc,
+                                        "operation_id": operation_id})
         body = self._body()
         if not body.get("confirm"):
             return self._json(400, {"error": "丢弃任务分支不可恢复，需要 confirm=true 二次确认"})
-        ok, err = gitmod.discard_task_branch(task.get("workdir"), task)
-        if not ok:
-            return self._json(400, {"error": err})
-        store.set_task_git_state(task_id, "discarded")
-        return self._json(200, {"ok": True})
+        from core import operations
+        operation_id = operations.begin(
+            "git:%s:discard" % task_id, {"task_id": task_id}, task_id=task_id,
+            metadata={"action": "discard"})
+        remote_applied = False
+        try:
+            ok, err = gitmod.discard_task_branch(task.get("workdir"), task)
+            if not ok:
+                operations.fail(operation_id, err, metadata={"action": "discard"})
+                return self._json(400, {"error": err})
+            remote_applied = True
+            store.set_task_git_state(task_id, "discarded")
+            operations.confirm(operation_id, metadata={"action": "discard"})
+            return self._json(200, {"ok": True, "operation_id": operation_id})
+        except Exception as exc:
+            if remote_applied:
+                operations.mark_unknown(operation_id,
+                                        "Git 丢弃可能已完成，但本地状态回写失败：%s" % exc,
+                                        metadata={"action": "discard"})
+            else:
+                operations.finish_exception(operation_id, exc)
+            return self._json(500, {"error": "Git 丢弃收口失败：%s" % exc,
+                                    "operation_id": operation_id})
 
     def _api_book_meta_generate(self, task_id):
         """作品信息一键生成（POST /api/tasks/<id>/book-meta，body: {platform}）。
@@ -1967,21 +2064,36 @@ class Handler(BaseHTTPRequestHandler):
             msgs = r.get("messages") or []
             steps = r.get("steps") or []
             # 消息没有日期（只有 HH:MM:SS），跨 run 不能按时间混排；用语义顺序：
-            # 已消费消息（驱动了本轮回答）→ 已完成步骤 → 未消费消息（run 结束后
-            # 才追话到达的）→ 运行中/排队步骤（打字动画）。追问因此总在上一轮
-            # 回答之后、本轮打字动画之前。
+            # 已消费消息（驱动了本轮回答）→ 已完成步骤 → 运行中/排队步骤 →
+            # 未消费消息。运行中的回复卡锚在开跑位置，中途追话（指挥信箱，还没
+            # 轮到消费）是比卡更新的排队件，必须落在卡下——否则 21:31 开跑的卡
+            # 排在 21:42/21:43 的追问后面，被读成「回复串到了别人的问题」，且步骤
+            # 收尾时消息会整组跳位（2026-09-24 用户实测）。
+            # 排队卡（还没开跑、无 started_at）反向兼容：拿 run 创建时刻当锚点，
+            # 早于锚点的未消费消息（触发本轮排队的那条）仍排在卡前，开跑消费后
+            # 位置不动、时间线不跳变；晚于锚点的才是中途追话，沉底等下一轮。
+            pending = [m for m in msgs if not m.get("consumed")]
             for m in msgs:
                 if m.get("consumed"):
                     _emit_msg(m)
             for s in steps:
                 if (s.get("status") or "") == "done":
                     _emit_step(s, r.get("id") or run_id)
-            for m in msgs:
-                if not m.get("consumed"):
+            live_steps = [s for s in steps if (s.get("status") or "") != "done"]
+            if not live_steps:
+                for m in pending:
+                    _emit_msg(m)
+                continue
+            rc = str(r.get("created_at") or "")
+            anchor = (live_steps[0].get("started_at") or "") or (rc[11:19] if len(rc) >= 19 else "")
+            for m in pending:
+                if str(m.get("created_at") or "") <= anchor:
+                    _emit_msg(m)
+            for s in live_steps:
+                _emit_step(s, r.get("id") or run_id)
+            for m in pending:
+                if str(m.get("created_at") or "") > anchor:
                     _emit_msg(m)
-            for s in steps:
-                if (s.get("status") or "") != "done":
-                    _emit_step(s, r.get("id") or run_id)
         return self._json(200, {
             "run_id": run_id, "status": run.get("status") or "",
             "engine": engine,
@@ -2627,6 +2739,13 @@ def main():
     n_mg = store.recover_interrupted_mgmt()
     if n_mg:
         print("[CodeBee] 崩溃恢复：%d 个遗留管理操作标记为 failed（interrupted at startup）" % n_mg)
+    try:
+        from core import operations
+        n_op = operations.recover_pending()
+        if n_op:
+            print("[CodeBee] 外部写入对账：%d 个无回执操作标记为 unknown" % n_op)
+    except Exception:
+        pass
     try:
         # 孤儿 CLI 清扫走后台线程：PowerShell Get-CimInstance 在部分机器上会慢满
         # timeout（真实装机 60s，启动被白拖一分钟且无任何提示——看门狗堆栈抓到）。