codebee 0.1.71 → 0.1.73

package/app/core/history.py

@@ -1,38 +1,38 @@
-# -*- coding: utf-8 -*-
-"""历史统计：从过往运行记录提取每个智能体在每种任务类型上的胜率，反哺路由。"""
-from __future__ import annotations
-
-from . import store
-
-
-def agent_stats(limit=200):
-    """返回 {agent_id: {task_type: {"runs": n, "wins": w}}}。"""
-    stats = {}
-
-    def bump(aid, ttype, win):
-        if not aid:
-            return
-        s = stats.setdefault(aid, {}).setdefault(ttype, {"runs": 0, "wins": 0})
-        s["runs"] += 1
-        if win:
-            s["wins"] += 1
-
-    for run in store.list_runs(limit):
-        if run.get("kind") != "orchestration":
-            continue
-        # 失败运行也要进历史（记为全负）：以前只数 done——常挂的 CLI 永远
-        # 「无历史记录」满血参选，2026-09-17 opencode 当日秒挂 3 次仍被换将
-        # 选中。cancelled 不算（用户取消非智能体之过）。
-        if run.get("status") not in ("done", "failed"):
-            continue
-        verdict = run.get("verdict") or {}
-        task = store.get_task(run.get("task_id")) if run.get("task_id") else None
-        ttype = (task or {}).get("type") or verdict.get("type")
-        if not ttype:
-            continue
-        win = run.get("status") == "done" and bool(
-            verdict.get("pass") or verdict.get("publishable"))
-        for s in run.get("steps") or []:
-            if s.get("role") in ("implement", "draft"):
-                bump(s.get("agent"), ttype, win)
-    return stats
+# -*- coding: utf-8 -*-
+"""历史统计：从过往运行记录提取每个智能体在每种任务类型上的胜率，反哺路由。"""
+from __future__ import annotations
+
+from . import store
+
+
+def agent_stats(limit=200):
+    """返回 {agent_id: {task_type: {"runs": n, "wins": w}}}。"""
+    stats = {}
+
+    def bump(aid, ttype, win):
+        if not aid:
+            return
+        s = stats.setdefault(aid, {}).setdefault(ttype, {"runs": 0, "wins": 0})
+        s["runs"] += 1
+        if win:
+            s["wins"] += 1
+
+    for run in store.list_runs(limit):
+        if run.get("kind") != "orchestration":
+            continue
+        # 失败运行也要进历史（记为全负）：以前只数 done——常挂的 CLI 永远
+        # 「无历史记录」满血参选，2026-09-17 opencode 当日秒挂 3 次仍被换将
+        # 选中。cancelled 不算（用户取消非智能体之过）。
+        if run.get("status") not in ("done", "failed"):
+            continue
+        verdict = run.get("verdict") or {}
+        task = store.get_task(run.get("task_id")) if run.get("task_id") else None
+        ttype = (task or {}).get("type") or verdict.get("type")
+        if not ttype:
+            continue
+        win = run.get("status") == "done" and bool(
+            verdict.get("pass") or verdict.get("publishable"))
+        for s in run.get("steps") or []:
+            if s.get("role") in ("implement", "draft"):
+                bump(s.get("agent"), ttype, win)
+    return stats

package/app/core/hooks.py

