codebee 0.1.22 → 0.1.24

package/app/core/pipeline.py

@@ -19,7 +19,7 @@ import re
 import threading
 import time
 
-from . import aiflavor, catalog, history, jobs, knowledge, manager, modelhub, mocks, paihang, planner, registry, router, runner, skills, store, task_compile, usage
+from . import aiflavor, catalog, dispatch_log, history, jobs, knowledge, manager, modelhub, mocks, paihang, planner, registry, router, runner, skills, store, task_compile, usage
 from . import builtin_agent
 from . import diagnostics
 from . import paths as paths_mod
@@ -60,6 +60,20 @@ def _task_images(task, workdir):
         return []
 
 
+def _refresh_attachment_context(task, workdir):
+    """为新旧任务统一生成附件正文上下文；失败时保留原上下文。"""
+    if not task.get("attachments"):
+        return task
+    try:
+        from . import attachments as att_mod
+        out = dict(task)
+        out["context"] = att_mod.merge_context(
+            task.get("context") or "", task.get("attachments") or [], workdir=workdir)
+        return out
+    except Exception:
+        return task
+
+
 def _ms_name(raw):
     name = re.sub(r"[\\/\x00]+", "_", str(raw or "")).strip()
     name = re.sub(r"\.{2,}", "_", name).lstrip(".")
@@ -253,6 +267,7 @@ def _drain_directives(run_id, workdir, role=None, step_n=None):
         lines.append("本步为评审步骤：请把上述用户意见作为评分依据之一，"
                      "在相应维度的分数与 issues 中明确体现（引用用户原话）。")
     imgs = []
+    attachment_paths = []
     for m in msgs:
         stamp = m.get("created_at") or ""
         sender = m.get("sender") or "用户"
@@ -261,6 +276,7 @@ def _drain_directives(run_id, workdir, role=None, step_n=None):
                      else "- [%s %s]（附件指令，见下方文件）" % (stamp, sender))
         for rel in (m.get("attachments") or []):
             rel = str(rel)
+            attachment_paths.append(rel)
             low = rel.lower()
             if low.endswith((".png", ".jpg", ".jpeg", ".gif", ".webp", ".bmp")):
                 ap = os.path.join(workdir or "", rel) if workdir else rel
@@ -271,6 +287,13 @@ def _drain_directives(run_id, workdir, role=None, step_n=None):
                     lines.append("  · 图片附件：%s" % rel)
             else:
                 lines.append("  · 文件附件：%s（位于工作目录，可直接读取）" % rel)
+    if attachment_paths:
+        try:
+            from . import attachments as att_mod
+            items = att_mod.items_from_paths(attachment_paths, workdir)
+            lines.append(att_mod.context_block(items, workdir=workdir))
+        except Exception:
+            lines.append("附件预读失败：执行者必须逐个打开上述路径，无法读取时明确说明。")
     return "\n".join(lines), imgs
 
 
@@ -609,6 +632,9 @@ def _record_usage(run_id, role, agent, res, source="pipeline", step=0):
     try:
         run = store.get_run(run_id) or {}
         task = store.get_task(run.get("task_id")) if run.get("task_id") else None
+        provider = res.get("provider") or agent.get("provider") or {}
+        provider_id = provider.get("id") if isinstance(provider, dict) else ""
+        provider_name = provider.get("name") if isinstance(provider, dict) else ""
         usage.record(
             source=source, run_id=run_id, step=step,
             task_id=run.get("task_id") or "",
@@ -617,13 +643,14 @@ def _record_usage(run_id, role, agent, res, source="pipeline", step=0):
             agent_label=agent.get("label", ""),
             tool=agent.get("kind", ""),
             model=res.get("model") or "",
+            provider=res.get("provider_id") or provider_id or provider_name or "",
             ok=bool(res.get("ok")),
             duration_s=float(res.get("raw", {}).get("duration") or 0.0),
             cost_usd=float(res.get("cost_usd") or 0.0),
             usage=res.get("usage"))
         # 告警模块：CLI 调用成功/失败上报（provider 名与 usage 台账一致）
         from . import health
-        prov = agent.get("provider") or {}
+        prov = res.get("provider") or agent.get("provider") or {}
         prov_name = (prov.get("name") if isinstance(prov, dict) else "") or ""
         if prov_name:
             if res.get("ok"):
