codebee 0.1.54 → 0.1.55

package/app/core/store.py

@@ -28,7 +28,11 @@ _RUNS = {}
 # 长跑也不会无限增长（finish_step 里调 clear_stream_state）。
 _STREAM_LOCK = threading.Lock()
 _STREAM_TS = {}
-LIVE_TEXT_MAX = 20000   # 单步骤实时思考/正文的保留上限（与 builtin_agent 同口径）
+LIVE_TEXT_MAX = 20000   # 单步骤实时思考/正文的保留上限（与 builtin_agent 同口径）
+
+DEFAULT_TASK_TIMEOUT_S = 3600
+MIN_TASK_TIMEOUT_S = 1
+MAX_TASK_TIMEOUT_S = 7 * 24 * 3600
 
 # ---------------------------------------------------------------- 状态版本（SSE 事件驱动）
 # 任何落盘写都算状态变化：SSE 连接等版本号变化才构建/推送全量状态，
@@ -57,12 +61,38 @@ def wait_state_change(last_ver, timeout):
         return _STATE_VER
 
 
-def _new_id(prefix):
-    return "%s-%s-%04d" % (prefix, time.strftime("%Y%m%d-%H%M%S"), secrets.randbelow(10000))
-
-
-def _safe_name(s):
-    return re.sub(r"[^0-9A-Za-z_-]+", "-", str(s))[:40].strip("-") or "x"
+def _new_id(prefix):
+    stamp = time.strftime("%Y%m%d-%H%M%S")
+    # 10k random suffixes are not unique under a burst of task/run creation.
+    # Reserve against both indexes and disk so a collision cannot silently
+    # overwrite a queued run and make one of several submissions disappear.
+    with LOCK:
+        for _ in range(100):
+            candidate = "%s-%s-%04d" % (prefix, stamp, secrets.randbelow(10000))
+            if candidate in _TASKS or candidate in _RUNS:
+                continue
+            if (paths.TASKS_DIR / (candidate + ".json")).exists():
+                continue
+            if (paths.RUNS_DIR / candidate).exists():
+                continue
+            return candidate
+    raise RuntimeError("无法生成唯一记录 ID")
+
+
+def _safe_name(s):
+    return re.sub(r"[^0-9A-Za-z_-]+", "-", str(s))[:40].strip("-") or "x"
+
+
+def _task_timeout_s(value=None):
+    """Resolve one bounded wall-clock budget for a task."""
+    raw = value
+    if raw in (None, ""):
+        raw = os.environ.get("TUTTI_TASK_TIMEOUT_S", DEFAULT_TASK_TIMEOUT_S)
+    try:
+        seconds = int(float(raw))
+    except (TypeError, ValueError):
+        seconds = DEFAULT_TASK_TIMEOUT_S
+    return max(MIN_TASK_TIMEOUT_S, min(MAX_TASK_TIMEOUT_S, seconds))
 
 
 # ---------------------------------------------------------------- 任务
@@ -128,7 +158,8 @@ def create_task(payload):
         "status": "created",
     }
     thinking = str(payload.get("thinking") or "standard").strip().lower()
-    task["thinking"] = thinking if thinking in ("auto", "low", "standard", "high") else "auto"
+    task["thinking"] = thinking if thinking in ("auto", "low", "standard", "high") else "auto"
+    task["timeout_s"] = _task_timeout_s(payload.get("timeout_s"))
     if flow["engine"] == "direct":
         task["direct_provider_id"] = _text(payload.get("direct_provider_id"),
                                             "direct_provider_id")[:80]
@@ -515,7 +546,7 @@ def load_all():
                 _save_json(paths.TASKS_DIR / (t["id"] + ".json"), t)
                 continue
             latest = max(runs, key=lambda r: r["id"])
-            if latest.get("status") in ("done", "failed", "cancelled"):
+            if latest.get("status") in ("done", "failed", "cancelled", "timeout"):
                 t["status"] = latest["status"]
                 _save_json(paths.TASKS_DIR / (t["id"] + ".json"), t)
 