@@ -1,162 +1,162 @@
-# -*- coding: utf-8 -*-
-"""任务生命周期钩子（借鉴 ZCode hooks，收窄为三个事件——2026-09-22 用户立项）：
-
-- task_start     任务开跑前（编排/直连都触发）：stdout 可注入文本，追加进任务上下文
-- message_submit 用户消息送达前：stdout 可注入文本，随消息进提示词头
-- run_end        每轮运行结束：纯副作用型（回写知识库等），输出被忽略
-
-协议：钩子命令从 stdin 收 JSON（事件+上下文）；stdout 若为 {"inject": "..."}
-取该字段为注入文本，否则把非空 stdout 整体当注入文本。
-失败/超时一律静默跳过（外部脚本不稳绝不拖死编排主流程）。
-
-命令执行：shlex 分词（保 Windows 反斜杠）后走参数列表，不经 shell——
-不支持管道/重定向等 shell 语法，需要时写 .py/.bat 包装脚本。
-配置：DATA_DIR/hooks.json，纯本机设置。"""
-from __future__ import annotations
-
-import json
-import logging
-import os
-import shlex
-import subprocess
-
-from . import paths
-
-log = logging.getLogger(__name__)
-
-EVENTS = ("task_start", "message_submit", "run_end")
-_DEFAULT_TIMEOUT = 10
-_FILE = None          # 测试重绑（同 modelhub._FILE 惯例）
-
-_CREATE_NO_WINDOW = 0x08000000 if hasattr(subprocess, "CREATE_NO_WINDOW") else 0
-
-
-def _path():
-    return _FILE or (paths.DATA_DIR / "hooks.json")
-
-
-def _default_list():
-    return []
-
-
-def load_list():
-    """读钩子配置列表；损坏/缺省回落空表。"""
-    try:
-        data = json.loads(_path().read_text(encoding="utf-8"))
-        return data if isinstance(data, list) else _default_list()
-    except Exception:
-        return _default_list()
-
-
-def save_list(items):
-    """整表保存（UI 全量提交）。字段归一 + 事件白名单。"""
-    if not isinstance(items, list):
-        raise ValueError("hooks 必须是数组")
-    out = []
-    for i, h in enumerate(items):
-        if not isinstance(h, dict):
-            continue
-        name = str(h.get("name") or "").strip()[:60]
-        event = str(h.get("event") or "").strip()
-        cmd = str(h.get("cmd") or "").strip()
-        if not cmd:
-            continue
-        if event not in EVENTS:
-            raise ValueError("第 %d 条钩子 event 非法（%s）" % (i + 1, event))
-        try:
-            timeout = max(1, min(120, int(h.get("timeout_s") or _DEFAULT_TIMEOUT)))
-        except (TypeError, ValueError):
-            timeout = _DEFAULT_TIMEOUT
-        out.append({"id": str(h.get("id") or ("hk-%d" % (i + 1)))[:40],
-                    "name": name or ("钩子 %d" % (i + 1)),
-                    "event": event, "cmd": cmd,
-                    "enabled": bool(h.get("enabled", True)),
-                    "timeout_s": timeout})
-    tmp = _path().with_suffix(".tmp")
-    tmp.write_text(json.dumps(out, ensure_ascii=False, indent=1), encoding="utf-8")
-    tmp.replace(_path())
-    return out
-
-
-def _argv(cmd):
-    """命令串 → 参数列表。Windows 反斜杠路径保真（posix=False），支持引号分组；
-    分词后剥掉 token 首尾引号（CreateProcess 不认字面引号路径）。"""
-    toks = shlex.split(str(cmd or ""), posix=False)
-    out = []
-    for t in toks:
-        if len(t) >= 2 and t[0] == t[-1] and t[0] in ('"', "'"):
-            t = t[1:-1]
-        if t:
-            out.append(t)
-    return out
-
-
-def _run_one(h, payload):
-    """跑单条钩子。返回注入文本或 None（失败/超时/空输出）。"""
-    try:
-        argv = _argv(h.get("cmd"))
-    except ValueError as e:
-        log.warning("hook[%s %s] 命令解析失败：%s", h.get("name"), h.get("event"), str(e)[:120])
-        return None
-    if not argv:
-        return None
-    try:
-        # Hook input/output is a UTF-8 JSON/text protocol. Python subprocesses on
-        # Windows otherwise inherit the OEM code page and their Chinese stdout is
-        # decoded as mojibake below. Non-Python hooks ignore this variable.
-        env = os.environ.copy()
-        env["PYTHONIOENCODING"] = "utf-8"
-        proc = subprocess.run(
-            argv, shell=False,
-            input=json.dumps(payload, ensure_ascii=False).encode("utf-8"),
-            capture_output=True, timeout=int(h.get("timeout_s") or _DEFAULT_TIMEOUT),
-            creationflags=_CREATE_NO_WINDOW, env=env)
-    except subprocess.TimeoutExpired:
-        log.warning("hook[%s %s] 超时，已跳过", h.get("name"), h.get("event"))
-        return None
-    except Exception as e:
-        log.warning("hook[%s %s] 执行失败：%s", h.get("name"), h.get("event"), str(e)[:120])
-        return None
-    out = (proc.stdout or b"").decode("utf-8", "replace").strip()
-    if not out:
-        return None
-    try:
-        data = json.loads(out)
-        if isinstance(data, dict):
-            return str(data.get("inject") or "") or None
-    except Exception:
-        pass
-    return out
-
-
-def run_event(event, ctx=None, task_id=None, run_id=None, text=None):
-    """触发事件：依次跑启用的钩子，合并注入文本。任何异常不外抛。
-
-    ctx 附带任务/运行摘要；text 仅 message_submit 时传用户消息原文。
-    返回拼接好的注入文本（可为空串）。"""
-    if event not in EVENTS:
-        return ""
-    try:
-        items = [h for h in load_list() if h.get("enabled") and h.get("event") == event]
-    except Exception:
-        return ""
-    if not items:
-        return ""
-    payload = {"event": event, "task_id": task_id or "", "run_id": run_id or "",
-               "text": text or ""}
-    if ctx is not None:
-        payload["ctx"] = ctx
-    outs = []
-    for h in items:
-        piece = _run_one(h, payload)
-        if piece:
-            outs.append(piece.strip())
-    return "\n\n".join(outs)
-
-
-def test_one(cmd, event="task_start", timeout_s=None):
-    """设置页「测试」：手动跑一条钩子，返回 (ok, 输出/错误人话)。"""
-    h = {"name": "test", "event": event if event in EVENTS else "task_start",
-         "cmd": cmd, "timeout_s": timeout_s or _DEFAULT_TIMEOUT}
-    piece = _run_one(h, {"event": h["event"], "task_id": "", "run_id": "", "text": ""})
-    return True, piece if piece else "（无输出，未注入）"
+# -*- coding: utf-8 -*-
+"""任务生命周期钩子（借鉴 ZCode hooks，收窄为三个事件——2026-09-22 用户立项）：
+
+- task_start     任务开跑前（编排/直连都触发）：stdout 可注入文本，追加进任务上下文
+- message_submit 用户消息送达前：stdout 可注入文本，随消息进提示词头
+- run_end        每轮运行结束：纯副作用型（回写知识库等），输出被忽略
+
+协议：钩子命令从 stdin 收 JSON（事件+上下文）；stdout 若为 {"inject": "..."}
+取该字段为注入文本，否则把非空 stdout 整体当注入文本。
+失败/超时一律静默跳过（外部脚本不稳绝不拖死编排主流程）。
+
+命令执行：shlex 分词（保 Windows 反斜杠）后走参数列表，不经 shell——
+不支持管道/重定向等 shell 语法，需要时写 .py/.bat 包装脚本。
+配置：DATA_DIR/hooks.json，纯本机设置。"""
+from __future__ import annotations
+
+import json
+import logging
+import os
+import shlex
+import subprocess
+
+from . import paths
+
+log = logging.getLogger(__name__)
+
+EVENTS = ("task_start", "message_submit", "run_end")
+_DEFAULT_TIMEOUT = 10
+_FILE = None          # 测试重绑（同 modelhub._FILE 惯例）
+
+_CREATE_NO_WINDOW = 0x08000000 if hasattr(subprocess, "CREATE_NO_WINDOW") else 0
+
+
+def _path():
+    return _FILE or (paths.DATA_DIR / "hooks.json")
+
+
+def _default_list():
+    return []
+
+
+def load_list():
+    """读钩子配置列表；损坏/缺省回落空表。"""
+    try:
+        data = json.loads(_path().read_text(encoding="utf-8"))
+        return data if isinstance(data, list) else _default_list()
+    except Exception:
+        return _default_list()
+
+
+def save_list(items):
+    """整表保存（UI 全量提交）。字段归一 + 事件白名单。"""
+    if not isinstance(items, list):
+        raise ValueError("hooks 必须是数组")
+    out = []
+    for i, h in enumerate(items):
+        if not isinstance(h, dict):
+            continue
+        name = str(h.get("name") or "").strip()[:60]
+        event = str(h.get("event") or "").strip()
+        cmd = str(h.get("cmd") or "").strip()
+        if not cmd:
+            continue
+        if event not in EVENTS:
+            raise ValueError("第 %d 条钩子 event 非法（%s）" % (i + 1, event))
+        try:
+            timeout = max(1, min(120, int(h.get("timeout_s") or _DEFAULT_TIMEOUT)))
+        except (TypeError, ValueError):
+            timeout = _DEFAULT_TIMEOUT
+        out.append({"id": str(h.get("id") or ("hk-%d" % (i + 1)))[:40],
+                    "name": name or ("钩子 %d" % (i + 1)),
+                    "event": event, "cmd": cmd,
+                    "enabled": bool(h.get("enabled", True)),
+                    "timeout_s": timeout})
+    tmp = _path().with_suffix(".tmp")
+    tmp.write_text(json.dumps(out, ensure_ascii=False, indent=1), encoding="utf-8")
+    tmp.replace(_path())
+    return out
+
+
+def _argv(cmd):
+    """命令串 → 参数列表。Windows 反斜杠路径保真（posix=False），支持引号分组；
+    分词后剥掉 token 首尾引号（CreateProcess 不认字面引号路径）。"""
+    toks = shlex.split(str(cmd or ""), posix=False)
+    out = []
+    for t in toks:
+        if len(t) >= 2 and t[0] == t[-1] and t[0] in ('"', "'"):
+            t = t[1:-1]
+        if t:
+            out.append(t)
+    return out
+
+
+def _run_one(h, payload):
+    """跑单条钩子。返回注入文本或 None（失败/超时/空输出）。"""
+    try:
+        argv = _argv(h.get("cmd"))
+    except ValueError as e:
+        log.warning("hook[%s %s] 命令解析失败：%s", h.get("name"), h.get("event"), str(e)[:120])
+        return None
+    if not argv:
+        return None
+    try:
+        # Hook input/output is a UTF-8 JSON/text protocol. Python subprocesses on
+        # Windows otherwise inherit the OEM code page and their Chinese stdout is
+        # decoded as mojibake below. Non-Python hooks ignore this variable.
+        env = os.environ.copy()
+        env["PYTHONIOENCODING"] = "utf-8"
+        proc = subprocess.run(
+            argv, shell=False,
+            input=json.dumps(payload, ensure_ascii=False).encode("utf-8"),
+            capture_output=True, timeout=int(h.get("timeout_s") or _DEFAULT_TIMEOUT),
+            creationflags=_CREATE_NO_WINDOW, env=env)
+    except subprocess.TimeoutExpired:
+        log.warning("hook[%s %s] 超时，已跳过", h.get("name"), h.get("event"))
+        return None
+    except Exception as e:
+        log.warning("hook[%s %s] 执行失败：%s", h.get("name"), h.get("event"), str(e)[:120])
+        return None
+    out = (proc.stdout or b"").decode("utf-8", "replace").strip()
+    if not out:
+        return None
+    try:
+        data = json.loads(out)
+        if isinstance(data, dict):
+            return str(data.get("inject") or "") or None
+    except Exception:
+        pass
+    return out
+
+
+def run_event(event, ctx=None, task_id=None, run_id=None, text=None):
+    """触发事件：依次跑启用的钩子，合并注入文本。任何异常不外抛。
+
+    ctx 附带任务/运行摘要；text 仅 message_submit 时传用户消息原文。
+    返回拼接好的注入文本（可为空串）。"""
+    if event not in EVENTS:
+        return ""
+    try:
+        items = [h for h in load_list() if h.get("enabled") and h.get("event") == event]
+    except Exception:
+        return ""
+    if not items:
+        return ""
+    payload = {"event": event, "task_id": task_id or "", "run_id": run_id or "",
+               "text": text or ""}
+    if ctx is not None:
+        payload["ctx"] = ctx
+    outs = []
+    for h in items:
+        piece = _run_one(h, payload)
+        if piece:
+            outs.append(piece.strip())
+    return "\n\n".join(outs)
+
+
+def test_one(cmd, event="task_start", timeout_s=None):
+    """设置页「测试」：手动跑一条钩子，返回 (ok, 输出/错误人话)。"""
+    h = {"name": "test", "event": event if event in EVENTS else "task_start",
+         "cmd": cmd, "timeout_s": timeout_s or _DEFAULT_TIMEOUT}
+    piece = _run_one(h, {"event": h["event"], "task_id": "", "run_id": "", "text": ""})
+    return True, piece if piece else "（无输出，未注入）"