@@ -663,6 +690,9 @@ __GOAL__
 ## 未通过的原因
 __ISSUES__
 
+## 原始背景与附件
+__CONTEXT__
+
 ## 要求
 - 只针对上述问题修复；不要无关重构。
 - 完成后用 2-3 句话说明改了什么。
@@ -688,6 +718,9 @@ __GOAL__
 ## 验收命令
 __VERIFY__
 
+## 原始背景与附件要求
+__CONTEXT__
+
 ## 变更内容（git diff，若为空表示无法获取）
 __DIFF__
 """
@@ -746,6 +779,7 @@ def _run_review(run_id, task, workdir, reviewer, ev):
     prompt = (CODE_REVIEW_PROMPT
               .replace("__GOAL__", task["goal"])
               .replace("__VERIFY__", task.get("verify_command") or "（未配置）")
+              .replace("__CONTEXT__", task.get("context") or "（无）")
               .replace("__DIFF__", diff or "（无法获取 git diff，请综合任务目标谨慎评审）"))
     res = _run_step(run_id, "review", reviewer, prompt, workdir, readonly=True, ev=ev,
                     images=_task_images(task, workdir))
@@ -883,6 +917,54 @@ def _code_bestof(run, task, impl, difficulty, ev):
             pass
 
 
+def _record_actual_route(run_id, task, agents, stats, implementer,
+                         implementers=(), reviewer=None, critics=(), implement_reason="",
+                         review_reason="", direct=False):
+    """把引擎实际选中的执行者/评审者回写到可解释路由计划。"""
+    spec = task.get("_compiled_spec") or task_compile.compile_task(task)
+    impl_plan = router.route_plan(
+        agents, "implement", spec, stats, selected=implementer,
+        participants=implementers,
+        selection_reason=implement_reason)
+    if direct:
+        review_plan = {"role": "review", "selected": "", "participants": [],
+                       "selection_reason": "", "candidates": [], "fallback": []}
+    else:
+        review_group = list(critics or ())
+        actual_reviewer = reviewer or (review_group[0] if review_group else None)
+        review_plan = router.route_plan(
+            agents, "review", spec, stats, selected=actual_reviewer,
+            participants=review_group, selection_reason=review_reason)
+    store.update_run(run_id, route_plan={
+        "task": spec, "implement": impl_plan, "review": review_plan,
+    })
+    task_id = task.get("id") or (store.get_run(run_id) or {}).get("task_id") or ""
+    difficulty = (task.get("difficulty") or "auto")
+    for plan in (impl_plan, review_plan):
+        dispatch_log.record_event(
+            run_id=run_id, task_id=task_id, task_type=spec.get("type") or "",
+            difficulty=difficulty, role=plan.get("role") or "",
+            phase="selected", selected=plan.get("selected") or "",
+            participants=plan.get("participants") or (),
+            candidates=plan.get("candidates") or (),
+            fallback=plan.get("fallback") or (),
+            selection_reason=plan.get("selection_reason") or "")
+
+
+def _record_dispatch_completed(run_id, task, result, verify_pass=None, review_pass=None):
+    """记录运行终态，供调度回放与线上指标复盘使用。"""
+    try:
+        spec = task.get("_compiled_spec") or task_compile.compile_task(task)
+        dispatch_log.record_event(
+            run_id=run_id,
+            task_id=task.get("id") or (store.get_run(run_id) or {}).get("task_id") or "",
+            task_type=spec.get("type") or "", difficulty=task.get("difficulty") or "auto",
+            role="", phase="completed", result=result,
+            verify_pass=verify_pass, review_pass=review_pass)
+    except Exception:
+        pass
+
+
 def _run_code(run, task, agents, ev, stats, mode):
     run_id = run["id"]
     workdir = task["workdir"]
@@ -946,6 +1028,9 @@ def _run_code(run, task, agents, ev, stats, mode):
         reviewer, route["reviewer"] = router.pick_reviewer(agents, impl, "code", stats)
     else:
         reviewer, route["reviewer"] = _pick_reviewer_legacy(agents, impl)
+    _record_actual_route(run_id, task, agents, stats, impl, reviewer=reviewer,
+                         implement_reason=route.get("implementer", ""),
+                         review_reason=route.get("reviewer", ""))
     store.update_run(run_id, route=route)
 
     def implement_all(impl_agent, prefix_note):
@@ -1038,6 +1123,11 @@ def _run_code(run, task, agents, ev, stats, mode):
                 ok2, res = _run_one(other)
                 if ok2:
                     store.update_run(run_id, error="", route_note=note)
+                    _record_actual_route(
+                        run_id, task, agents, stats, other,
+                        implementers=[other], reviewer=reviewer,
+                        implement_reason=note,
+                        review_reason=route.get("reviewer", ""))
                     return True
                 res_err = "%s；换将后仍失败：%s" % (note, (res.get("error") or "")[:200])
             else:
@@ -1049,8 +1139,9 @@ def _run_code(run, task, agents, ev, stats, mode):
         return False
 
     def review_and_score():
-        review_json = _run_review(run_id, task, workdir, modelhub.bind_agent(reviewer, difficulty), ev)
         verify_pass, verify_ran = _run_verify(run_id, task, workdir, ev)
+        # 先让确定性验证落盘，再执行模型评审；终态判断会同时使用两份证据。
+        review_json = _run_review(run_id, task, workdir, modelhub.bind_agent(reviewer, difficulty), ev)
         return review_json, verify_pass, verify_ran
 
     attempt_note = route.get("implementer", "") if mode == "auto" else ""
@@ -1068,12 +1159,20 @@ def _run_code(run, task, agents, ev, stats, mode):
             prompt = (CODE_FIX_PROMPT
                       .replace("__GOAL__", task["goal"])
                       .replace("__ISSUES__", issues_txt)
+                      .replace("__CONTEXT__", task.get("context") or "（无）")
                       .replace("__VERIFY_HINT__", _verify_hint(task)))
             res = _run_step(run_id, "fix-r%d" % round_no, modelhub.bind_agent(impl, difficulty),
                             prompt, workdir, readonly=False, ev=ev,
                             note="自动修复第 %d 轮" % round_no,
                             resume=resume_ctx["session"] if resume_ctx else impl_sid[0],
                             require_tools=True)
+            if res["ok"]:
+                _record_actual_route(
+                    run_id, task, agents, stats, impl,
+                    implementers=[impl], reviewer=reviewer,
+                    implement_reason="修复轮由 %s 完成" %
+                    (impl.get("label") or impl.get("id")),
+                    review_reason=route.get("reviewer", ""))
             if impl.get("mode") == "mock" and res["ok"]:
                 pass  # mock 不产生真实变更
         review_json, verify_pass, verify_ran = review_and_score()
@@ -1097,6 +1196,11 @@ def _run_code(run, task, agents, ev, stats, mode):
                     impl["id"], other["id"], round_no + 1, other_reason)
                 store.update_run(run_id, error="")
                 impl = other
+                _record_actual_route(
+                    run_id, task, agents, stats, impl,
+                    implementers=[impl], reviewer=reviewer,
+                    implement_reason=note,
+                    review_reason=route.get("reviewer", ""))
                 switched = True
                 round_no += 1
                 continue
@@ -1175,6 +1279,7 @@ __GOAL__
 __CONTEXT__
 
 ## 要求
+- 背景与上下文里若有「附件材料」，先逐个读取再处理——附件是必要输入，不读附件就作答视为未完成。
 - 能改直接改、能写直接写（限本工作目录内），产出文件一律 UTF-8 编码（PowerShell 写文件显式 -Encoding UTF8）。
 - 正文直接交代结果与答案：不要写「本轮做了什么」这类开场总结，也不要「回复：」这类引导词。
 - 回复的最后一行单独输出一行交代结果：
@@ -1204,6 +1309,7 @@ __GOAL__
 __CONTEXT__
 
 ## 要求
+- 背景与上下文里若有「附件材料」，先逐个读取再处理——附件是必要输入，不读附件就作答视为未完成。
 - 能改直接改、能写直接写（用工具，限本工作目录内），产出文件一律 UTF-8 编码。
 - 完成后直接给用户结论与答案，需要时顺带交代产出/修改了哪些文件；不要写「本轮做了什么」这类开场白。
 __FOLLOWUPS__"""