@@ -531,7 +562,7 @@ def set_run_estimator(estimator):
     _RUN_ESTIMATOR = estimator if callable(estimator) else None
 
 
-def create_run(kind, title, task_id=None, entry_id=None, op=None):
+def create_run(kind, title, task_id=None, entry_id=None, op=None):
     run = {
         "id": _new_id("r" if kind == "orchestration" else "m"),
         "kind": kind,  # orchestration | mgmt
@@ -539,12 +570,14 @@ def create_run(kind, title, task_id=None, entry_id=None, op=None):
         "task_id": task_id, "entry_id": entry_id, "op": op,
         "status": "queued", "steps": [], "messages": [],
         "created_at": time.strftime("%Y-%m-%d %H:%M:%S"),
-        "started_at": None, "ended_at": None,
+        "started_at": None, "ended_at": None,
+        "deadline_at": None,
         "cost_usd": 0.0, "tokens": 0, "error": "",
         "verdict": None, "summary": "",
     }
-    if kind == "orchestration" and task_id:
-        task = get_task(task_id) or {}
+    if kind == "orchestration" and task_id:
+        task = get_task(task_id) or {}
+        run["deadline_at"] = time.time() + _task_timeout_s(task.get("timeout_s"))
         try:
             eta = _RUN_ESTIMATOR(
                 task_type=task.get("type") or "", mode=task.get("mode") or "auto",
@@ -729,25 +762,27 @@ def update_run(run_id, expected_status=None, **fields):
         # 这套在落终态瞬间即时收口——打磨组长被取消/异常打断时 UI 不闪
         # 假「工作中」）。run 终态后不可能还有步骤在真跑。
         st = fields.get("status")
-        if st in ("done", "failed", "cancelled"):
-            end_s = time.strftime("%H:%M:%S")
-            for s in run["steps"]:
-                if s.get("status") in ("queued", "running"):
-                    s["status"] = "cancelled"
-                    s["ended_at"] = s.get("ended_at") or end_s
-                    if not s.get("summary"):
-                        s["summary"] = "步骤未正常收尾（终态自动恢复）"
+        if st in ("done", "failed", "cancelled", "timeout"):
+            end_s = time.strftime("%H:%M:%S")
+            for s in run["steps"]:
+                if s.get("status") in ("queued", "running"):
+                    s["status"] = "timeout" if st == "timeout" else "cancelled"
+                    s["ended_at"] = s.get("ended_at") or end_s
+                    if not s.get("summary"):
+                        s["summary"] = ("步骤未正常收尾（任务总时限已到）"
+                                         if st == "timeout" else
+                                         "步骤未正常收尾（终态自动恢复）")
         _save_json(paths.RUNS_DIR / run_id / "run.json", run)
         # 状态回填：起跑与结束都同步任务状态。只回填终态的话，run 在跑、
         # 任务永远显示「排队中」（2026-09-18 实案：「# 重写·续」run 已 running
         # 写了一小时，任务卡 queued，用户以为卡死连点重试）。
-        if st in ("running", "done", "failed", "cancelled"):
+        if st in ("running", "done", "failed", "cancelled", "timeout"):
             tid = run.get("task_id")
             task = _TASKS.get(tid) if tid else None
             if task:
                 task["status"] = st
                 _save_json(paths.TASKS_DIR / (tid + ".json"), task)
-        if st in ("done", "failed", "cancelled"):
+        if st in ("done", "failed", "cancelled", "timeout"):
             # run_end 钩子（2026-09-22）：终态即触发，后台跑副作用型脚本
             # （回写知识库等）；失败/超时静默，绝不拖慢收尾路径
             try:
@@ -838,15 +873,17 @@ def recover_orphaned_runs():
     step_now = time.strftime("%H:%M:%S")
     with LOCK:
         for r in _RUNS.values():
-            if r.get("status") not in ("done", "failed", "cancelled"):
-                continue
+            if r.get("status") not in ("done", "failed", "cancelled", "timeout"):
+                continue
             changed = False
             for s in r.get("steps") or []:
                 if s.get("status") in ("queued", "running"):
-                    s["status"] = "cancelled"
+                    s["status"] = "timeout" if r.get("status") == "timeout" else "cancelled"
                     s["ended_at"] = s.get("ended_at") or step_now
                     if not s.get("summary"):
-                        s["summary"] = "步骤未正常收尾（取消/中断自动恢复）"
+                        s["summary"] = ("步骤未正常收尾（任务总时限已到）"
+                                         if r.get("status") == "timeout" else
+                                         "步骤未正常收尾（取消/中断自动恢复）")
                     changed = True
             if changed:
                 _save_json(paths.RUNS_DIR / r["id"] / "run.json", r)

package/app/core/zentao.py

@@ -66,6 +66,7 @@ from . import jobs, paths, settings, store, tlsctx
 log = logging.getLogger(__name__)
 
 _LOCK = threading.RLock()
+_SCAN_LOCK = threading.Lock()  # 手动/定时扫描单飞，避免重复拉取和重复认领
 _FILE = paths.DATA_DIR / "zentao.json"
 _STATE = {
     "config": {},        # 持久配置（_CFG_DEFAULTS）
@@ -868,12 +869,20 @@ def _claimable(bug, profile):
     return True
 
 
-def list_bugs(cfg, product_id):
-    """拉一个产品下的 bug（分页，总量封顶 MAX_BUGS）。返回原始 bug dict 列表。"""
+def list_bugs(cfg, product_id, profile=None):
+    """拉一个产品下的激活 bug（分页，总量封顶 MAX_BUGS）。
+
+    REST v1 支持时把状态/指派人过滤下推给禅道，减少无关 bug 的分页传输；
+    本地的 _claimable 仍保留，兼容老接口或禅道忽略未知查询参数的情况。
+    """
     out = []
     for page in range(1, 6):
-        d = _call("GET", "/products/%s/bugs?page=%d&limit=%d" % (product_id, page, PAGE_LIMIT),
-                  cfg=cfg)
+        query = {"page": page, "limit": PAGE_LIMIT, "status": "active"}
+        assigned = str((profile or {}).get("assigned_to") or "").strip()
+        if assigned:
+            query["assignedTo"] = assigned
+        d = _call("GET", "/products/%s/bugs?%s" % (
+            product_id, urllib.parse.urlencode(query)), cfg=cfg)
         bugs = d.get("bugs") if isinstance(d, dict) else None
         if not isinstance(bugs, list):
             raise ZenError("禅道 bug 列表响应形状不对（预期 bugs 数组）")
@@ -1038,7 +1047,7 @@ def test_connection(base_url=None, account=None, password=None):
     try:
         profiles = _profiles(c)
         if profiles:
-            bugs = list_bugs(probe, profiles[0]["product"])
+            bugs = list_bugs(probe, profiles[0]["product"], profiles[0])
             return True, "连接成功（%s），产品 %s 可访问（当前 %d 条 bug 在列表里）" % (
                 tag, profiles[0]["product"], len(bugs))
     except ZenError as e:
@@ -1712,7 +1721,7 @@ def _scan(cfg):
     if not profiles:
         raise ZenError("未配置产品档案——请先在设置页添加产品并配置仓库")
     for profile in profiles:
-        bugs = list_bugs(cfg, profile["product"])
+        bugs = list_bugs(cfg, profile["product"], profile)
         by_id = {str(b.get("id") or ""): b for b in bugs}
         with _LOCK:
             seen = set(_STATE["claims"].keys())
@@ -1735,6 +1744,17 @@ def _scan(cfg):
 
 
 def _poll(force=False):
+    """执行一次扫描；同一进程内只允许一个扫描实例。"""
+    if not _SCAN_LOCK.acquire(blocking=False):
+        return {"ok": False, "claimed": 0, "reconciled": False,
+                "error": "扫描正在进行，请稍候", "skipped": "in_progress"}
+    try:
+        return _poll_unlocked(force=force)
+    finally:
+        _SCAN_LOCK.release()
+
+
+def _poll_unlocked(force=False):
     """一次完整轮询：对账回写 + （到点/强制时）扫描认领。异常不外抛。"""
     _ensure_loaded()
     with _LOCK:

package/app/ui/app.js

@@ -6377,18 +6377,18 @@ function logLiveBadge(live) {
   }
 }
 
-/* 复制抽屉日志全文：报错 JSON 动辄几十行还带横向滚动，手动圈选很折磨 */
-window.rdLogCopy = function () {
-  const pre = $("rd-log-text");
-  const text = ((pre && pre.textContent) || "").trim();
-  const idle = [t("（等待输出…）"), t("（无输出）")];
-  if (!text || idle.includes(text)) return;
-  const done = () => toast(t("已复制"));
-  if (navigator.clipboard && navigator.clipboard.writeText) {
-    navigator.clipboard.writeText(text).then(done, () => fallbackCopy(text, done));
-  } else fallbackCopy(text, done);
-};
-
+/* 复制抽屉日志全文：报错 JSON 动辄几十行还带横向滚动，手动圈选很折磨 */
+window.rdLogCopy = function () {
+  const pre = $("rd-log-text");
+  const text = ((pre && pre.textContent) || "").trim();
+  const idle = [t("（等待输出…）"), t("（无输出）")];
+  if (!text || idle.includes(text)) return;
+  const done = () => toast(t("已复制"));
+  if (navigator.clipboard && navigator.clipboard.writeText) {
+    navigator.clipboard.writeText(text).then(done, () => fallbackCopy(text, done));
+  } else fallbackCopy(text, done);
+};
+
 /* 抽屉标题：按 (runId, 日志路径) 反查步骤角色与执行者——不知道在看谁的日志，
  * 抽屉就成了无名黑框 */
 function rdLogStepLabel(runId, rel) {
@@ -9240,11 +9240,15 @@ function autoTplPace(tp) {
   });
 }
 