package/app/core/jobs.py

@@ -39,6 +39,8 @@ MAX_POOL = 24
 CHAT_POOL = 4         # 轻量池上限：direct 对话直连 API 本机开销极小，4 个足够
 BUSY_WAIT_S = 15.0    # 满载排队后的补跑轮询间隔（秒）；测试可调小
 BUSY_WAIT_MAX = 40    # 补跑拍数封顶：15s × 40 = 10 分钟，超时才判失败
+QUEUED_SWEEP_INTERVAL_S = 60  # 运行期 queued 巡检周期：续跑 Timer 断链的最后防线
+QUEUED_SWEEP_MIN_AGE_S = 120  # 只接管卡了超过该秒数的 queued run（正常排队/刚建的不掺和）
 
 
 class JobsBusyError(RuntimeError):
@@ -114,6 +116,8 @@ def start_worker():
     if _started:
         return
     _started = True
+    threading.Thread(target=_queued_sweep_loop,
+                     name="queued-sweep", daemon=True).start()
     try:
         from . import settings
         configure(settings.load()["max_concurrent_jobs"])
@@ -123,6 +127,23 @@ def start_worker():
     configure(12)
 
 
+def _queued_sweep_loop():
+    """运行期 queued 巡检：requeue_pending 只在启动时跑一次，而续跑 Timer
+    随进程死亡——resume_enqueue_at 到点时若进程已换血，副本就永远躺平在
+    queued（2026-09-29 实案：连载续跑副本躺了 4 小时无人接）。这里周期兜底
+    捞起超龄 queued：到点的退避副本、蒸发的满载排队都走 requeue_pending
+    统一收口。防双跑靠三层既有闸：_task_active_run 单飞 + enqueue CAS 认领
+    + 重复 job 跳过；退避未到点/max_age 内的新鲜记录 requeue_pending 自己跳。"""
+    while True:
+        time.sleep(QUEUED_SWEEP_INTERVAL_S)
+        if _restart_drain:
+            continue
+        try:
+            requeue_pending(limit=10, max_age_s=QUEUED_SWEEP_MIN_AGE_S)
+        except Exception:
+            pass
+
+
 def _job_is_light(run):
     """direct 对话走轻量池：内置智能体直连模型 API，本机无 CLI 子进程，
     开销与编排任务（每步起一个 CLI）差几个量级，不该抢全局槽。判定按
@@ -903,7 +924,10 @@ def _do_mgmt(job, ev):
             summary = ("失败：安装文件被占用（可能有同名程序在运行，或杀毒软件正在扫描），"
                        "请关闭占用该文件的程序后重试。完整输出见日志。")
         else:
-            summary = ("完成" if ok else "失败") + (": " + res["error"][:300] if res.get("error") else "")
+            # note 优先：良性收口（如 winget「已装无可升级」复检在装）给用户
+            # 看原因，别让「完成」两个字孤零零不带解释
+            extra = str(res.get("note") or res.get("error") or "")[:300]
+            summary = ("完成" if ok else "失败") + (": " + extra if extra else "")
         store.finish_step(run_id, step["n"],
                           "done" if ok else "failed",
                           summary=summary,