@@ -1326,6 +1432,13 @@ def _run_direct(run, task, agents, ev, stats, mode):
         store.update_run(run_id, expected_status="running", status="failed",
                          error="没有可用智能体", ended_at=_now())
         return
+    actual_impl = impl or {
+        "id": "builtin:%s:%s" % (bi.get("provider_id") or "provider", bi.get("model") or "model"),
+        "label": "CodeBee · %s" % (bi.get("model") or bi.get("provider_name") or "内置模型"),
+        "kind": "builtin",
+    }
+    _record_actual_route(run_id, task, agents, stats, actual_impl,
+                         implement_reason=route.get("implementer", ""), direct=True)
     difficulty = task.get("difficulty") or "default"
     step_wd = _resume_workdir(resume_ctx, workdir) if resume_ctx else workdir
     store.update_run(run_id, route=route, difficulty=difficulty)
@@ -1358,6 +1471,8 @@ def _run_direct(run, task, agents, ev, stats, mode):
                 # 扫榜选材（借鉴 oh-story 扫榜）：抓七猫排行榜公开数据注入，
                 # AI 做选题洞察；抓取失败回落普通直连提示词
                 prompt = paihang.rank_scan_prompt(task.get("goal") or "") or ""
+                if prompt and task.get("context"):
+                    prompt += "\n\n## 用户背景与附件\n" + task["context"]
             if not prompt:
                 if bi is not None:
                     prompt = (BUILTIN_DIRECT_PROMPT
@@ -1548,6 +1663,9 @@ __GOAL__
 ## 评审汇总（各维度均分与主要问题）
 __CRITIQUE__
 
+## 原始背景与附件
+__CONTEXT__
+
 ## 要求
 - 针对性改进所有 major 问题；保持既定风格与设定。
 - 完成后用 3 句话说明本轮改了什么。"""
@@ -1688,6 +1806,8 @@ def _ensure_critique_placeholders(tpl):
         tpl += "\n\n## 待评审稿件\n---\n__MANUSCRIPT__\n---"
     if "__DIMKEYS__" not in tpl:
         tpl = ("请按维度打分（1-10 分）。\n\n" + tpl)
+    if "__CONTEXT__" not in tpl:
+        tpl += "\n\n## 原始任务背景与附件参考\n__CONTEXT__"
     return tpl
 
 
@@ -1724,6 +1844,9 @@ __GOAL__
 ## 本章评审意见
 __CRITIQUE__
 
+## 原始背景与附件
+__CONTEXT__
+
 ## 要求
 - 针对性解决所有 major 问题，保持与前后的剧情衔接；字数仍约 __WORDS__ 字。"""
 
@@ -1739,6 +1862,9 @@ SERIAL_GLOBAL_PROMPT = """你是网文主编（不要修改任何文件）。全
 ## 全书目标
 __GOAL__
 
+## 原始背景与附件
+__CONTEXT__
+
 ## 全文
 ---
 __MANUSCRIPT__
@@ -1860,6 +1986,31 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
     """连载流水线：大纲 → 逐章起草/评审/修订 → 全局一致性评审 → 合并成书。"""
     import json as _json
     run_id = run["id"]
+    actual_implementers = [impl]
+    actual_critics = list(critics)
+    current_impl = [impl]
+    current_impl_reason = [route.get("author", "")]
+    current_review_reason = [route.get("critics", "")]
+
+    def refresh_actual_route(primary_impl=None, implement_reason=None,
+                             review_reason=None):
+        if primary_impl is not None:
+            current_impl[0] = primary_impl
+        if implement_reason is not None:
+            current_impl_reason[0] = implement_reason
+        if review_reason is not None:
+            current_review_reason[0] = review_reason
+        _record_actual_route(
+            run_id, task, agents, stats, current_impl[0],
+            implementers=actual_implementers, critics=actual_critics,
+            implement_reason=current_impl_reason[0],
+            review_reason=current_review_reason[0])
+
+    def remember_agent(bucket, agent):
+        if agent and not any(x.get("id") == agent.get("id") for x in bucket):
+            bucket.append(agent)
+
+    refresh_actual_route(impl)
     workdir = task["workdir"]
     # 续会话步骤的 CLI 启动目录（稿件读写仍用 workdir）
     step_wd = _resume_workdir(resume_ctx, workdir) if resume_ctx else workdir
@@ -1901,8 +2052,9 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
         kb = knowledge.block_for(task)
         if kb:
             tpl = tpl.replace("## 待评审稿件", "%s\n\n## 待评审稿件" % kb, 1)
-        return tpl.replace("__DIMKEYS__", dimkey).replace(
-            "__MANUSCRIPT__", text or "（稿件为空！）")
+        return (tpl.replace("__DIMKEYS__", dimkey)
+                .replace("__CONTEXT__", task.get("context") or "（无）")
+                .replace("__MANUSCRIPT__", text or "（稿件为空！）"))
 
     # ---- 1) 大纲（断点续跑时直接继承上一遍，保证全书结构一致）
     inherit = run.get("inherit") or {}
@@ -2051,6 +2203,10 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
                             and cj.get("scores"):
                         cj_map[spare["id"]] = cj
                         scored += 1
+                        remember_agent(actual_critics, spare)
+                        refresh_actual_route(
+                            review_reason="章节评审补位：%s" %
+                            (spare.get("label") or spare.get("id")))
                         issues_all.extend({"chapter": i, **it}
                                           for it in (cj.get("issues") or [])[:6])
                         break
@@ -2096,8 +2252,11 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
         else:
             # stable_order：同一任务 8 个章节的技能块必须字节级一致（§07 T1.2' 前缀缓存）
             sk_block, _ = skills.block_for(task, stable_order=True)
-            if bible:
-                sk_block = (sk_block + "\n\n" + bible) if sk_block else bible
+        if bible:
+            sk_block = (sk_block + "\n\n" + bible) if sk_block else bible
+        if task.get("context"):
+            task_ctx = "## 任务背景与附件\n" + task["context"]
+            sk_block = (sk_block + "\n\n" + task_ctx) if sk_block else task_ctx
             kb_block = knowledge.block_for(task)
             if kb_block:
                 sk_block = (sk_block + "\n\n" + kb_block) if sk_block else kb_block
@@ -2135,6 +2294,10 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
                 good = False
                 txt = ""
                 use_prompt = prompt
+                chapter_impl = impl
+                chapter_reason = route.get("author", "")
+                last_attempt_impl = impl
+                last_attempt_reason = chapter_reason
                 for draft_attempt in range(3):
                     if draft_attempt:
                         # 30s / 60s 退避；ev.wait 睡等可被取消即刻唤醒
@@ -2185,6 +2348,9 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
                         if not (other and other.get("mode") == "real"):
                             break
                         tried.add(other["id"])
+                        last_attempt_impl = other
+                        last_attempt_reason = "章节起草换将：%s" % (
+                            other_reason or other.get("label") or other.get("id"))
                         res = _run_step(run_id, "draft-c%d" % i,
                                         modelhub.bind_agent(other, difficulty), use_prompt,
                                         step_wd, readonly=False, ev=ev, timeout=2400,
@@ -2201,13 +2367,20 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
                                 pass
                         if good:
                             draft_sid = ""   # 换将作者无本任会话，revise 另起
+                            chapter_impl = last_attempt_impl
+                            chapter_reason = last_attempt_reason
                 if not good:
                     time.sleep(3)   # 落盘竞态宽限：CLI 崩溃退出前写的文件可能晚于
                     good, txt = _chapter_state()   # 退出检查零点几秒才可见（c34 实测）
+                    if good:
+                        chapter_impl = last_attempt_impl
+                        chapter_reason = last_attempt_reason
                 if not good:
                     store.update_run(run_id, expected_status="running", status="failed",
                                      error="第 %d 章起草失败: %s" % (i, (res or {}).get("error")), ended_at=_now())
                     return
+                remember_agent(actual_implementers, chapter_impl)
+                refresh_actual_route(chapter_impl, implement_reason=chapter_reason)
                 if not res["ok"]:
                     # 成品是文件不是退出码：CLI 超时但章稿已完整落盘（终章长文实测
                     # 反复出现——文件写完、收尾声明没等到）就送评审门把关，别整章作废
@@ -2294,6 +2467,13 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
                     return
                 scored_variants.sort(key=lambda v: (-v["avg"], v["variant"]))
                 win = scored_variants[0]
+                win_agent = next((a for a in pool if a.get("id") == win["agent"]), None)
+                if win_agent is not None:
+                    remember_agent(actual_implementers, win_agent)
+                    refresh_actual_route(
+                        win_agent,
+                        implement_reason="同章多稿赛马胜出：%s" %
+                        (win_agent.get("label") or win_agent.get("id")))
                 # 收敛：赢家转正，败稿删除；胜者评审结果直接作为第 1 轮（不重评）
                 if win["file"] != ch_file:
                     try:
@@ -2397,10 +2577,15 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
                           .replace("__I__", str(i)).replace("__FILE__", ch_file)
                           .replace("__GOAL__", task["goal"])
                           .replace("__CRITIQUE__", "\n".join(crit_lines))
+                          .replace("__CONTEXT__", task.get("context") or "（无）")
                           .replace("__WORDS__", str(wpc)))
                 _run_step(run_id, "revise-c%d" % i, modelhub.bind_agent(impl, difficulty), prompt,
                           step_wd, readonly=False, ev=ev, timeout=2400,
                           resume=resume_ctx["session"] if resume_ctx else draft_sid)
+            remember_agent(actual_implementers, impl)
+            refresh_actual_route(
+                impl, implement_reason="章节修订：%s" %
+                (impl.get("label") or impl.get("id")))
             _check_cancel(ev)
         chapter_scores.append({"chapter": i, "title": ch["title"], "means": means,
                                "passed": bool(means) and all(v >= threshold_ch for v in means.values()),
@@ -2449,6 +2634,7 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
                 res = _run_step(run_id, "global-critique", modelhub.bind_agent(agent, difficulty),
                                 (gtpl.replace("__DIMKEYS__", dimkey)
                                  .replace("__GOAL__", task["goal"])
+                                 .replace("__CONTEXT__", task.get("context") or "（无）")
                                  .replace("__MANUSCRIPT__", full_text[:60000])),
                                 workdir, readonly=True, ev=ev, timeout=2400)
                 gj = _critique_json(res, dims)
@@ -2477,6 +2663,10 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
                 gmeans_acc.setdefault(d, []).extend(xs)
             gscored += sc
             if gscored:
+                remember_agent(actual_critics, spare)
+                refresh_actual_route(
+                    review_reason="全局评审补位：%s" %
+                    (spare.get("label") or spare.get("id")))
                 break
         if not gscored:
             store.update_run(run_id, expected_status="running", status="failed",
@@ -2526,6 +2716,10 @@ def _run_serial_review(run, task, agents, ev, stats, mode, critics, impl, route,
                                 resume=resume_ctx["session"] if resume_ctx else None)
                 if not res["ok"]:
                     continue
+            remember_agent(actual_implementers, impl)
+            refresh_actual_route(
+                impl, implement_reason="全局打磨：%s" %
+                (impl.get("label") or impl.get("id")))
             # 重评该章
             cj_by_agent = {}
             for agent in critics:
@@ -2798,9 +2992,16 @@ def _run_content_review(run, task, agents, ev, stats, mode):
         store.update_run(run_id, expected_status="running", status="failed",
                          error="没有可用智能体", ended_at=_now())
         return
-    if resume_ctx is not None and mode == "auto":
-        critics, route["critics"] = router.pick_critics(
-            agents, task.get("type") or "novel", stats, impl=impl)
+    if resume_ctx is not None:
+        if mode == "auto":
+            critics, route["critics"] = router.pick_critics(
+                agents, task.get("type") or "novel", stats, impl=impl)
+        else:
+            critics = _pick_critics_manual(agents, task)
+
+    _record_actual_route(run_id, task, agents, stats, impl, critics=critics,
+                         implement_reason=route.get("author", ""),
+                         review_reason=route.get("critics", ""))
 
     # ---- 规划（小说为模板计划）
     _wait_gate(run_id, ev)
@@ -2890,6 +3091,7 @@ def _run_content_review(run, task, agents, ev, stats, mode):
         crit_prompt = (_ensure_critique_placeholders(
             _tpl(task, "critique_prompt", NOVEL_CRITIQUE_PROMPT))
             .replace("__DIMKEYS__", dimkey)
+            .replace("__CONTEXT__", task.get("context") or "（无）")
             .replace("__MANUSCRIPT__", manuscript or "（稿件为空！）"))
         # AI 味确定性检测（借鉴 oh-story 去AI味）：客观参考线随评审下发，
         # 命中才追加——评审官结合上下文判断是否真问题，脚本不直接扣分
@@ -2957,6 +3159,7 @@ def _run_content_review(run, task, agents, ev, stats, mode):
             prompt = (NOVEL_REVISE_PROMPT.replace("__FILE__", ms_name)
                       .replace("__ROLE__", _content_role(task))
                       .replace("__GOAL__", task["goal"])
+                      .replace("__CONTEXT__", task.get("context") or "（无）")
                       .replace("__CRITIQUE__", "\n".join(crit_lines)))
             prompt += _content_contract(task)
             _run_step(run_id, "revise-r%d" % r, modelhub.bind_agent(impl, difficulty), prompt,
@@ -3286,7 +3489,13 @@ def execute_run(run_id):
                      task_spec_summary=task_compile.summary(task_spec),
                      difficulty=task_spec["difficulty"])
     task = dict(task)
+    task = _refresh_attachment_context(task, task.get("workdir") or "")
     task["_compiled_spec"] = task_spec
+    # 运行内统一使用编译后的难度；store 中历史任务常带 difficulty=auto，
+    # 不能让这个兼容值覆盖 easy/default/hard 的模型调度决策。
+    task["difficulty"] = task_spec["difficulty"]
+    # 同理，历史任务可能保存非法/过期 engine；执行以编译后的流程引擎为准。
+    task["engine"] = task_spec["engine"]
     # 代码版本检出：任务指定了基线版本时，先检出任务分支 tutti/<task-id> 再跑流水线。
     # 显式意图不容静默降级——仓库缺失/脏工作区/引用不存在一律中止运行并报错，
     # 绝不带着用户未提交改动切分支、也不悄悄退回当前 HEAD。
@@ -3366,8 +3575,12 @@ def execute_run(run_id):
                 store.update_run(run_id, expected_status="running", status="failed",
                                  error="没有可用智能体", ended_at=_now())
                 return
-            if resume_ctx is not None and mode == "auto":
-                critics, route["critics"] = router.pick_critics(agents, task["type"], stats, impl=impl)
+            if resume_ctx is not None:
+                if mode == "auto":
+                    critics, route["critics"] = router.pick_critics(
+                        agents, task["type"], stats, impl=impl)
+                else:
+                    critics = _pick_critics_manual(agents, task)
             if task.get("serial"):
                 _run_serial_review(run, task, agents, ev, stats, mode,
                                    critics, impl, route, resume_ctx, difficulty)
@@ -3387,6 +3600,33 @@ def execute_run(run_id):
         except Exception:
             pass
     finally:
+        # 全类型统一写调度终态与质量反馈。调用成功只代表传输可靠；真正用于
+        # 在线推荐的成功率以 verify/review/publishable 等验收结果为准。
+        try:
+            final_run = store.get_run(run_id) or {}
+            final_status = final_run.get("status") or ""
+            if final_status in ("done", "failed"):
+                final_verdict = final_run.get("verdict") or {}
+                if "pass" in final_verdict:
+                    quality_ok = bool(final_verdict.get("pass"))
+                elif "publishable" in final_verdict:
+                    quality_ok = bool(final_verdict.get("publishable"))
+                else:
+                    quality_ok = final_status == "done"
+                _record_dispatch_completed(
+                    run_id, task, "passed" if quality_ok else "failed",
+                    verify_pass=final_verdict.get("verify_pass"),
+                    review_pass=final_verdict.get(
+                        "review_pass", final_verdict.get("publishable")))
+                final_agent = (((final_run.get("route_plan") or {})
+                                .get("implement") or {}).get("selected") or "")
+                if final_agent.startswith("builtin:"):
+                    final_agent = "builtin"
+                usage.record_quality_for_run(run_id, quality_ok, agent=final_agent)
+            elif final_status == "cancelled":
+                _record_dispatch_completed(run_id, task, "cancelled")
+        except Exception:
+            pass
         # 任务分支收尾（git_rev 隔离链的第二半）：先只读快照本 run 的全部变更
         # 落 run 记录供人审，再把产物提交到 tutti/<task-id> 并切回原分支。
         # 放 finally：done/failed/cancelled/异常一律保存现场；收尾自身绝不抛错，