-/* last_status → 徽章：started=正常灰、error=红「拉起失败」、missed=黄「已错过」 */
+/* last_status → 徽章：started=正常灰、error=红「拉起失败」、missed=黄「已错过」；
+ * done/failed/cancelled=运行终态（2026-09-23 回写接线后会出现，失败必须可见） */
 function autoStatusTag(tsk) {
   if (tsk.last_status === "error") return '<span class="tag auto-tag-err">' + t("拉起失败") + "</span>";
   if (tsk.last_status === "missed") return '<span class="tag auto-tag-miss">' + t("已错过") + "</span>";
   if (tsk.last_status === "started" || tsk.last_status === "queued") return '<span class="tag">' + t("正常") + "</span>";
+  if (tsk.last_status === "failed") return '<span class="tag auto-tag-err">' + t("上次失败") + "</span>";
+  if (tsk.last_status === "cancelled") return '<span class="tag auto-tag-miss">' + t("已取消") + "</span>";
+  if (tsk.last_status === "done") return '<span class="tag">' + t("已完成") + "</span>";
   return "";
 }
 
@@ -11327,6 +11331,12 @@ function pickLang(lang) {
 window.toggleLangMenu = toggleLangMenu;
 window.pickLang = pickLang;
 
+/* 顶栏大屏入口：新标签页打开任务驾驶舱；同源共享 orch.token，board 页免二次输令牌 */
+function openBoard() {
+  window.open("/board.html", "_blank", "noopener");
+}
+window.openBoard = openBoard;
+
 function setLangBtn(lang) {
   if (getLang() === lang) return;
   setLang(lang);